From 13e67baae3adc6c3e231c323104fa66b4f7d2e93 Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Thu, 29 Oct 2020 15:50:07 +0100 Subject: [PATCH 001/730] SW-25773 - Add escaping to email field in customer module --- UPGRADE-5.6.md | 5 +++++ .../ExtJs/backend/customer/view/customer_stream/preview.js | 2 +- .../ExtJs/backend/customer/view/main/customer_list.js | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/UPGRADE-5.6.md b/UPGRADE-5.6.md index 4d10e9a21a6..d125947714f 100644 --- a/UPGRADE-5.6.md +++ b/UPGRADE-5.6.md @@ -2,6 +2,11 @@ This changelog references changes done in Shopware 5.6 patch versions. +## 5.6.9 + +[View all changes from v5.6.8...v5.6.9](https://github.com/shopware/shopware/compare/v5.6.8...v5.6.9) + + ## 5.6.8 [View all changes from v5.6.7...v5.6.8](https://github.com/shopware/shopware/compare/v5.6.7...v5.6.8) diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/preview.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/preview.js index 121de244635..8733d04995e 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/preview.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/preview.js @@ -225,7 +225,7 @@ Ext.define('Shopware.apps.Customer.view.customer_stream.Preview', { company = '
' + record.get('company') + ''; } - var mail = Ext.String.format('[0]', record.get('email')); + var mail = Ext.String.format('[0]', Ext.util.Format.htmlEncode(record.get('email'))); return name + age + company + '
' + mail; } diff --git a/themes/Backend/ExtJs/backend/customer/view/main/customer_list.js b/themes/Backend/ExtJs/backend/customer/view/main/customer_list.js index f6ae1bfd70e..8330e829b09 100644 --- a/themes/Backend/ExtJs/backend/customer/view/main/customer_list.js +++ b/themes/Backend/ExtJs/backend/customer/view/main/customer_list.js @@ -113,6 +113,7 @@ Ext.define('Shopware.apps.Customer.view.main.CustomerList', { }, mailRenderer: function(value) { + value = Ext.util.Format.htmlEncode(value); return Ext.String.format('[0]', value); }, From 71dabe5bc5649dca36e43a3ff47995f1e6c2d474 Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Fri, 30 Oct 2020 10:06:42 +0100 Subject: [PATCH 002/730] SW-25772 - Improve Newsletter Preview --- .../ExtJs/backend/newsletter_manager/controller/editor.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/controller/editor.js b/themes/Backend/ExtJs/backend/newsletter_manager/controller/editor.js index 8d9ad332c26..3f47d99402f 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/controller/editor.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/controller/editor.js @@ -400,7 +400,8 @@ Ext.define('Shopware.apps.NewsletterManager.controller.Editor', { id: 'iframe-win', // Add id autoEl: { tag: 'iframe', - src: url + src: url, + sandbox: '1' } }] }).show(); From 5d63117bea53ab2d13a058e4040873306e83adbc Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Fri, 30 Oct 2020 10:47:27 +0100 Subject: [PATCH 003/730] NTR - Change image --- .gitlab-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 125397b0f0d..87297fc1f4e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ stages: - Security default: - image: gitlab.shopware.com:5005/shopware/5/product/shopware:7.3 + image: gitlab.shopware.com:5005/shopware/5/product/image/continuous:7.3 before_script: - sed -i -e "s;__ROOT__;$CI_PROJECT_DIR;g" /etc/nginx/sites-enabled/shopware.conf - cat /etc/nginx/sites-enabled/shopware.conf @@ -97,7 +97,7 @@ Code Coverage: PHP 7.2: extends: .phpunit_base - image: gitlab.shopware.com:5005/shopware/5/product/shopware:7.2 + image: gitlab.shopware.com:5005/shopware/5/product/image/continuous:7.2 stage: Unit services: - name: mysql:5.7 @@ -105,7 +105,7 @@ PHP 7.2: PHP 7.3: extends: .phpunit_base - image: gitlab.shopware.com:5005/shopware/5/product/shopware:7.3 + image: gitlab.shopware.com:5005/shopware/5/product/image/continuous:7.3 stage: Unit services: - name: mysql:5.7 @@ -113,7 +113,7 @@ PHP 7.3: PHP 7.4: extends: .phpunit_base - image: gitlab.shopware.com:5005/shopware/5/product/shopware:7.4 + image: gitlab.shopware.com:5005/shopware/5/product/image/continuous:7.4 stage: Unit services: - name: mysql:5.7 @@ -151,7 +151,7 @@ MariaDB 10.4: # stage: Elasticsearch Elasticsearch 6: extends: .phpunit_es_base - image: gitlab.shopware.com:5005/shopware/5/product/shopware:7.2 + image: gitlab.shopware.com:5005/shopware/5/product/image/continuous:7.2 stage: Elasticsearch services: - name: mysql:8.0 @@ -163,7 +163,7 @@ Elasticsearch 6: Elasticsearch 7: extends: .phpunit_es_base - image: gitlab.shopware.com:5005/shopware/5/product/shopware:7.3 + image: gitlab.shopware.com:5005/shopware/5/product/image/continuous:7.3 stage: Elasticsearch services: - name: mysql:8.0 @@ -175,7 +175,7 @@ Elasticsearch 7: Mink: extends: .phpunit_base - image: gitlab.shopware.com:5005/shopware/5/product/shopware:7.3 + image: gitlab.shopware.com:5005/shopware/5/product/image/continuous:7.3 stage: E2E artifacts: when: always From 2351372e8d78a504f9dba20e42341509137e680b Mon Sep 17 00:00:00 2001 From: Patrick Stahl Date: Thu, 29 Oct 2020 15:35:27 +0100 Subject: [PATCH 004/730] SW-25771 - Fix missing escape in emotion element templates --- .../Bare/widgets/emotion/components/component_banner.tpl | 2 +- .../Bare/widgets/emotion/components/component_iframe.tpl | 4 ++-- .../Bare/widgets/emotion/components/component_youtube.tpl | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/themes/Frontend/Bare/widgets/emotion/components/component_banner.tpl b/themes/Frontend/Bare/widgets/emotion/components/component_banner.tpl index bc8906bbda3..fe8f6bb5b93 100644 --- a/themes/Frontend/Bare/widgets/emotion/components/component_banner.tpl +++ b/themes/Frontend/Bare/widgets/emotion/components/component_banner.tpl @@ -76,7 +76,7 @@ {/foreach} {elseif $Data.link} - diff --git a/themes/Frontend/Bare/widgets/emotion/components/component_iframe.tpl b/themes/Frontend/Bare/widgets/emotion/components/component_iframe.tpl index 387793a4dff..a4cf8ea27c6 100644 --- a/themes/Frontend/Bare/widgets/emotion/components/component_iframe.tpl +++ b/themes/Frontend/Bare/widgets/emotion/components/component_iframe.tpl @@ -4,8 +4,8 @@ {/if} -{/block} \ No newline at end of file +{/block} diff --git a/themes/Frontend/Bare/widgets/emotion/components/component_youtube.tpl b/themes/Frontend/Bare/widgets/emotion/components/component_youtube.tpl index 798ba7cb0ae..7887e728dcd 100644 --- a/themes/Frontend/Bare/widgets/emotion/components/component_youtube.tpl +++ b/themes/Frontend/Bare/widgets/emotion/components/component_youtube.tpl @@ -22,10 +22,10 @@ {/if} -{/block} \ No newline at end of file +{/block} From eb5c32704dbfe9f4499ec93aaee8d4ce4f50d87c Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Fri, 30 Oct 2020 16:11:31 +0100 Subject: [PATCH 005/730] SW-25691 - Fix bot detection for Huawei devices --- UPGRADE-5.6.md | 3 + .../1657-fixing-bot-detection-huawei.php | 69 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 _sql/migrations/1657-fixing-bot-detection-huawei.php diff --git a/UPGRADE-5.6.md b/UPGRADE-5.6.md index d125947714f..777cc8d94f3 100644 --- a/UPGRADE-5.6.md +++ b/UPGRADE-5.6.md @@ -6,6 +6,9 @@ This changelog references changes done in Shopware 5.6 patch versions. [View all changes from v5.6.8...v5.6.9](https://github.com/shopware/shopware/compare/v5.6.8...v5.6.9) +### Changes + +* Changed bot detection to not recognize Huawei devices as bot ## 5.6.8 diff --git a/_sql/migrations/1657-fixing-bot-detection-huawei.php b/_sql/migrations/1657-fixing-bot-detection-huawei.php new file mode 100644 index 00000000000..8157bdf7133 --- /dev/null +++ b/_sql/migrations/1657-fixing-bot-detection-huawei.php @@ -0,0 +1,69 @@ +fixStandardBlacklist(); + + $this->fixCustomerBlacklists(); + } + + private function fixStandardBlacklist(): void + { + $blacklistConfig = $this->connection + ->query("SELECT * FROM s_core_config_elements WHERE name = 'botBlackList'") + ->fetchAll(PDO::FETCH_ASSOC) + ; + + if (empty($blacklistConfig)) { + return; + } + + $botList = $this->getFilteredBotList($blacklistConfig[0]['value']); + $statement = $this->connection->prepare(" + UPDATE s_core_config_elements + SET value = :value + WHERE id = :id + "); + $statement->execute([ + 'value' => $botList, + 'id' => $blacklistConfig[0]['id'] + ]); + } + + private function fixCustomerBlacklists(): void + { + $blacklistConfig = $this->connection + ->query("SELECT v.* FROM s_core_config_values as v INNER JOIN s_core_config_elements as e on v.element_id = e.id WHERE e.name = 'botBlackList'") + ->fetchAll(PDO::FETCH_ASSOC) + ; + + if (empty($blacklistConfig)) { + return; + } + + foreach ($blacklistConfig as $config) { + $botList = $this->getFilteredBotList($config['value']); + $statement = $this->connection->prepare(" + UPDATE s_core_config_values + SET value = :value + WHERE id = :id + "); + $statement->execute([ + 'value' => $botList, + 'id' => $config['id'] + ]); + } + } + + private function getFilteredBotList(string $botConfiguration): string + { + $botList = explode(';', unserialize($botConfiguration, ['allowed_classes' => false])); + $botList = array_filter($botList, function ($bot) { + return $bot !== 'core'; + }); + + return serialize(implode(";", $botList)); + } +} From 00a172e762c45af14cb16345a944a9e22ec12aeb Mon Sep 17 00:00:00 2001 From: Patrick Stahl Date: Mon, 2 Nov 2020 23:42:52 +0100 Subject: [PATCH 006/730] SW-25771 - Fix escaping of value in youtube element in the emotion grid, not in the preview --- .../ExtJs/backend/emotion/view/detail/elements/youtube.js | 1 + 1 file changed, 1 insertion(+) diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/youtube.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/youtube.js index 666fc718a6a..7289b0b60e4 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/youtube.js +++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/youtube.js @@ -47,6 +47,7 @@ Ext.define('Shopware.apps.Emotion.view.detail.elements.Youtube', { videoID = me.getConfigValue('video_id'); if (Ext.isDefined(videoID)) { + videoID = Ext.util.Format.htmlEncode(videoID); teaserImage = Ext.String.format('https://img.youtube.com/vi/[0]/0.jpg', videoID); style = Ext.String.format('background-image: url([0]);', teaserImage); From 713c20f80264915944e2aeb133f2f02e62bd4cd0 Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Fri, 6 Nov 2020 06:41:26 +0100 Subject: [PATCH 007/730] SW-25772 - Fix sandbox attribute --- .../ExtJs/backend/newsletter_manager/controller/editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/controller/editor.js b/themes/Backend/ExtJs/backend/newsletter_manager/controller/editor.js index 3f47d99402f..eae157a149a 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/controller/editor.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/controller/editor.js @@ -401,7 +401,7 @@ Ext.define('Shopware.apps.NewsletterManager.controller.Editor', { autoEl: { tag: 'iframe', src: url, - sandbox: '1' + sandbox: '' } }] }).show(); From f525dd0973910ad4ebaf14c1c252172e226369b7 Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Fri, 6 Nov 2020 08:38:23 +0100 Subject: [PATCH 008/730] SW-25772 - Format newsletter title --- engine/Shopware/Core/sMarketing.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/Shopware/Core/sMarketing.php b/engine/Shopware/Core/sMarketing.php index fe75f505294..de63a6d591a 100644 --- a/engine/Shopware/Core/sMarketing.php +++ b/engine/Shopware/Core/sMarketing.php @@ -713,7 +713,7 @@ public function sMailCampaignsGetDetail($id) if (strpos($getText['link'], 'http') === false && $getText['link']) { $getText['link'] = 'http://' . $getText['link']; } - $getCampaignContainers[$campaignKey]['description'] = $getText['headline']; + $getCampaignContainers[$campaignKey]['description'] = htmlspecialchars($getText['headline']); $getCampaignContainers[$campaignKey]['data'] = $getText; break; } From 47ca359ef11cd63f3b771822a86ae5656957d46c Mon Sep 17 00:00:00 2001 From: teiling88 Date: Mon, 18 Jan 2021 15:57:42 +0100 Subject: [PATCH 009/730] NTR - fix all defect migrations for php7.4.14 usage --- _sql/migrations/1434-add-href-default-selection.php | 2 +- _sql/migrations/1442-add-meta-description-config.php | 2 +- _sql/migrations/1459-change-shipping-costs-configs.php | 5 ++--- _sql/migrations/220-add-payment-data-restriction.php | 2 +- _sql/migrations/388-add-emotion-fields-position.php | 1 - _sql/migrations/393-add-404-page-config-options.php | 2 -- _sql/migrations/469-add-404-article-page-config.php | 1 - _sql/migrations/741-migrate-salutation-mails.php | 3 +-- _sql/migrations/901-add-vote-shop-id.php | 2 +- 9 files changed, 7 insertions(+), 13 deletions(-) diff --git a/_sql/migrations/1434-add-href-default-selection.php b/_sql/migrations/1434-add-href-default-selection.php index 12122475606..36f59b8ad11 100644 --- a/_sql/migrations/1434-add-href-default-selection.php +++ b/_sql/migrations/1434-add-href-default-selection.php @@ -44,7 +44,7 @@ public function up($modus) $sql = <<<'EOD' SET @elementId = LAST_INSERT_ID(); INSERT IGNORE INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`, `description`) -VALUES (@elementId, 2, 'Default href-lang', 'The selected shop will be shown as "x-default" in the href-lang tag, therefore using this shop's language as default.); +VALUES (@elementId, 2, 'Default href-lang', 'The selected shop will be shown as "x-default" in the href-lang tag, therefore using this shop\'s language as default.'); EOD; $this->addSql($sql); } diff --git a/_sql/migrations/1442-add-meta-description-config.php b/_sql/migrations/1442-add-meta-description-config.php index 4590def0aec..bd67f4b35f2 100644 --- a/_sql/migrations/1442-add-meta-description-config.php +++ b/_sql/migrations/1442-add-meta-description-config.php @@ -36,7 +36,7 @@ public function up($modus) $sql = <<<'EOD' SET @elementId = LAST_INSERT_ID(); -INSERT IGNORE INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`, `description`) +INSERT IGNORE INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`) VALUES (@elementId, 2, 'Maximum allowed length of the meta description'); EOD; $this->addSql($sql); diff --git a/_sql/migrations/1459-change-shipping-costs-configs.php b/_sql/migrations/1459-change-shipping-costs-configs.php index 12b86b21e0f..6a6f75118e4 100644 --- a/_sql/migrations/1459-change-shipping-costs-configs.php +++ b/_sql/migrations/1459-change-shipping-costs-configs.php @@ -66,9 +66,8 @@ public function up($modus) UPDATE s_core_config_elements set `type`='select', `position`=5, options='%s', `value`='i:1;', label='Versandkostenberechnung im Warenkorb anzeigen' where id=@elementId; UPDATE `s_core_config_element_translations` set `label`='Show shipping costs calculation in shopping cart' where element_id=@elementId; - UPDATE s_core_config_values SET value = 'i:0;' - FROM s_core_config_values - WHERE element_id = @elementId); + UPDATE s_core_config_values SET value = 'i:0;' + WHERE element_id = @elementId; SQL; $this->addSql(sprintf($sql, serialize($options))); } diff --git a/_sql/migrations/220-add-payment-data-restriction.php b/_sql/migrations/220-add-payment-data-restriction.php index 8672bc580d8..4ec5da70a69 100644 --- a/_sql/migrations/220-add-payment-data-restriction.php +++ b/_sql/migrations/220-add-payment-data-restriction.php @@ -16,7 +16,7 @@ public function up($modus) HAVING COUNT(1) > 1 ) as t); - ALTER IGNORE TABLE `s_core_payment_data` ADD UNIQUE ( + ALTER TABLE `s_core_payment_data` ADD UNIQUE ( `payment_mean_id` , `user_id` ); diff --git a/_sql/migrations/388-add-emotion-fields-position.php b/_sql/migrations/388-add-emotion-fields-position.php index 323858698a0..1106c9bf7c0 100644 --- a/_sql/migrations/388-add-emotion-fields-position.php +++ b/_sql/migrations/388-add-emotion-fields-position.php @@ -11,7 +11,6 @@ public function up($modus) $this->addSql(" INSERT INTO `s_library_component_field` (`componentID`, `name`, `x_type`, `value_type`, `field_label`, `support_text`, `help_title`, `help_text`, `store`, `display_field`, `value_field`, `default_value`, `allow_blank`, `position`) VALUES (@parent, 'article_slider_category', 'emotion-components-fields-category-selection', '', '', '', '', '', '', '', '', '', 1, @maxNumberPosition); -EOD; "); } } diff --git a/_sql/migrations/393-add-404-page-config-options.php b/_sql/migrations/393-add-404-page-config-options.php index 6bcd3800720..4920d8b96c6 100644 --- a/_sql/migrations/393-add-404-page-config-options.php +++ b/_sql/migrations/393-add-404-page-config-options.php @@ -7,7 +7,6 @@ public function up($modus) $sql = <<addSql($sql); $this->addSql("SET @elementId = (SELECT id FROM s_core_config_elements WHERE name = 'PageNotFoundDestination' LIMIT 1);"); @@ -20,7 +19,6 @@ public function up($modus) $sql = <<addSql($sql); $this->addSql("SET @elementId = (SELECT id FROM s_core_config_elements WHERE name = 'PageNotFoundCode' LIMIT 1);"); diff --git a/_sql/migrations/469-add-404-article-page-config.php b/_sql/migrations/469-add-404-article-page-config.php index 4348482ad47..4ecafd9a480 100644 --- a/_sql/migrations/469-add-404-article-page-config.php +++ b/_sql/migrations/469-add-404-article-page-config.php @@ -7,7 +7,6 @@ public function up($modus) $sql = <<addSql($sql); $this->addSql("SET @elementId = (SELECT id FROM s_core_config_elements WHERE name = 'RelatedArticlesOnArticleNotFound' LIMIT 1);"); diff --git a/_sql/migrations/741-migrate-salutation-mails.php b/_sql/migrations/741-migrate-salutation-mails.php index aa8c8a89606..a4c7ace3bbc 100644 --- a/_sql/migrations/741-migrate-salutation-mails.php +++ b/_sql/migrations/741-migrate-salutation-mails.php @@ -59,7 +59,7 @@ public function up($modus) $sql = <<<'EOD' SET @elementId = (SELECT id FROM s_core_config_elements WHERE name = 'displayprofiletitle' LIMIT 1); - INSERT INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`) VALUES (@elementId, 2, 'Display title field', NULL); + INSERT INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`) VALUES (@elementId, 2, 'Display title field'); EOD; $this->addSql($sql); @@ -94,7 +94,6 @@ public function up($modus) (NULL, 7, 'sORDERSTATEMAIL7', '{config name=mail}', '{config name=shopName}', 'Statusänderung zur Bestellung bei {config name=shopName}', '{include file="string:{config name=emailheaderplain}"}\r\n\r\nHallo {$sUser.billing_salutation|salutation} {$sUser.billing_firstname} {$sUser.billing_lastname},\n\nder Bestellstatus für Ihre Bestellung {$sOrder.ordernumber} hat sich geändert!\nDie Bestellung hat jetzt den Status: {$sOrder.status_description}.\n\nDen aktuellen Status Ihrer Bestellung können Sie auch jederzeit auf unserer Webseite im Bereich "Mein Konto" - "Meine Bestellungen" abrufen. Sollten Sie allerdings den Kauf ohne Registrierung, also ohne Anlage eines Kundenkontos, gewählt haben, steht Ihnen diese Möglichkeit nicht zur Verfügung.\r\n\r\n{include file="string:{config name=emailfooterplain}"}', '', 0, '', 3, 'a:3:{s:5:"sShop";s:13:"Shopware Demo";s:8:"sShopURL";s:20:"http://localhost/5.1";s:7:"sConfig";a:0:{}}', 0), (NULL, NULL, 'sBIRTHDAY', '{config name=mail}', '{config name=shopName}', 'Herzlichen Glückwunsch zum Geburtstag von {config name=shopName}', '{include file="string:{config name=emailheaderplain}"}\r\n\r\nHallo {$sUser.salutation|salutation} {$sUser.firstname} {$sUser.lastname},\n\nwir wünschen Ihnen alles Gute zum Geburtstag.\r\n\r\n{include file="string:{config name=emailfooterplain}"}', '', 0, '', 2, NULL, 0), (NULL, NULL, 'sARTICLECOMMENT', '{config name=mail}', '{config name=shopName}', 'Artikel bewerten', '{include file="string:{config name=emailheaderplain}"}\r\n\r\nHallo {$sUser.billing_salutation|salutation} {$sUser.billing_firstname} {$sUser.billing_lastname},\n\nSie haben bei uns vor einigen Tagen Artikel gekauft. Wir würden uns freuen, wenn Sie diese Artikel bewerten würden.
\nSo helfen Sie uns, unseren Service weiter zu steigern und Sie können auf diesem Weg anderen Interessenten direkt Ihre Meinung mitteilen.\n\n\nHier finden Sie die Links zum Bewerten der von Ihnen gekauften Produkte.\n\n{foreach from=$sArticles item=sArticle key=key}\n{if !$sArticle.modus}\n{$sArticle.articleordernumber} {$sArticle.name} {$sArticle.link}\n{/if}\n{/foreach}\r\n\r\n{include file="string:{config name=emailfooterplain}"}', '{include file="string:{config name=emailheaderhtml}"}\r\n

\r\nHallo {if $sUser.salutation eq "mr"}Herr{elseif $sUser.billing_salutation eq "ms"}Frau{/if} {$sUser.billing_firstname} {$sUser.billing_lastname},\n
\nSie haben bei uns vor einigen Tagen Artikel gekauft. Wir würden uns freuen, wenn Sie diese Artikel bewerten würden.
\nSo helfen Sie uns, unseren Service weiter zu steigern und Sie können auf diesem Weg anderen Interessenten direkt Ihre Meinung mitteilen.\n

\n\nHier finden Sie die Links zum Bewerten der von Ihnen gekauften Produkte.\n\n\n {foreach from=$sArticles item=sArticle key=key}\n{if !$sArticle.modus}\n \n \n \n \n \n{/if}\n {/foreach}\n
{$sArticle.articleordernumber}{$sArticle.name}\n link\n
\r\n

\r\n{include file="string:{config name=emailfooterhtml}"}', 1, '', 2, NULL, 0); - EOD; $this->addSql($sql); diff --git a/_sql/migrations/901-add-vote-shop-id.php b/_sql/migrations/901-add-vote-shop-id.php index 175e27c7652..3c2fbf5506a 100644 --- a/_sql/migrations/901-add-vote-shop-id.php +++ b/_sql/migrations/901-add-vote-shop-id.php @@ -20,7 +20,7 @@ public function up($modus) $sql = <<<'EOD' SET @elementId = (SELECT id FROM s_core_config_elements WHERE name = 'displayOnlySubShopVotes' LIMIT 1); - INSERT INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`) VALUES (@elementId, 2, 'Display shop specific votes only', NULL); + INSERT INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`) VALUES (@elementId, 2, 'Display shop specific votes only'); EOD; $this->addSql($sql); From afba0dcde6b368934313f03ff4ba147263f7c1df Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Fri, 15 Jan 2021 10:38:55 +0100 Subject: [PATCH 010/730] SW-25898 - Require the filter extension to avoid error in Symfony Otherwise you would get: `Call to undefined function filter_var()` in symfony/http-foundation/IpUtils.php:71 fixes #2408 --- README.md | 1 + composer.json | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index ea8627d3be0..38549b5d91b 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ Visit the forum at - ctype - curl - dom +- filter - hash - iconv - gd (with freetype and libjpeg) diff --git a/composer.json b/composer.json index 80373706bd8..5a7e9718dbd 100644 --- a/composer.json +++ b/composer.json @@ -21,6 +21,7 @@ "ext-curl": "*", "ext-date": "*", "ext-dom": "*", + "ext-filter": "*", "ext-gd": "*", "ext-hash": "*", "ext-iconv": "*", From 90bb86fdfaf1ece4684e54d8b90d3d43921d37a6 Mon Sep 17 00:00:00 2001 From: teiling88 Date: Wed, 20 Jan 2021 22:26:17 +0100 Subject: [PATCH 011/730] NTR - fix unit tests --- _sql/migrations/1434-add-href-default-selection.php | 7 ------- _sql/migrations/1442-add-meta-description-config.php | 7 ------- _sql/migrations/388-add-emotion-fields-position.php | 4 ---- _sql/migrations/393-add-404-page-config-options.php | 10 ---------- _sql/migrations/469-add-404-article-page-config.php | 6 ------ _sql/migrations/741-migrate-salutation-mails.php | 7 ------- _sql/migrations/901-add-vote-shop-id.php | 6 ------ 7 files changed, 47 deletions(-) diff --git a/_sql/migrations/1434-add-href-default-selection.php b/_sql/migrations/1434-add-href-default-selection.php index 36f59b8ad11..1515c7a4a38 100644 --- a/_sql/migrations/1434-add-href-default-selection.php +++ b/_sql/migrations/1434-add-href-default-selection.php @@ -40,12 +40,5 @@ public function up($modus) (@formId, 'hrefLangDefaultShop', 's:0:"";', 'href-lang Standardsprache', 'Gibt für diesen Shop "x-default" im href-lang-Tag aus und definiert damit die Sprache dieses Shops als Standardsprache.', 'combo', 0, 0, 0, '%s'); EOD; $this->addSql(sprintf($sql, serialize($settings))); - - $sql = <<<'EOD' -SET @elementId = LAST_INSERT_ID(); -INSERT IGNORE INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`, `description`) -VALUES (@elementId, 2, 'Default href-lang', 'The selected shop will be shown as "x-default" in the href-lang tag, therefore using this shop\'s language as default.'); -EOD; - $this->addSql($sql); } } diff --git a/_sql/migrations/1442-add-meta-description-config.php b/_sql/migrations/1442-add-meta-description-config.php index bd67f4b35f2..bc65969521c 100644 --- a/_sql/migrations/1442-add-meta-description-config.php +++ b/_sql/migrations/1442-add-meta-description-config.php @@ -31,13 +31,6 @@ public function up($modus) (`form_id`, `name`, `value`, `label`, `description`, `type`, `required`, `position`, `scope`, `options`) VALUES (@formId, 'metaDescriptionLength', 's:3:"150";', 'Maximal erlaubte Länge der Meta Description', '', 'number', 0, 0, 0, NULL); -EOD; - $this->addSql($sql); - - $sql = <<<'EOD' -SET @elementId = LAST_INSERT_ID(); -INSERT IGNORE INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`) -VALUES (@elementId, 2, 'Maximum allowed length of the meta description'); EOD; $this->addSql($sql); } diff --git a/_sql/migrations/388-add-emotion-fields-position.php b/_sql/migrations/388-add-emotion-fields-position.php index 1106c9bf7c0..2b5adf212fb 100644 --- a/_sql/migrations/388-add-emotion-fields-position.php +++ b/_sql/migrations/388-add-emotion-fields-position.php @@ -8,9 +8,5 @@ public function up($modus) $this->addSql("SET @parent = (SELECT id FROM `s_library_component` WHERE `x_type`='emotion-components-article-slider' AND template = 'component_article_slider' AND pluginID IS NULL LIMIT 1);"); $this->addSql("SET @maxNumberPosition = (SELECT id FROM `s_library_component_field` WHERE `name`='article_slider_max_number' AND componentID = @parent LIMIT 1);"); $this->addSql("UPDATE s_library_component_field SET position = position+1 WHERE componentID = @parent AND id >= @maxNumberPosition;"); - $this->addSql(" - INSERT INTO `s_library_component_field` (`componentID`, `name`, `x_type`, `value_type`, `field_label`, `support_text`, `help_title`, `help_text`, `store`, `display_field`, `value_field`, `default_value`, `allow_blank`, `position`) VALUES - (@parent, 'article_slider_category', 'emotion-components-fields-category-selection', '', '', '', '', '', '', '', '', '', 1, @maxNumberPosition); - "); } } diff --git a/_sql/migrations/393-add-404-page-config-options.php b/_sql/migrations/393-add-404-page-config-options.php index 4920d8b96c6..bd74e26c24a 100644 --- a/_sql/migrations/393-add-404-page-config-options.php +++ b/_sql/migrations/393-add-404-page-config-options.php @@ -4,11 +4,6 @@ class Migrations_Migration393 Extends Shopware\Components\Migrations\AbstractMig public function up($modus) { $this->addSql("SET @formId = (SELECT `id` FROM `s_core_config_forms` WHERE name = 'Frontend100');"); - $sql = <<addSql($sql); $this->addSql("SET @elementId = (SELECT id FROM s_core_config_elements WHERE name = 'PageNotFoundDestination' LIMIT 1);"); $this->addSql(" @@ -16,11 +11,6 @@ public function up($modus) VALUES (@elementId, '2', '\"Page not found\" destination', 'When the user requests a non-existent page, he will be shown the following page.' ); "); - $sql = <<addSql($sql); $this->addSql("SET @elementId = (SELECT id FROM s_core_config_elements WHERE name = 'PageNotFoundCode' LIMIT 1);"); $this->addSql(" diff --git a/_sql/migrations/469-add-404-article-page-config.php b/_sql/migrations/469-add-404-article-page-config.php index 4ecafd9a480..8b9447bc6cf 100644 --- a/_sql/migrations/469-add-404-article-page-config.php +++ b/_sql/migrations/469-add-404-article-page-config.php @@ -3,12 +3,6 @@ class Migrations_Migration469 Extends Shopware\Components\Migrations\AbstractMig { public function up($modus) { - $this->addSql("SET @formId = (SELECT `id` FROM `s_core_config_forms` WHERE name = 'Frontend100');"); - $sql = <<addSql($sql); $this->addSql("SET @elementId = (SELECT id FROM s_core_config_elements WHERE name = 'RelatedArticlesOnArticleNotFound' LIMIT 1);"); $this->addSql(" diff --git a/_sql/migrations/741-migrate-salutation-mails.php b/_sql/migrations/741-migrate-salutation-mails.php index a4c7ace3bbc..43e505f33b2 100644 --- a/_sql/migrations/741-migrate-salutation-mails.php +++ b/_sql/migrations/741-migrate-salutation-mails.php @@ -57,13 +57,6 @@ public function up($modus) $this->addSql($sql); - $sql = <<<'EOD' - SET @elementId = (SELECT id FROM s_core_config_elements WHERE name = 'displayprofiletitle' LIMIT 1); - INSERT INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`) VALUES (@elementId, 2, 'Display title field'); -EOD; - $this->addSql($sql); - - $sql = <<<'EOD' DELETE FROM `s_core_config_mails` WHERE dirty = 0 AND `name` IN ( 'sORDERSTATEMAIL11', diff --git a/_sql/migrations/901-add-vote-shop-id.php b/_sql/migrations/901-add-vote-shop-id.php index 3c2fbf5506a..d4b5e8e87bb 100644 --- a/_sql/migrations/901-add-vote-shop-id.php +++ b/_sql/migrations/901-add-vote-shop-id.php @@ -18,12 +18,6 @@ public function up($modus) $this->addSql($sql); - $sql = <<<'EOD' - SET @elementId = (SELECT id FROM s_core_config_elements WHERE name = 'displayOnlySubShopVotes' LIMIT 1); - INSERT INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`) VALUES (@elementId, 2, 'Display shop specific votes only'); -EOD; - - $this->addSql($sql); $this->addSql("UPDATE s_core_config_elements SET scope = 1 WHERE name = 'votedisable'"); } } From 1dc21bc80473713563424ad1ce4867bc54195c28 Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Mon, 15 Feb 2021 12:07:05 +0000 Subject: [PATCH 012/730] SW-25897 - Fix wrong demo data --- _sql/demo/latest.sql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_sql/demo/latest.sql b/_sql/demo/latest.sql index 8bcf45b2d72..d9aa2d113f4 100644 --- a/_sql/demo/latest.sql +++ b/_sql/demo/latest.sql @@ -7225,7 +7225,9 @@ INSERT INTO `s_emotion_element_value` (`id`, `emotionID`, `elementID`, `componen (4271, 6, 1409, 3, 65, 'top left'), (4272, 6, 1409, 3, 89, ''), (4273, 6, 1409, 3, 85, ''), -(4274, 1, 1023, 6, 68, '17'); +(4274, 1, 1023, 6, 68, '17'), +(4275, 1, 1023, 6, 12, '3'), +(4276, 1, 1023, 6, 67, '3'); TRUNCATE TABLE `s_emotion_templates`; INSERT INTO `s_emotion_templates` (`id`, `name`, `file`) VALUES From 818e470c838d5000485f71b89a8821f104553cd8 Mon Sep 17 00:00:00 2001 From: Philip Gatzka Date: Thu, 18 Feb 2021 15:31:18 +0100 Subject: [PATCH 013/730] SW-25897 - Add missing blog category assignment to demodata --- _sql/demo/latest.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_sql/demo/latest.sql b/_sql/demo/latest.sql index d9aa2d113f4..dd6b1eb31cb 100644 --- a/_sql/demo/latest.sql +++ b/_sql/demo/latest.sql @@ -7227,7 +7227,8 @@ INSERT INTO `s_emotion_element_value` (`id`, `emotionID`, `elementID`, `componen (4273, 6, 1409, 3, 85, ''), (4274, 1, 1023, 6, 68, '17'), (4275, 1, 1023, 6, 12, '3'), -(4276, 1, 1023, 6, 67, '3'); +(4276, 1, 1023, 6, 67, '3'), +(4277, 7, 1512, 6, 67, '3'); TRUNCATE TABLE `s_emotion_templates`; INSERT INTO `s_emotion_templates` (`id`, `name`, `file`) VALUES From 3576080f8a0796496706c7a4124589679af48232 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 17 Sep 2020 09:43:52 +0200 Subject: [PATCH 014/730] SW-18275 - Close off canvas elements if browser back is triggered --- .../_public/src/js/jquery.off-canvas-menu.js | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/themes/Frontend/Responsive/frontend/_public/src/js/jquery.off-canvas-menu.js b/themes/Frontend/Responsive/frontend/_public/src/js/jquery.off-canvas-menu.js index b4f1eb5d305..6e43689df1d 100644 --- a/themes/Frontend/Responsive/frontend/_public/src/js/jquery.off-canvas-menu.js +++ b/themes/Frontend/Responsive/frontend/_public/src/js/jquery.off-canvas-menu.js @@ -1,4 +1,4 @@ -(function ($) { +(function ($, window) { 'use strict'; var $html = $('html'); @@ -225,6 +225,7 @@ // Button click me._on(me.$el, 'click touch', $.proxy(me.onClickElement, me)); + me._on(window, 'popstate', $.proxy(me.onBackButton, me)); // Allow the user to close the off canvas menu me.$offCanvas.on(me.getEventName('click'), opts.closeButtonSelector, $.proxy(me.onClickCloseButton, me)); @@ -272,7 +273,7 @@ /** * Called when the body was clicked on. - * Closes the off canvas menu. + * Triggers the history back functionality * * @public * @method onClickBody @@ -284,14 +285,25 @@ event.preventDefault(); event.stopPropagation(); - me.closeMenu(); + if (me.isOpened) { + window.history.back(); + } $.publish('plugin/swOffcanvasMenu/onClickCloseButton', [ me, event ]); }, + /** + * Called when the browser goes back in history + * Closes the off-canvas menu + */ + onBackButton: function() { + this.closeMenu(); + }, + /** * Opens the off-canvas menu based on the direction. * Also closes all other off-canvas menus. + * Pushes to the history state, so it could be closed with browser back * * @public * @method openMenu @@ -324,6 +336,8 @@ me.$offCanvas.addClass(opts.openClass); + window.history.pushState('offcanvas-open', ''); + $.publish('plugin/swOffcanvasMenu/onOpenMenu', [ me ]); if (opts.mode === 'ajax' && opts.ajaxURL) { @@ -389,11 +403,13 @@ me.$pageWrap.prop('style', ''); } - me.$el.off(me.getEventName('click'), opts.closeButtonSelector); + me._off(me.$el, 'click touch'); + me._off(window, 'popstate'); + me.$offCanvas.off(me.getEventName('click'), opts.closeButtonSelector); $.unsubscribe(me.getEventName('plugin/swOffcanvasMenu/onBeforeOpenMenu')); me._destroy(); } }); -})(jQuery); +})(jQuery, window); From b7bf036ef84db9e13d70af93d96e1e42cc5fd0c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=B6nig?= Date: Tue, 15 Dec 2020 11:32:11 +0100 Subject: [PATCH 015/730] SW-25949 - use major version option (--1) for composer self-update, instead of explicit using version 1, because version 1 doesn't exists. fixes #2402 --- build/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.xml b/build/build.xml index 093ce636cb5..ab48ff99e91 100644 --- a/build/build.xml +++ b/build/build.xml @@ -90,7 +90,7 @@ - + From ad6c471f2d094f0dedcb7fbd9ffac15af0e5ecda Mon Sep 17 00:00:00 2001 From: Philip Gatzka Date: Mon, 19 Apr 2021 14:28:33 +0200 Subject: [PATCH 016/730] NTR - Repair migration Migrations_Migration393 --- _sql/migrations/393-add-404-page-config-options.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/_sql/migrations/393-add-404-page-config-options.php b/_sql/migrations/393-add-404-page-config-options.php index bd74e26c24a..ebd7c90e5ad 100644 --- a/_sql/migrations/393-add-404-page-config-options.php +++ b/_sql/migrations/393-add-404-page-config-options.php @@ -4,6 +4,11 @@ class Migrations_Migration393 Extends Shopware\Components\Migrations\AbstractMig public function up($modus) { $this->addSql("SET @formId = (SELECT `id` FROM `s_core_config_forms` WHERE name = 'Frontend100');"); + $sql = <<addSql($sql); $this->addSql("SET @elementId = (SELECT id FROM s_core_config_elements WHERE name = 'PageNotFoundDestination' LIMIT 1);"); $this->addSql(" @@ -11,6 +16,11 @@ public function up($modus) VALUES (@elementId, '2', '\"Page not found\" destination', 'When the user requests a non-existent page, he will be shown the following page.' ); "); + $sql = <<addSql($sql); $this->addSql("SET @elementId = (SELECT id FROM s_core_config_elements WHERE name = 'PageNotFoundCode' LIMIT 1);"); $this->addSql(" @@ -18,4 +28,4 @@ public function up($modus) VALUES (@elementId, '2', '\"Page not found\" error code', 'HTTP code used in \"Page not found\" responses' ); "); } -} +} \ No newline at end of file From dcb24eb5ec757c991b5a4e2ddced379e5820744d Mon Sep 17 00:00:00 2001 From: Philip Gatzka Date: Thu, 15 Apr 2021 15:25:37 +0200 Subject: [PATCH 017/730] SW-26001 - Adjust error controller --- engine/Shopware/Controllers/Frontend/Error.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/engine/Shopware/Controllers/Frontend/Error.php b/engine/Shopware/Controllers/Frontend/Error.php index af3e6bd42bc..be864f54dc5 100644 --- a/engine/Shopware/Controllers/Frontend/Error.php +++ b/engine/Shopware/Controllers/Frontend/Error.php @@ -50,10 +50,7 @@ public function preDispatch() $this->enableBackendTheme(); } - if (strpos($this->Request()->getHeader('Content-Type'), 'application/json') === 0) { - $this->Front()->Plugins()->Json()->setRenderer(); - $this->View()->assign('success', false); - } elseif ($this->Request()->isXmlHttpRequest() || !Shopware()->Container()->initialized('db')) { + if ($this->Request()->isXmlHttpRequest() || !Shopware()->Container()->initialized('db')) { $this->View()->loadTemplate($templateModule . '/error/exception.tpl'); } elseif (isset($_ENV['SHELL']) || PHP_SAPI === 'cli') { $this->View()->loadTemplate($templateModule . '/error/cli.tpl'); From f71281c530e17f99518e16efb591c1bc0248ed38 Mon Sep 17 00:00:00 2001 From: Philip Gatzka Date: Wed, 21 Apr 2021 09:47:10 +0200 Subject: [PATCH 018/730] SW-26013 - Revert "NTR - fix unit tests" This reverts commit 90bb86fdfaf1ece4684e54d8b90d3d43921d37a6. --- _sql/migrations/1434-add-href-default-selection.php | 7 +++++++ _sql/migrations/1442-add-meta-description-config.php | 7 +++++++ _sql/migrations/388-add-emotion-fields-position.php | 4 ++++ _sql/migrations/393-add-404-page-config-options.php | 2 +- _sql/migrations/469-add-404-article-page-config.php | 6 ++++++ _sql/migrations/741-migrate-salutation-mails.php | 7 +++++++ _sql/migrations/901-add-vote-shop-id.php | 6 ++++++ 7 files changed, 38 insertions(+), 1 deletion(-) diff --git a/_sql/migrations/1434-add-href-default-selection.php b/_sql/migrations/1434-add-href-default-selection.php index 1515c7a4a38..36f59b8ad11 100644 --- a/_sql/migrations/1434-add-href-default-selection.php +++ b/_sql/migrations/1434-add-href-default-selection.php @@ -40,5 +40,12 @@ public function up($modus) (@formId, 'hrefLangDefaultShop', 's:0:"";', 'href-lang Standardsprache', 'Gibt für diesen Shop "x-default" im href-lang-Tag aus und definiert damit die Sprache dieses Shops als Standardsprache.', 'combo', 0, 0, 0, '%s'); EOD; $this->addSql(sprintf($sql, serialize($settings))); + + $sql = <<<'EOD' +SET @elementId = LAST_INSERT_ID(); +INSERT IGNORE INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`, `description`) +VALUES (@elementId, 2, 'Default href-lang', 'The selected shop will be shown as "x-default" in the href-lang tag, therefore using this shop\'s language as default.'); +EOD; + $this->addSql($sql); } } diff --git a/_sql/migrations/1442-add-meta-description-config.php b/_sql/migrations/1442-add-meta-description-config.php index bc65969521c..bd67f4b35f2 100644 --- a/_sql/migrations/1442-add-meta-description-config.php +++ b/_sql/migrations/1442-add-meta-description-config.php @@ -31,6 +31,13 @@ public function up($modus) (`form_id`, `name`, `value`, `label`, `description`, `type`, `required`, `position`, `scope`, `options`) VALUES (@formId, 'metaDescriptionLength', 's:3:"150";', 'Maximal erlaubte Länge der Meta Description', '', 'number', 0, 0, 0, NULL); +EOD; + $this->addSql($sql); + + $sql = <<<'EOD' +SET @elementId = LAST_INSERT_ID(); +INSERT IGNORE INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`) +VALUES (@elementId, 2, 'Maximum allowed length of the meta description'); EOD; $this->addSql($sql); } diff --git a/_sql/migrations/388-add-emotion-fields-position.php b/_sql/migrations/388-add-emotion-fields-position.php index 2b5adf212fb..1106c9bf7c0 100644 --- a/_sql/migrations/388-add-emotion-fields-position.php +++ b/_sql/migrations/388-add-emotion-fields-position.php @@ -8,5 +8,9 @@ public function up($modus) $this->addSql("SET @parent = (SELECT id FROM `s_library_component` WHERE `x_type`='emotion-components-article-slider' AND template = 'component_article_slider' AND pluginID IS NULL LIMIT 1);"); $this->addSql("SET @maxNumberPosition = (SELECT id FROM `s_library_component_field` WHERE `name`='article_slider_max_number' AND componentID = @parent LIMIT 1);"); $this->addSql("UPDATE s_library_component_field SET position = position+1 WHERE componentID = @parent AND id >= @maxNumberPosition;"); + $this->addSql(" + INSERT INTO `s_library_component_field` (`componentID`, `name`, `x_type`, `value_type`, `field_label`, `support_text`, `help_title`, `help_text`, `store`, `display_field`, `value_field`, `default_value`, `allow_blank`, `position`) VALUES + (@parent, 'article_slider_category', 'emotion-components-fields-category-selection', '', '', '', '', '', '', '', '', '', 1, @maxNumberPosition); + "); } } diff --git a/_sql/migrations/393-add-404-page-config-options.php b/_sql/migrations/393-add-404-page-config-options.php index ebd7c90e5ad..c6236ed4d3f 100644 --- a/_sql/migrations/393-add-404-page-config-options.php +++ b/_sql/migrations/393-add-404-page-config-options.php @@ -28,4 +28,4 @@ public function up($modus) VALUES (@elementId, '2', '\"Page not found\" error code', 'HTTP code used in \"Page not found\" responses' ); "); } -} \ No newline at end of file +} diff --git a/_sql/migrations/469-add-404-article-page-config.php b/_sql/migrations/469-add-404-article-page-config.php index 8b9447bc6cf..4060a421ae1 100644 --- a/_sql/migrations/469-add-404-article-page-config.php +++ b/_sql/migrations/469-add-404-article-page-config.php @@ -3,6 +3,12 @@ class Migrations_Migration469 Extends Shopware\Components\Migrations\AbstractMig { public function up($modus) { + $this->addSql("SET @formId = (SELECT `id` FROM `s_core_config_forms` WHERE name = 'Frontend100');"); + $sql = <<addSql($sql); $this->addSql("SET @elementId = (SELECT id FROM s_core_config_elements WHERE name = 'RelatedArticlesOnArticleNotFound' LIMIT 1);"); $this->addSql(" diff --git a/_sql/migrations/741-migrate-salutation-mails.php b/_sql/migrations/741-migrate-salutation-mails.php index 43e505f33b2..a4c7ace3bbc 100644 --- a/_sql/migrations/741-migrate-salutation-mails.php +++ b/_sql/migrations/741-migrate-salutation-mails.php @@ -57,6 +57,13 @@ public function up($modus) $this->addSql($sql); + $sql = <<<'EOD' + SET @elementId = (SELECT id FROM s_core_config_elements WHERE name = 'displayprofiletitle' LIMIT 1); + INSERT INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`) VALUES (@elementId, 2, 'Display title field'); +EOD; + $this->addSql($sql); + + $sql = <<<'EOD' DELETE FROM `s_core_config_mails` WHERE dirty = 0 AND `name` IN ( 'sORDERSTATEMAIL11', diff --git a/_sql/migrations/901-add-vote-shop-id.php b/_sql/migrations/901-add-vote-shop-id.php index d4b5e8e87bb..3c2fbf5506a 100644 --- a/_sql/migrations/901-add-vote-shop-id.php +++ b/_sql/migrations/901-add-vote-shop-id.php @@ -18,6 +18,12 @@ public function up($modus) $this->addSql($sql); + $sql = <<<'EOD' + SET @elementId = (SELECT id FROM s_core_config_elements WHERE name = 'displayOnlySubShopVotes' LIMIT 1); + INSERT INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`) VALUES (@elementId, 2, 'Display shop specific votes only'); +EOD; + + $this->addSql($sql); $this->addSql("UPDATE s_core_config_elements SET scope = 1 WHERE name = 'votedisable'"); } } From 93dd916a91f24f4d875915db1b00b6a300ff6ae6 Mon Sep 17 00:00:00 2001 From: Philip Gatzka Date: Thu, 22 Apr 2021 09:48:37 +0200 Subject: [PATCH 019/730] SW-26013 - Remove superseded translation INSERTs --- _sql/migrations/741-migrate-salutation-mails.php | 7 ------- _sql/migrations/901-add-vote-shop-id.php | 6 ------ 2 files changed, 13 deletions(-) diff --git a/_sql/migrations/741-migrate-salutation-mails.php b/_sql/migrations/741-migrate-salutation-mails.php index a4c7ace3bbc..43e505f33b2 100644 --- a/_sql/migrations/741-migrate-salutation-mails.php +++ b/_sql/migrations/741-migrate-salutation-mails.php @@ -57,13 +57,6 @@ public function up($modus) $this->addSql($sql); - $sql = <<<'EOD' - SET @elementId = (SELECT id FROM s_core_config_elements WHERE name = 'displayprofiletitle' LIMIT 1); - INSERT INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`) VALUES (@elementId, 2, 'Display title field'); -EOD; - $this->addSql($sql); - - $sql = <<<'EOD' DELETE FROM `s_core_config_mails` WHERE dirty = 0 AND `name` IN ( 'sORDERSTATEMAIL11', diff --git a/_sql/migrations/901-add-vote-shop-id.php b/_sql/migrations/901-add-vote-shop-id.php index 3c2fbf5506a..d4b5e8e87bb 100644 --- a/_sql/migrations/901-add-vote-shop-id.php +++ b/_sql/migrations/901-add-vote-shop-id.php @@ -18,12 +18,6 @@ public function up($modus) $this->addSql($sql); - $sql = <<<'EOD' - SET @elementId = (SELECT id FROM s_core_config_elements WHERE name = 'displayOnlySubShopVotes' LIMIT 1); - INSERT INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`) VALUES (@elementId, 2, 'Display shop specific votes only'); -EOD; - - $this->addSql($sql); $this->addSql("UPDATE s_core_config_elements SET scope = 1 WHERE name = 'votedisable'"); } } From abdc2b450435e8dcfa1efe01adcde81a630962ba Mon Sep 17 00:00:00 2001 From: Philip Gatzka Date: Mon, 3 May 2021 09:43:08 +0200 Subject: [PATCH 020/730] SW-26049 - Adjust product name rendering, use DOMParser in getText instead of actual DOM insertion --- engine/Library/ExtJs/overrides/Ext.String.js | 20 ++++++++++++++----- .../backend/article/controller/detail.js | 5 ++++- .../backend/article/view/detail/window.js | 5 ++++- .../Bare/frontend/detail/content/header.tpl | 2 +- .../Frontend/Bare/frontend/detail/header.tpl | 2 +- .../Bare/frontend/detail/tabs/comment.tpl | 2 +- .../Bare/frontend/detail/tabs/description.tpl | 6 +++--- 7 files changed, 29 insertions(+), 13 deletions(-) diff --git a/engine/Library/ExtJs/overrides/Ext.String.js b/engine/Library/ExtJs/overrides/Ext.String.js index 3c70e183907..a2c1d202530 100644 --- a/engine/Library/ExtJs/overrides/Ext.String.js +++ b/engine/Library/ExtJs/overrides/Ext.String.js @@ -24,19 +24,29 @@ /** @lends Ext.String */ //{block name="extjs/overrides/string"} Ext.override(Ext.String, { + /** + * @var DOMParser _domParser + */ + _domParser: new DOMParser(), + /** * Return the text content of the element * * @returns string */ getText: function(value) { - var me = this, - elementNode; + var me = this; + + if (!value) { + return ''; + } - elementNode = document.createElement('div'); - elementNode.innerHTML = value; + var elementNodes = me._domParser + .parseFromString(Ext.String.format('
[0]
', value), "text/html") + .documentElement + .querySelectorAll('div'); - return me._getText([elementNode]); + return me._getText(elementNodes); }, /** diff --git a/themes/Backend/ExtJs/backend/article/controller/detail.js b/themes/Backend/ExtJs/backend/article/controller/detail.js index e9e57c6aa45..a20e47683eb 100644 --- a/themes/Backend/ExtJs/backend/article/controller/detail.js +++ b/themes/Backend/ExtJs/backend/article/controller/detail.js @@ -267,7 +267,10 @@ Ext.define('Shopware.apps.Article.controller.Detail', { success: function(record, operation) { var newArticle = operation.getResultSet().records[0], - message = Ext.String.format(me.snippets.saved.message, article.get('name')); + message = Ext.String.format( + me.snippets.saved.message, + Ext.String.htmlEncode(article.get('name')) + ); if (supplierNeedsReload) { mainWindow.supplierStore.filters.clear(); diff --git a/themes/Backend/ExtJs/backend/article/view/detail/window.js b/themes/Backend/ExtJs/backend/article/view/detail/window.js index ddaed3bec58..b34d64eadc2 100644 --- a/themes/Backend/ExtJs/backend/article/view/detail/window.js +++ b/themes/Backend/ExtJs/backend/article/view/detail/window.js @@ -361,7 +361,10 @@ Ext.define('Shopware.apps.Article.view.detail.Window', { title = me.snippets.titleNew; if (me.article && me.article.get('id')>0) { - title = Ext.String.format(me.snippets.titleEdit, me.article.get('name')); + title = Ext.String.format( + me.snippets.titleEdit, + Ext.String.htmlEncode(me.article.get('name')) + ); } me.setTitle(title); diff --git a/themes/Frontend/Bare/frontend/detail/content/header.tpl b/themes/Frontend/Bare/frontend/detail/content/header.tpl index 606b1f6b719..a79c5c6eefc 100644 --- a/themes/Frontend/Bare/frontend/detail/content/header.tpl +++ b/themes/Frontend/Bare/frontend/detail/content/header.tpl @@ -7,7 +7,7 @@ {* Product name *} {block name='frontend_detail_index_name'}

- {$sArticle.articleName} + {$sArticle.articleName|escape}

{/block} diff --git a/themes/Frontend/Bare/frontend/detail/header.tpl b/themes/Frontend/Bare/frontend/detail/header.tpl index 1b14f475bec..b0ee4bbe380 100644 --- a/themes/Frontend/Bare/frontend/detail/header.tpl +++ b/themes/Frontend/Bare/frontend/detail/header.tpl @@ -1,7 +1,7 @@ {extends file='frontend/index/header.tpl'} {* Meta title *} -{block name="frontend_index_header_title"}{if $sArticle.metaTitle}{$sArticle.metaTitle|escapeHtml} | {{config name=sShopname}|escapeHtml}{else}{$sArticle.articleName} | {$smarty.block.parent}{/if}{/block} +{block name="frontend_index_header_title"}{if $sArticle.metaTitle}{$sArticle.metaTitle|escapeHtml} | {{config name=sShopname}|escapeHtml}{else}{$sArticle.articleName|escape} | {$smarty.block.parent}{/if}{/block} {* Meta opengraph tags *} {block name='frontend_index_header_meta_tags_opengraph'} diff --git a/themes/Frontend/Bare/frontend/detail/tabs/comment.tpl b/themes/Frontend/Bare/frontend/detail/tabs/comment.tpl index ed4833304f9..9272cbe8b96 100644 --- a/themes/Frontend/Bare/frontend/detail/tabs/comment.tpl +++ b/themes/Frontend/Bare/frontend/detail/tabs/comment.tpl @@ -47,7 +47,7 @@ {* Review title *} {block name="frontend_detail_tabs_rating_title"}
- {s name="DetailCommentHeader"}{/s} "{$sArticle.articleName}" + {s name="DetailCommentHeader"}{/s} "{$sArticle.articleName|escape}"
{/block} diff --git a/themes/Frontend/Bare/frontend/detail/tabs/description.tpl b/themes/Frontend/Bare/frontend/detail/tabs/description.tpl index 42115a1f98b..4fca7fda314 100644 --- a/themes/Frontend/Bare/frontend/detail/tabs/description.tpl +++ b/themes/Frontend/Bare/frontend/detail/tabs/description.tpl @@ -19,7 +19,7 @@ {* Headline *} {block name='frontend_detail_description_title'}
- {s name="DetailDescriptionHeader"}{/s} "{$sArticle.articleName}" + {s name="DetailDescriptionHeader"}{/s} "{$sArticle.articleName|escape}"
{/block} @@ -59,7 +59,7 @@ {* Further links title *} {block name='frontend_detail_description_links_title'}
- {s name="ArticleTipMoreInformation"}{/s} "{$sArticle.articleName}" + {s name="ArticleTipMoreInformation"}{/s} "{$sArticle.articleName|escape}"
{/block} @@ -148,7 +148,7 @@ {* Comment title *} {block name='frontend_detail_description_our_comment_title'}
- {s name='DetailDescriptionComment'}{/s} "{$sArticle.articleName}" + {s name='DetailDescriptionComment'}{/s} "{$sArticle.articleName|escape}"
{/block} From 09f7e38ebf09a6fcbd18dacc0f3fbc64b701076b Mon Sep 17 00:00:00 2001 From: nathannaveen <42319948+nathannaveen@users.noreply.github.com> Date: Sat, 14 May 2022 01:30:33 +0000 Subject: [PATCH 021/730] SW-26740 - chore: Set permissions for GitHub actions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much. - Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs [Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/) Signed-off-by: nathannaveen <42319948+nathannaveen@users.noreply.github.com> fixes #2497 --- .github/workflows/check-code.yml | 3 +++ .github/workflows/codeql-analysis.yml | 7 +++++++ .github/workflows/phpunit.yml | 3 +++ 3 files changed, 13 insertions(+) diff --git a/.github/workflows/check-code.yml b/.github/workflows/check-code.yml index a16259c8e14..4eefef57963 100644 --- a/.github/workflows/check-code.yml +++ b/.github/workflows/check-code.yml @@ -4,6 +4,9 @@ on: push: pull_request: +permissions: + contents: read + jobs: build: runs-on: ubuntu-latest diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index dccd7cf2fd6..9fbe4ce4bea 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -5,8 +5,15 @@ on: schedule: - cron: '0 6 * * 4' +permissions: + contents: read + jobs: analyze: + permissions: + actions: read # for github/codeql-action/init to get workflow details + contents: read # for actions/checkout to fetch code + security-events: write # for github/codeql-action/autobuild to send a status report name: Analyze runs-on: ubuntu-latest diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 1ca3d560230..a94ea2a562c 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -4,6 +4,9 @@ on: push: pull_request: +permissions: + contents: read + jobs: php: strategy: From 9f19e39c380b17db16f14d080b4bf8a47c956ac9 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Fri, 27 May 2022 14:57:29 +0200 Subject: [PATCH 022/730] SW-26621 - Fix doctrine EntityNotFoundException if invalid data is submitted while creating a new address --- .../Components/Model/ModelManager.php | 10 +-- .../Controllers/Frontend/AddressTest.php | 76 +++++++++++++++++++ 2 files changed, 80 insertions(+), 6 deletions(-) create mode 100644 tests/Functional/Controllers/Frontend/AddressTest.php diff --git a/engine/Shopware/Components/Model/ModelManager.php b/engine/Shopware/Components/Model/ModelManager.php index df9b3b9e6a3..31f835caf09 100644 --- a/engine/Shopware/Components/Model/ModelManager.php +++ b/engine/Shopware/Components/Model/ModelManager.php @@ -353,13 +353,11 @@ protected function serializeEntity($entity) $data[$key] = $this->serializeEntity($data[$key]); } } elseif ($mapping['isOwningSide'] && $mapping['type'] & ClassMetadata::TO_ONE) { - if ($metadata->reflFields[$field]->getValue($entity) !== null) { - $data[$key] = $this->getUnitOfWork()->getEntityIdentifier( - $metadata->reflFields[$field]->getValue($entity) - ); + $association = $metadata->reflFields[$field]->getValue($entity); + if (\is_object($association) && $this->getUnitOfWork()->isInIdentityMap($association)) { + $data[$key] = $this->getUnitOfWork()->getEntityIdentifier($association); } else { - // In some case the relationship may not exist, but we want - // to know about it + // In some case the relationship may not exist, but we want to know about it $data[$key] = null; } } diff --git a/tests/Functional/Controllers/Frontend/AddressTest.php b/tests/Functional/Controllers/Frontend/AddressTest.php new file mode 100644 index 00000000000..ed8f2e7b2d3 --- /dev/null +++ b/tests/Functional/Controllers/Frontend/AddressTest.php @@ -0,0 +1,76 @@ +loginCustomer(); + + $controller = $this->getContainer()->get('shopware_controllers_frontend_address'); + $controller->setContainer($this->getContainer()); + + $request = new Enlight_Controller_Request_RequestTestCase(); + $request->setMethod(Request::METHOD_POST); + $request->setPost([ + 'address' => [ + 'additional' => [ + 'customer_type' => 'private', + ], + 'salutation' => 'mr', + 'firstname' => '', + 'lastname' => 'Test', + 'street' => 'Test Street 123', + 'zipcode' => 12345, + 'city' => 'Test Town', + 'country' => 2, + ], + ]); + $controller->setRequest($request); + $this->getContainer()->get('front')->setRequest($request); + + $view = new Enlight_View_Default(new Enlight_Template_Manager()); + $controller->setView($view); + + $controller->preDispatch(); + $controller->createAction(); + + static::assertTrue($view->getAssign('error_flags')['firstname']); + } +} From 49c207b5f09ab645ab1c2367adb6625f77516f55 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Tue, 31 May 2022 14:15:09 +0200 Subject: [PATCH 023/730] PT-12774 - Fix return type in Smarty template method --- engine/Library/Smarty/sysplugins/smarty_internal_data.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/Library/Smarty/sysplugins/smarty_internal_data.php b/engine/Library/Smarty/sysplugins/smarty_internal_data.php index 5baf3b76dc7..df4f74b51b6 100644 --- a/engine/Library/Smarty/sysplugins/smarty_internal_data.php +++ b/engine/Library/Smarty/sysplugins/smarty_internal_data.php @@ -198,7 +198,7 @@ public function appendByRef($tpl_var, &$value, $merge = false) * @param string $varname variable name or null * @param string $_ptr optional pointer to data object * @param boolean $search_parents include parent templates? - * @return string variable value or or array of variables + * @return mixed variable value or array of variables */ public function getTemplateVars($varname = null, $_ptr = null, $search_parents = true) { @@ -548,4 +548,4 @@ public function __toString() } -?> \ No newline at end of file +?> From 96335822f9a082e356f258075dcdcafae18a85ea Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Tue, 31 May 2022 13:17:31 +0200 Subject: [PATCH 024/730] SW-26744 - Update code style fixer --- .gitlab-ci.yml | 3 +- .php-cs-fixer.php | 2 +- .../Library/Enlight/Event/Handler/Plugin.php | 2 +- engine/Library/Enlight/Hook/ProxyFactory.php | 2 +- .../Template/Plugins/modifier.fill.php | 6 +- .../Template/Plugins/modifier.padding.php | 6 +- .../Form/Account/AddressFormType.php | 4 +- .../Form/Account/AttributeFormType.php | 2 +- .../Provider/ShopwareProvider.php | 4 +- .../Product/ProductListingVariationLoader.php | 10 +- .../StoreFrontEmotionDeviceConfiguration.php | 8 +- .../EsBackendBundle/SearchQueryBuilder.php | 2 +- .../OrderRecalculationSubscriber.php | 2 +- .../Subscriber/ProductStockSubscriber.php | 2 +- .../SearchBundle/SearchTermPreProcessor.php | 12 +- .../DynamicConditionParserTrait.php | 8 +- .../IsAvailableConditionHandler.php | 4 +- .../SearchTermConditionHandler.php | 4 +- .../Bundle/SearchBundleDBAL/PriceHelper.php | 14 +- .../SearchTerm/KeywordFinder.php | 4 +- .../SearchTerm/SearchTermQueryBuilder.php | 2 +- .../Gateway/DBAL/CategoryGateway.php | 2 +- .../Gateway/DBAL/ManufacturerGateway.php | 2 +- .../Service/Core/CheapestPriceService.php | 6 +- .../Service/Core/GraduatedPricesService.php | 8 +- .../Core/VariantListingPriceService.php | 2 +- .../StoreFrontBundle/Struct/Attribute.php | 2 +- ...ateArticleAttributeTranslationsCommand.php | 2 +- .../Components/Api/Resource/Article.php | 8 +- .../Api/Resource/PaymentMethods.php | 4 +- .../Shopware/Components/Api/Resource/Shop.php | 4 +- engine/Shopware/Components/CacheManager.php | 4 +- .../Components/Cart/PaymentTokenService.php | 2 +- .../Cart/PaymentTokenSubscriber.php | 2 +- .../Components/Check/Requirements.php | 22 +- .../DependencyInjection/Bridge/Cache.php | 2 +- .../HttpCache/CacheRouteInstaller.php | 4 +- .../Log/Formatter/HtmlFormatter.php | 2 +- engine/Shopware/Components/MemoryLimit.php | 4 +- .../Shopware/Components/Model/Generator.php | 2 +- .../MultiEdit/Resource/Product/Filter.php | 2 +- .../Shopware/Components/Plugin/Bootstrap.php | 8 +- .../Components/Plugin/FormSynchronizer.php | 6 +- .../Plugin/XmlReader/XmlConfigReader.php | 4 +- .../Routing/Generators/RewriteGenerator.php | 2 +- .../Routing/Matchers/EventMatcher.php | 2 +- engine/Shopware/Components/Routing/Router.php | 6 +- .../Components/Session/PdoSessionHandler.php | 4 +- engine/Shopware/Components/SitePageMenu.php | 2 +- .../Shopware/Components/Snippet/Manager.php | 4 +- .../Components/Theme/Configurator.php | 22 +- .../Shopware/Components/Theme/Inheritance.php | 2 +- .../Shopware/Components/Theme/Installer.php | 2 +- .../Components/Thumbnail/Generator/Basic.php | 2 +- engine/Shopware/Components/Translation.php | 6 +- .../Components/UploadMaxSizeValidator.php | 2 +- .../Controllers/Backend/Analytics.php | 4 +- .../Controllers/Backend/Application.php | 16 +- .../Shopware/Controllers/Backend/Article.php | 36 +- .../Shopware/Controllers/Backend/Config.php | 2 +- .../Shopware/Controllers/Backend/Customer.php | 8 +- engine/Shopware/Controllers/Backend/Index.php | 2 +- .../Controllers/Backend/Notification.php | 4 +- engine/Shopware/Controllers/Backend/Order.php | 4 +- .../Shopware/Controllers/Backend/Partner.php | 2 +- .../Controllers/Backend/Performance.php | 4 +- .../Controllers/Backend/PluginInstaller.php | 2 +- .../Shopware/Controllers/Backend/Premium.php | 22 +- .../Controllers/Backend/RiskManagement.php | 2 +- engine/Shopware/Controllers/Backend/Site.php | 16 +- engine/Shopware/Controllers/Backend/Vote.php | 2 +- .../Shopware/Controllers/Backend/Voucher.php | 16 +- engine/Shopware/Controllers/Frontend/Blog.php | 2 +- .../Controllers/Frontend/Checkout.php | 4 +- .../Shopware/Controllers/Widgets/Emotion.php | 4 +- engine/Shopware/Core/sAdmin.php | 4 +- engine/Shopware/Core/sArticles.php | 8 +- engine/Shopware/Core/sArticlesComparisons.php | 4 +- engine/Shopware/Core/sBasket.php | 2 +- engine/Shopware/Core/sExport.php | 2 +- engine/Shopware/Core/sOrder.php | 4 +- engine/Shopware/Core/sRewriteTable.php | 6 +- engine/Shopware/Kernel.php | 4 +- engine/Shopware/Models/Article/Repository.php | 8 +- .../Shopware/Models/Category/Repository.php | 2 +- .../Shopware/Models/Dispatch/Repository.php | 2 +- engine/Shopware/Models/Document/Order.php | 8 +- engine/Shopware/Models/Media/Media.php | 2 +- .../Models/Order/Document/Repository.php | 4 +- engine/Shopware/Models/Shop/Repository.php | 4 +- .../Components/FeedbackCollector.php | 4 +- .../Default/Core/CronBirthday/Bootstrap.php | 2 +- .../Default/Core/HttpCache/CacheControl.php | 2 +- .../Components/SimilarShown.php | 10 +- .../Default/Core/PaymentMethods/Bootstrap.php | 2 +- .../Components/GenericPaymentMethod.php | 4 +- .../Components/SepaPaymentMethod.php | 2 +- .../Default/Core/PostFilter/Bootstrap.php | 4 +- .../Plugins/Default/Core/Router/Bootstrap.php | 8 +- .../Plugins/Default/Core/System/Bootstrap.php | 2 +- .../Frontend/CronRefresh/Bootstrap.php | 4 +- recovery/common/src/HttpClient/CurlClient.php | 2 +- recovery/install/index.php | 2 +- recovery/install/ping.php | 2 +- recovery/install/src/Requirements.php | 18 +- .../AccountBundle/Controller/AccountTest.php | 12 +- .../Condition/PriceConditionTest.php | 4 +- .../Condition/VoteAverageConditionTest.php | 40 +-- .../Facet/VoteAverageFacetTest.php | 10 +- .../Bundle/StoreFrontBundle/Helper.php | 4 +- .../Bundle/StoreFrontBundle/VoteTest.php | 34 +- .../Functional/Components/Api/ArticleTest.php | 12 +- .../Components/Api/CustomerTest.php | 4 +- tests/Functional/Components/Api/MediaTest.php | 14 +- .../Components/Api/TranslationTest.php | 2 +- .../Cart/PaymentTokenServiceTest.php | 4 +- .../Components/Theme/InstallerTest.php | 2 +- .../Controllers/Backend/ArticleTest.php | 2 +- .../Controllers/Backend/PartnerTest.php | 8 +- .../Controllers/Backend/UserManagerTest.php | 6 +- .../Controllers/Frontend/SearchTest.php | 2 +- tests/Functional/Core/AdminTest.php | 2 +- tests/Functional/Core/BasketTest.php | 8 +- tests/Functional/Core/sCategoriesTest.php | 14 +- tests/Functional/Helper/Utils.php | 2 +- .../Models/Shop/ShopRepositoryTest.php | 12 +- .../Components/SimilarShownTest.php | 2 +- .../Components/TopSellerTest.php | 14 +- .../Modules/ArticleTest.php | 4 +- .../Components/SepaPaymentMethodTest.php | 6 +- .../bootstrap/Element/BlogArticle.php | 4 +- .../bootstrap/Element/CartPosition.php | 4 +- .../features/bootstrap/Element/Paging.php | 4 +- .../features/bootstrap/FeatureContext.php | 8 +- tests/Mink/features/bootstrap/Helper.php | 6 +- .../features/bootstrap/ShopwareContext.php | 6 +- .../Unit/Components/Hook/HookManagerTest.php | 6 +- tests/Unit/Components/HttpCache/StoreTest.php | 2 +- .../Plugin/XmlReader/XmlConfigReaderTest.php | 20 +- .../Plugin/XmlReader/XmlReaderBaseTest.php | 14 +- vendor-bin/cs-fixer/composer.json | 4 +- vendor-bin/cs-fixer/composer.lock | 329 +++++++++--------- 142 files changed, 590 insertions(+), 588 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8338d6d9cca..1051fbf7c99 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,8 @@ workflow: key: files: - 'composer.lock' - - 'recovery/common/composer.lock' +# - 'recovery/common/composer.lock' TODO - SW-26745: Needs to be considered again, but GitLab only allows two files + - 'vendor-bin/cs-fixer/composer.lock' paths: - 'vendor/' - 'recovery/common/vendor/' diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index 1ec0bd9f361..b84d4bbfdda 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -67,7 +67,7 @@ 'global_namespace_import' => true, 'header_comment' => ['header' => $header, 'separate' => 'bottom', 'comment_type' => 'PHPDoc'], 'modernize_types_casting' => true, - 'native_function_invocation' => true, + 'native_function_invocation' => ['exclude' => ['ini_get'], 'strict' => false], 'no_alias_functions' => true, 'no_useless_else' => true, 'no_useless_return' => true, diff --git a/engine/Library/Enlight/Event/Handler/Plugin.php b/engine/Library/Enlight/Event/Handler/Plugin.php index 6efcfe8a72f..4b0ac161f0c 100644 --- a/engine/Library/Enlight/Event/Handler/Plugin.php +++ b/engine/Library/Enlight/Event/Handler/Plugin.php @@ -148,7 +148,7 @@ public function execute(Enlight_Event_EventArgs $args) if (!method_exists($plugin, $this->listener)) { $name = $this->plugin instanceof Enlight_Plugin_Bootstrap ? $this->plugin->getName() : $this->plugin; trigger_error('Listener "' . $this->listener . '" in "' . $name . '" is not callable.', E_USER_ERROR); - //throw new Enlight_Exception('Listener "' . $this->listener . '" in "' . $name . '" is not callable.'); + // throw new Enlight_Exception('Listener "' . $this->listener . '" in "' . $name . '" is not callable.'); return; } diff --git a/engine/Library/Enlight/Hook/ProxyFactory.php b/engine/Library/Enlight/Hook/ProxyFactory.php index 91946b4a57b..d92384362a1 100644 --- a/engine/Library/Enlight/Hook/ProxyFactory.php +++ b/engine/Library/Enlight/Hook/ProxyFactory.php @@ -103,7 +103,7 @@ public function getProxy($class) $classImplements = class_implements($class); if (!\is_array($classImplements) || !\in_array(Enlight_Hook::class, $classImplements, true)) { trigger_error(sprintf('The class "%s" does not implement the Enlight_Hook Interface. It will be thrown in 5.8.', $class), E_USER_WARNING); - //throw new Enlight_Hook_Exception('The class' . $class . ' does not implement Enlight_Hook interface.'); + // throw new Enlight_Hook_Exception('The class' . $class . ' does not implement Enlight_Hook interface.'); } $proxyFile = $this->getProxyFileName($class); diff --git a/engine/Library/Enlight/Template/Plugins/modifier.fill.php b/engine/Library/Enlight/Template/Plugins/modifier.fill.php index 3442f59248c..bc98cbc0426 100644 --- a/engine/Library/Enlight/Template/Plugins/modifier.fill.php +++ b/engine/Library/Enlight/Template/Plugins/modifier.fill.php @@ -32,10 +32,10 @@ function smarty_modifier_fill($str, $width = 10, $break = '...', $fill = ' ') { // checks if we have either a integer, float, sting or boolean value // If we don't get what we expected, we use some default values - if (!is_scalar($break)) { + if (!\is_scalar($break)) { $break = '...'; } - if (empty($fill) || !is_scalar($fill)) { + if (empty($fill) || !\is_scalar($fill)) { $fill = ' '; } if (empty($width) || !is_numeric($width)) { @@ -44,7 +44,7 @@ function smarty_modifier_fill($str, $width = 10, $break = '...', $fill = ' ') $width = (int) $width; } // if no string is given, just build one string containing the fill pattern - if (!is_scalar($str)) { + if (!\is_scalar($str)) { return str_repeat($fill, $width); } // If the string longer than the given width shorten the string and append the break pattern diff --git a/engine/Library/Enlight/Template/Plugins/modifier.padding.php b/engine/Library/Enlight/Template/Plugins/modifier.padding.php index 67e8f6686e9..ce2fa684f61 100644 --- a/engine/Library/Enlight/Template/Plugins/modifier.padding.php +++ b/engine/Library/Enlight/Template/Plugins/modifier.padding.php @@ -32,10 +32,10 @@ function smarty_modifier_padding($str, $width = 10, $break = '...', $fill = ' ') { // checks if we have either a integer, float, sting or boolean value // If we don't get what we expected, we use some default values - if (!is_scalar($break)) { + if (!\is_scalar($break)) { $break = '...'; } - if (empty($fill) || !is_scalar($fill)) { + if (empty($fill) || !\is_scalar($fill)) { $fill = ' '; } if (empty($width) || !is_numeric($width)) { @@ -44,7 +44,7 @@ function smarty_modifier_padding($str, $width = 10, $break = '...', $fill = ' ') $width = (int) $width; } // if no string is given, just build one string containing the fill pattern - if (!is_scalar($str)) { + if (!\is_scalar($str)) { return str_repeat($fill, $width); } // If the string longer than the given width shorten the string and append the break pattern diff --git a/engine/Shopware/Bundle/AccountBundle/Form/Account/AddressFormType.php b/engine/Shopware/Bundle/AccountBundle/Form/Account/AddressFormType.php index 61b775a991d..7e1be7191d8 100644 --- a/engine/Shopware/Bundle/AccountBundle/Form/Account/AddressFormType.php +++ b/engine/Shopware/Bundle/AccountBundle/Form/Account/AddressFormType.php @@ -143,8 +143,8 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'data_class' => AddressAttribute::class, ]); - //dynamic field which contains multiple values - //used for extendable data which has not to persist over attributes + // dynamic field which contains multiple values + // used for extendable data which has not to persist over attributes $builder->add('additional', null, [ 'compound' => true, 'allow_extra_fields' => true, diff --git a/engine/Shopware/Bundle/AccountBundle/Form/Account/AttributeFormType.php b/engine/Shopware/Bundle/AccountBundle/Form/Account/AttributeFormType.php index 56a2c5c15c7..9f7fea88a01 100644 --- a/engine/Shopware/Bundle/AccountBundle/Form/Account/AttributeFormType.php +++ b/engine/Shopware/Bundle/AccountBundle/Form/Account/AttributeFormType.php @@ -95,7 +95,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder->add($field); } - //set default value for all attribute fields to prevent null override if a field isn't in the submit data + // set default value for all attribute fields to prevent null override if a field isn't in the submit data $builder->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) use ($attributes, $metaData) { try { $form = $event->getForm(); diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Provider/ShopwareProvider.php b/engine/Shopware/Bundle/BenchmarkBundle/Provider/ShopwareProvider.php index 7ffd1c25754..7d9b166600e 100644 --- a/engine/Shopware/Bundle/BenchmarkBundle/Provider/ShopwareProvider.php +++ b/engine/Shopware/Bundle/BenchmarkBundle/Provider/ShopwareProvider.php @@ -152,7 +152,7 @@ private function getPhpVersionId() */ private function getMaxExecutionTime() { - return (int) ini_get('max_execution_time'); + return (int) \ini_get('max_execution_time'); } /** @@ -160,7 +160,7 @@ private function getMaxExecutionTime() */ private function getMemoryLimit() { - return (int) ini_get('memory_limit'); + return (int) \ini_get('memory_limit'); } /** diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductListingVariationLoader.php b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductListingVariationLoader.php index d1e4683ea85..4b416fc61bf 100644 --- a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductListingVariationLoader.php +++ b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductListingVariationLoader.php @@ -309,7 +309,7 @@ private function nestedArrayCombinations(array $groups, array $onlyFirst, array $tmp = array_merge($item, [$index => (int) $option->getId()]); sort($tmp, SORT_NUMERIC); - //check if this combination is a available combination (out of stock, not active) + // check if this combination is a available combination (out of stock, not active) $isAvailable = false; foreach ($availability as $available) { $available = '-' . $available . '-'; @@ -320,7 +320,7 @@ private function nestedArrayCombinations(array $groups, array $onlyFirst, array $allMatch = false; } } - //all options matched? combination is available, break availability check + // all options matched? combination is available, break availability check if ($allMatch) { $isAvailable = true; break; @@ -583,7 +583,7 @@ private function getCombinationPrices( array_diff(array_intersect(array_flip($options), $combination), $expandGroupIds) )); - //filter prices which has configuration matches the current variant configuration + // filter prices which has configuration matches the current variant configuration $affected = array_filter($prices, function (array $price) use ($tmp, $excludedOptions) { $diff = array_values(array_intersect(array_diff($price['options'], $excludedOptions), $tmp)); @@ -592,8 +592,8 @@ private function getCombinationPrices( $price = array_column($affected, 'price'); - //build combination key by group ids - //store front filters to filtered group "sort by price for `color`" + // build combination key by group ids + // store front filters to filtered group "sort by price for `color`" $key = 'g' . implode('-', $combination); if (!empty($price)) { diff --git a/engine/Shopware/Bundle/EmotionBundle/Service/StoreFrontEmotionDeviceConfiguration.php b/engine/Shopware/Bundle/EmotionBundle/Service/StoreFrontEmotionDeviceConfiguration.php index 7a5c76b59a0..1807daeadad 100644 --- a/engine/Shopware/Bundle/EmotionBundle/Service/StoreFrontEmotionDeviceConfiguration.php +++ b/engine/Shopware/Bundle/EmotionBundle/Service/StoreFrontEmotionDeviceConfiguration.php @@ -55,14 +55,14 @@ public function getCategoryConfiguration($categoryId, ShopContextInterface $cont return empty($config['shopIds']) || \in_array($context->getShop()->getId(), $config['shopIds']); }); - //no active stream detected? display only emotions without customer stream configuration + // no active stream detected? display only emotions without customer stream configuration if (empty($context->getActiveCustomerStreamIds()) || $withStreams === false) { return array_filter($configurations, function ($config) { return $config['customer_stream_ids'] === null; }); } - //filter emotions which has customer stream configuration for active streams or which has no configuration + // filter emotions which has customer stream configuration for active streams or which has no configuration $configurations = array_filter( $configurations, function (array $config) use ($context) { @@ -74,10 +74,10 @@ function (array $config) use ($context) { } ); - //collect emotion replacements + // collect emotion replacements $replacements = $this->getReplacements($configurations); - //remove all emotions which replaced by customer stream emotions + // remove all emotions which replaced by customer stream emotions return array_filter( $configurations, function (array $config) use ($replacements) { diff --git a/engine/Shopware/Bundle/EsBackendBundle/SearchQueryBuilder.php b/engine/Shopware/Bundle/EsBackendBundle/SearchQueryBuilder.php index fe9fca660a5..230aa83d0b3 100644 --- a/engine/Shopware/Bundle/EsBackendBundle/SearchQueryBuilder.php +++ b/engine/Shopware/Bundle/EsBackendBundle/SearchQueryBuilder.php @@ -49,7 +49,7 @@ public function buildQuery(array $fields, $term) } } - //use combination for more precision + // use combination for more precision foreach ($combines as $token) { foreach ($fields as $field => $priority) { $bool->add(new MatchQuery($field, $token, ['boost' => $priority * 2]), BoolQuery::SHOULD); diff --git a/engine/Shopware/Bundle/OrderBundle/Subscriber/OrderRecalculationSubscriber.php b/engine/Shopware/Bundle/OrderBundle/Subscriber/OrderRecalculationSubscriber.php index da3c7ff6555..27f40697b8c 100644 --- a/engine/Shopware/Bundle/OrderBundle/Subscriber/OrderRecalculationSubscriber.php +++ b/engine/Shopware/Bundle/OrderBundle/Subscriber/OrderRecalculationSubscriber.php @@ -64,7 +64,7 @@ public function preUpdate(Enlight_Event_EventArgs $arguments) $orderDetail = $arguments->get('entity'); $entityManager = $arguments->get('entityManager'); - //returns a change set for the model, which contains all changed properties with the old and new value. + // returns a change set for the model, which contains all changed properties with the old and new value. $changeSet = $entityManager->getUnitOfWork()->getEntityChangeSet($orderDetail); $productChange = $changeSet['articleNumber'][0] !== $changeSet['articleNumber'][1]; diff --git a/engine/Shopware/Bundle/OrderBundle/Subscriber/ProductStockSubscriber.php b/engine/Shopware/Bundle/OrderBundle/Subscriber/ProductStockSubscriber.php index a64a6707f45..4f8b94d1a84 100644 --- a/engine/Shopware/Bundle/OrderBundle/Subscriber/ProductStockSubscriber.php +++ b/engine/Shopware/Bundle/OrderBundle/Subscriber/ProductStockSubscriber.php @@ -65,7 +65,7 @@ public function preUpdate(Enlight_Event_EventArgs $arguments) $entityManager = $arguments->get('entityManager'); - //returns a change set for the model, which contains all changed properties with the old and new value. + // returns a change set for the model, which contains all changed properties with the old and new value. $changeSet = $entityManager->getUnitOfWork()->getEntityChangeSet($orderDetail); $this->stockService->updateProductDetail( diff --git a/engine/Shopware/Bundle/SearchBundle/SearchTermPreProcessor.php b/engine/Shopware/Bundle/SearchBundle/SearchTermPreProcessor.php index f3b92a7b482..5a4e924edae 100644 --- a/engine/Shopware/Bundle/SearchBundle/SearchTermPreProcessor.php +++ b/engine/Shopware/Bundle/SearchBundle/SearchTermPreProcessor.php @@ -33,16 +33,16 @@ class SearchTermPreProcessor implements SearchTermPreProcessorInterface */ public function process($term) { - //This fix prevents an exception if the search term includes an character that can not be - //displayed with the database charset. - //This fix can be removed if all tables are set to utf8mb4_unicode_ci. + // This fix prevents an exception if the search term includes an character that can not be + // displayed with the database charset. + // This fix can be removed if all tables are set to utf8mb4_unicode_ci. - //converts encoded characters back ('%a5%27' to '?') + // converts encoded characters back ('%a5%27' to '?') $term = mb_convert_encoding($term, 'UTF-8'); - //does the replacing of 4byte chars to the Unicode replacement character + // does the replacing of 4byte chars to the Unicode replacement character $term = (string) preg_replace('/[\xF0-\xF7].../s', '�', $term); - //we have to strip the / otherwise broken urls would be created e.g. wrong pager urls + // we have to strip the / otherwise broken urls would be created e.g. wrong pager urls $term = trim(strip_tags(htmlspecialchars_decode(stripslashes($term)))); return str_replace('/', ' ', $term); diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/DynamicConditionParserTrait.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/DynamicConditionParserTrait.php index 3e5f1992d84..2ceef0f3ba0 100644 --- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/DynamicConditionParserTrait.php +++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/DynamicConditionParserTrait.php @@ -106,7 +106,7 @@ public function parse(QueryBuilder $query, $table, $tableAlias, $field = null, $ throw new InvalidArgumentException(sprintf('Must specify an operator, please use one of: %s', implode(', ', $validOperators)), 3); } - //Identify each field placeholder value with table alias and a hash of condition properties + // Identify each field placeholder value with table alias and a hash of condition properties $boundParamName = sprintf(':%s_%s', $tableAlias, md5($field . $operator . json_encode($value))); $field = sprintf('%s.%s', $tableAlias, $field); @@ -187,17 +187,17 @@ public function parse(QueryBuilder $query, $table, $tableAlias, $field = null, $ } break; - case $operator === Condition::OPERATOR_STARTS_WITH && is_scalar($value): + case $operator === Condition::OPERATOR_STARTS_WITH && \is_scalar($value): $query->andWhere($query->expr()->like($field, $boundParamName)); $query->setParameter($boundParamName, $value . '%'); break; - case $operator === Condition::OPERATOR_ENDS_WITH && is_scalar($value): + case $operator === Condition::OPERATOR_ENDS_WITH && \is_scalar($value): $query->andWhere($query->expr()->like($field, $boundParamName)); $query->setParameter($boundParamName, '%' . $value); break; - case $operator === Condition::OPERATOR_CONTAINS && is_scalar($value): + case $operator === Condition::OPERATOR_CONTAINS && \is_scalar($value): $query->andWhere($query->expr()->like($field, $boundParamName)); $query->setParameter($boundParamName, '%' . $value . '%'); break; diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/IsAvailableConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/IsAvailableConditionHandler.php index 8f9f46c6ae8..765177048b4 100644 --- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/IsAvailableConditionHandler.php +++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/IsAvailableConditionHandler.php @@ -68,13 +68,13 @@ public function generateCondition( }); if (empty($conditions)) { - //variants will ne be splitted => only check if product has an available variant + // variants will ne be splitted => only check if product has an available variant $this->priceHelper->joinAvailableVariant($query); return; } - //variants will be displayed => add stock condition + // variants will be displayed => add stock condition $query->andWhere('(variant.laststock * variant.instock) >= (variant.laststock * variant.minpurchase)'); } diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/SearchTermConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/SearchTermConditionHandler.php index e8f875b1a22..f5b3cd292b3 100644 --- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/SearchTermConditionHandler.php +++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/SearchTermConditionHandler.php @@ -65,8 +65,8 @@ private function addCondition(SearchTermCondition $condition, QueryBuilder $quer { $searchQuery = $this->searchTermQueryBuilder->buildQuery($condition->getTerm()); - //no matching products found by the search query builder. - //add condition that the result contains no product. + // no matching products found by the search query builder. + // add condition that the result contains no product. if ($searchQuery === null) { $query->andWhere('0 = 1'); diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/PriceHelper.php b/engine/Shopware/Bundle/SearchBundleDBAL/PriceHelper.php index 9871fbb6c11..f8f6c9c45ac 100644 --- a/engine/Shopware/Bundle/SearchBundleDBAL/PriceHelper.php +++ b/engine/Shopware/Bundle/SearchBundleDBAL/PriceHelper.php @@ -65,26 +65,26 @@ public function getSelection(ShopContextInterface $context) $taxCase = $this->buildTaxCase($context); - //rounded to filter this value correctly + // rounded to filter this value correctly // => 2,99999999 displayed as 3,- € but won't be displayed with a filter on price >= 3,- € return 'ROUND(' . - //customer group price (with fallback switch) + // customer group price (with fallback switch) $priceField . - //multiplied with the variant min purchase + // multiplied with the variant min purchase ($considerMinPurchase ? ' * availableVariant.minpurchase' : '') . - //multiplied with the percentage price group discount + // multiplied with the percentage price group discount ' * ((100 - IFNULL(priceGroup.discount, 0)) / 100)' . - //multiplied with the product tax if the current customer group should see gross prices + // multiplied with the product tax if the current customer group should see gross prices ($current->displayGrossPrices() ? ' * (( ' . $taxCase . ' + 100) / 100)' : '') . - //multiplied with the percentage discount of the current customer group + // multiplied with the percentage discount of the current customer group ($discount ? ' * ' . (100 - (float) $discount) / 100 : '') . - //multiplied with the shop currency factor + // multiplied with the shop currency factor ($currency->getFactor() ? ' * ' . $currency->getFactor() : '') . ', 2)'; diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/KeywordFinder.php b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/KeywordFinder.php index dc67826a13e..f1ecbea710a 100644 --- a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/KeywordFinder.php +++ b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/KeywordFinder.php @@ -162,11 +162,11 @@ private function findFuzzyMatches($term) if (\strlen($term1) < 4) { $relevance = $this->config->get('fuzzySearchMatchFactor', 5); - //ipod === ipods + // ipod === ipods } elseif (\strlen($term1) - \strlen($term2) <= 1) { $relevance = $this->config->get('fuzzySearchExactMatchFactor', 100); - //digital == digi + // digital == digi } elseif ((round(\strlen($term2) / \strlen($term1), 2) * 100) >= $this->config->get('fuzzySearchPartNameDistancen', 25)) { $relevance = $this->config->get('fuzzySearchPatternMatchFactor', 50); } diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchTermQueryBuilder.php b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchTermQueryBuilder.php index 4e6eaffdee1..bacb335e17c 100644 --- a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchTermQueryBuilder.php +++ b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchTermQueryBuilder.php @@ -186,7 +186,7 @@ private function addToleranceCondition(QueryBuilder $query) $distance = $this->config->get('fuzzySearchMinDistancenTop', 20); $query->select('MAX(' . $this->getRelevanceSelection() . ") / 100 * $distance"); - //calculates the tolerance limit + // calculates the tolerance limit if ($distance) { $query->andWhere('(' . $this->getRelevanceSelection() . ') > (' . $query->getSQL() . ')'); } diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CategoryGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CategoryGateway.php index 36ecbd24d57..c8c44b98990 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CategoryGateway.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CategoryGateway.php @@ -106,7 +106,7 @@ public function getList(array $ids, ShopContextInterface $context) { $data = $this->getQuery($ids, $context)->execute()->fetchAll(PDO::FETCH_ASSOC); - //use php usort instead of running mysql order by to prevent file-sort and temporary table statement + // use php usort instead of running mysql order by to prevent file-sort and temporary table statement usort($data, function ($a, $b) { if ($a['__category_position'] === $b['__category_position']) { return $a['__category_id'] <=> $b['__category_id']; diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ManufacturerGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ManufacturerGateway.php index 701d469ee82..08548909258 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ManufacturerGateway.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ManufacturerGateway.php @@ -105,7 +105,7 @@ public function getList(array $ids, ShopContextInterface $context) } } - //sort elements by provided ids, sorting is defined by other queries like `best term match` or `max articles` or `sort alphanumeric` + // sort elements by provided ids, sorting is defined by other queries like `best term match` or `max articles` or `sort alphanumeric` $sorted = []; foreach ($ids as $id) { if (!\array_key_exists($id, $manufacturers)) { diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CheapestPriceService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CheapestPriceService.php index 5a6d2e0207e..e89bfc48017 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CheapestPriceService.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CheapestPriceService.php @@ -70,7 +70,7 @@ public function getList($products, ShopContextInterface $context) $prices = $this->buildPrices($products, $rules, $group); - //check if one of the products have no assigned price within the prices variable. + // check if one of the products have no assigned price within the prices variable. $fallbackProducts = array_filter( $products, function (BaseProduct $product) use ($prices) { @@ -82,7 +82,7 @@ function (BaseProduct $product) use ($prices) { return $this->calculatePriceGroupDiscounts($products, $prices, $context); } - //if some product has no price, we have to load the fallback customer group prices for the fallbackProducts. + // if some product has no price, we have to load the fallback customer group prices for the fallbackProducts. $fallbackPrices = $this->cheapestPriceGateway->getList( $fallbackProducts, $context, @@ -95,7 +95,7 @@ function (BaseProduct $product) use ($prices) { $context->getFallbackCustomerGroup() ); - //Do not use array_merge here. Since it will reindex the numbers of fallbackPrices. + // Do not use array_merge here. Since it will reindex the numbers of fallbackPrices. $prices = $prices + $fallbackPrices; return $this->calculatePriceGroupDiscounts($products, $prices, $context); diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/GraduatedPricesService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/GraduatedPricesService.php index 85239de6440..4d0069b4329 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/GraduatedPricesService.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/GraduatedPricesService.php @@ -65,14 +65,14 @@ public function getList($products, ShopContextInterface $context) $group ); - //iterates the passed prices and products and assign the product unit to the prices and the passed customer group + // iterates the passed prices and products and assign the product unit to the prices and the passed customer group $prices = $this->buildPrices( $products, $specify, $group ); - //check if one of the products have no assigned price within the prices variable. + // check if one of the products have no assigned price within the prices variable. $fallbackProducts = array_filter( $products, function (ListProduct $product) use ($prices) { @@ -81,7 +81,7 @@ function (ListProduct $product) use ($prices) { ); if (!empty($fallbackProducts)) { - //if some product has no price, we have to load the fallback customer group prices for the fallbackProducts. + // if some product has no price, we have to load the fallback customer group prices for the fallbackProducts. $fallbackPrices = $this->graduatedPricesGateway->getList( $fallbackProducts, $context, @@ -94,7 +94,7 @@ function (ListProduct $product) use ($prices) { $context->getFallbackCustomerGroup() ); - //Do not use array_merge here. Since it will reindex the numbers of fallbackPrices. + // Do not use array_merge here. Since it will reindex the numbers of fallbackPrices. $prices = $prices + $fallbackPrices; } diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/VariantListingPriceService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/VariantListingPriceService.php index 684c9fa49e3..6376a72d8f7 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/VariantListingPriceService.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/VariantListingPriceService.php @@ -71,7 +71,7 @@ public function updatePrices(Criteria $criteria, ProductSearchResult $result, Sh return; } - //executed if no price condition included in search request + // executed if no price condition included in search request $this->loadPrices($criteria, $result, $context); } diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Attribute.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Attribute.php index a1cba989a5c..e8cd4f0777c 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Attribute.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Attribute.php @@ -165,7 +165,7 @@ public function offsetUnset($offset) private function isValid($value): bool { - if ($value instanceof JsonSerializable || is_scalar($value) || $value === null) { + if ($value instanceof JsonSerializable || \is_scalar($value) || $value === null) { return true; } diff --git a/engine/Shopware/Commands/MigrateArticleAttributeTranslationsCommand.php b/engine/Shopware/Commands/MigrateArticleAttributeTranslationsCommand.php index 296cc35653a..9361bd46885 100644 --- a/engine/Shopware/Commands/MigrateArticleAttributeTranslationsCommand.php +++ b/engine/Shopware/Commands/MigrateArticleAttributeTranslationsCommand.php @@ -196,7 +196,7 @@ private function getUpdatedTranslations($rows, $columns) try { $updated = $this->filter(unserialize($row['objectdata'], ['allowed_classes' => false]), $columns); } catch (Exception $e) { - //serialize error - continue with next translation + // serialize error - continue with next translation continue; } diff --git a/engine/Shopware/Components/Api/Resource/Article.php b/engine/Shopware/Components/Api/Resource/Article.php index fb84fd5f601..98138e00dd1 100644 --- a/engine/Shopware/Components/Api/Resource/Article.php +++ b/engine/Shopware/Components/Api/Resource/Article.php @@ -1530,7 +1530,7 @@ protected function prepareRelatedAssociatedData($data, ProductModel $article) ); } - //no valid entity found, throw exception! + // no valid entity found, throw exception! if ($relatedProduct === null) { $property = $relatedData['number'] ?: $relatedData['id']; throw new CustomValidationException(sprintf('Related product by number/id "%s" not found', $property)); @@ -1677,8 +1677,8 @@ protected function preparePropertyValuesData($data, ProductModel $article) $query = $propertyRepository->getPropertyRelationQuery($filters, null, 1, 0); $relation = $query->getOneOrNullResult(self::HYDRATE_OBJECT); if (!$relation instanceof Relation) { - //checks if a new option was created - //because the new option is not written to the database at this point + // checks if a new option was created + // because the new option is not written to the database at this point $groupOption = $this->getCollectionElementByProperty( $propertyGroup->getOptions(), 'name', @@ -2249,7 +2249,7 @@ private function prepareDownloadsAssociatedData(array $data, ProductModel $produ $media->setDescription($downloadData['name']); } - try { //persist the model into the model manager + try { // persist the model into the model manager $this->getManager()->persist($media); } catch (ORMException $e) { throw new CustomValidationException(sprintf('Some error occurred while loading your image from link "%s"', $downloadData['link'])); diff --git a/engine/Shopware/Components/Api/Resource/PaymentMethods.php b/engine/Shopware/Components/Api/Resource/PaymentMethods.php index f74bb05d758..7c0fa7ffc80 100644 --- a/engine/Shopware/Components/Api/Resource/PaymentMethods.php +++ b/engine/Shopware/Components/Api/Resource/PaymentMethods.php @@ -87,10 +87,10 @@ public function getList($offset = 0, $limit = 25, array $filter = [], array $ord $paginator = $this->getManager()->createPaginator($query); - //returns the total count of the query + // returns the total count of the query $totalResult = $paginator->count(); - //returns the category data + // returns the category data $payments = $paginator->getIterator()->getArrayCopy(); return ['data' => $payments, 'total' => $totalResult]; diff --git a/engine/Shopware/Components/Api/Resource/Shop.php b/engine/Shopware/Components/Api/Resource/Shop.php index 07a4640a890..b485f4d4297 100644 --- a/engine/Shopware/Components/Api/Resource/Shop.php +++ b/engine/Shopware/Components/Api/Resource/Shop.php @@ -96,10 +96,10 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o $paginator = $this->getManager()->createPaginator($query); - //returns the total count of the query + // returns the total count of the query $totalResult = $paginator->count(); - //returns the category data + // returns the category data $shops = $paginator->getIterator()->getArrayCopy(); return ['data' => $shops, 'total' => $totalResult]; diff --git a/engine/Shopware/Components/CacheManager.php b/engine/Shopware/Components/CacheManager.php index 7c339426e59..310f21497cf 100644 --- a/engine/Shopware/Components/CacheManager.php +++ b/engine/Shopware/Components/CacheManager.php @@ -283,7 +283,7 @@ public function clearProxyCache() public function clearOpCache() { - if (\extension_loaded('Zend OPcache') && ini_get('opcache.enable')) { + if (\extension_loaded('Zend OPcache') && \ini_get('opcache.enable')) { opcache_reset(); } } @@ -414,7 +414,7 @@ public function getShopwareProxyCacheInfo() public function getOpCacheCacheInfo() { $info = []; - if (\extension_loaded('Zend OPcache') && ini_get('opcache.enable')) { + if (\extension_loaded('Zend OPcache') && \ini_get('opcache.enable')) { $status = opcache_get_status(false); $info['files'] = $status['opcache_statistics']['num_cached_scripts']; $info['size'] = $this->encodeSize($status['memory_usage']['used_memory']); diff --git a/engine/Shopware/Components/Cart/PaymentTokenService.php b/engine/Shopware/Components/Cart/PaymentTokenService.php index bdb109b81e8..c529b5f7348 100644 --- a/engine/Shopware/Components/Cart/PaymentTokenService.php +++ b/engine/Shopware/Components/Cart/PaymentTokenService.php @@ -52,7 +52,7 @@ public function generate(): string { $sessionId = $this->session->get('sessionId'); - return $this->optinService->add(self::TYPE_PAYMENT_TOKEN, (int) ini_get('session.gc_maxlifetime'), [ + return $this->optinService->add(self::TYPE_PAYMENT_TOKEN, (int) \ini_get('session.gc_maxlifetime'), [ 'name' => session_name(), 'value' => $sessionId, ]); diff --git a/engine/Shopware/Components/Cart/PaymentTokenSubscriber.php b/engine/Shopware/Components/Cart/PaymentTokenSubscriber.php index 25ee4b17069..ba8d243bb7a 100644 --- a/engine/Shopware/Components/Cart/PaymentTokenSubscriber.php +++ b/engine/Shopware/Components/Cart/PaymentTokenSubscriber.php @@ -83,7 +83,7 @@ public function onPreDispatchFrontend(Enlight_Event_EventArgs $args): void $restoreData->getSessionName(), $restoreData->getValue(), 0, - ini_get('session.cookie_path'), + \ini_get('session.cookie_path'), null, $request->isSecure() ) diff --git a/engine/Shopware/Components/Check/Requirements.php b/engine/Shopware/Components/Check/Requirements.php index 8aae1029112..e21bd6d97ac 100644 --- a/engine/Shopware/Components/Check/Requirements.php +++ b/engine/Shopware/Components/Check/Requirements.php @@ -159,7 +159,7 @@ private function getRuntimeValue(string $name, SimpleXMLElement $requirement) return true; } - $value = ini_get($name); + $value = \ini_get($name); if ($value !== '' && $value !== false) { if (strtolower($value) === 'off' || (is_numeric($value) && $value == 0)) { return false; @@ -252,29 +252,29 @@ private function checkOpcache(): array return []; } - $useCwdOption = $this->compare('opcache.use_cwd', ini_get('opcache.use_cwd'), '1'); + $useCwdOption = $this->compare('opcache.use_cwd', \ini_get('opcache.use_cwd'), '1'); $opcacheRequirements = [[ 'name' => 'opcache.use_cwd', 'group' => 'core', 'required' => 1, - 'version' => ini_get('opcache.use_cwd'), - 'result' => ini_get('opcache.use_cwd'), + 'version' => \ini_get('opcache.use_cwd'), + 'result' => \ini_get('opcache.use_cwd'), 'notice' => '', - 'check' => $this->compare('opcache.use_cwd', ini_get('opcache.use_cwd'), '1'), + 'check' => $this->compare('opcache.use_cwd', \ini_get('opcache.use_cwd'), '1'), 'error' => '', ]]; try { if (fileinode('/') > 2) { - $validateRootOption = $this->compare('opcache.validate_root', ini_get('opcache.validate_root'), '1'); + $validateRootOption = $this->compare('opcache.validate_root', \ini_get('opcache.validate_root'), '1'); $opcacheRequirements[] = [ 'name' => 'opcache.validate_root', 'group' => 'core', 'required' => 1, - 'version' => ini_get('opcache.validate_root'), - 'result' => ini_get('opcache.validate_root'), + 'version' => \ini_get('opcache.validate_root'), + 'result' => \ini_get('opcache.validate_root'), 'notice' => '', - 'check' => $this->compare('opcache.validate_root', ini_get('opcache.validate_root'), '1'), + 'check' => $this->compare('opcache.validate_root', \ini_get('opcache.validate_root'), '1'), 'error' => '', ]; } @@ -377,7 +377,7 @@ private function checkSessionSavePath(): bool return (bool) session_save_path(); } - if (ini_get('session.save_path')) { + if (\ini_get('session.save_path')) { return true; } @@ -406,7 +406,7 @@ private function checkDiskFreeSpace() */ private function checkSuhosinGetMaxValueLength(): int { - $length = (int) ini_get('suhosin.get.max_value_length'); + $length = (int) \ini_get('suhosin.get.max_value_length'); if ($length === 0) { return 2000; } diff --git a/engine/Shopware/Components/DependencyInjection/Bridge/Cache.php b/engine/Shopware/Components/DependencyInjection/Bridge/Cache.php index 84dec897c59..f61100e633d 100644 --- a/engine/Shopware/Components/DependencyInjection/Bridge/Cache.php +++ b/engine/Shopware/Components/DependencyInjection/Bridge/Cache.php @@ -114,7 +114,7 @@ private function isApcuAvailable() return false; } - if (!ini_get('apc.enabled')) { + if (!\ini_get('apc.enabled')) { return false; } diff --git a/engine/Shopware/Components/HttpCache/CacheRouteInstaller.php b/engine/Shopware/Components/HttpCache/CacheRouteInstaller.php index 6dcb3111f75..d82a3a25644 100644 --- a/engine/Shopware/Components/HttpCache/CacheRouteInstaller.php +++ b/engine/Shopware/Components/HttpCache/CacheRouteInstaller.php @@ -78,7 +78,7 @@ public function addHttpCacheRoute($route, $time, array $invalidateTags = []) */ public function removeHttpCacheRoute($route) { - //remove cached controller + // remove cached controller $cacheRoutes = $this->configWriter->get('cacheControllers', 'HttpCache'); if (empty($cacheRoutes)) { return false; @@ -92,7 +92,7 @@ public function removeHttpCacheRoute($route) $cacheRoutes = $this->implodeHttpCacheRoutes($cacheRoutes); $this->configWriter->save('cacheControllers', $cacheRoutes, 'HttpCache'); - //remove no cache tags + // remove no cache tags $noCacheRoutes = $this->configWriter->get('noCacheControllers', 'HttpCache'); $noCacheRoutes = $this->explodeHttpCacheRoutes($noCacheRoutes); $noCacheRoutes = array_filter($noCacheRoutes, function ($row) use ($route) { diff --git a/engine/Shopware/Components/Log/Formatter/HtmlFormatter.php b/engine/Shopware/Components/Log/Formatter/HtmlFormatter.php index 57950b9b87e..00a3406c13a 100644 --- a/engine/Shopware/Components/Log/Formatter/HtmlFormatter.php +++ b/engine/Shopware/Components/Log/Formatter/HtmlFormatter.php @@ -104,7 +104,7 @@ public function formatBatch(array $records) protected function convertToString($data) { - if ($data === null || is_scalar($data)) { + if ($data === null || \is_scalar($data)) { return (string) $data; } diff --git a/engine/Shopware/Components/MemoryLimit.php b/engine/Shopware/Components/MemoryLimit.php index 0aade30a9cd..844bbb438ce 100644 --- a/engine/Shopware/Components/MemoryLimit.php +++ b/engine/Shopware/Components/MemoryLimit.php @@ -33,7 +33,7 @@ class MemoryLimit */ public static function setMinimumMemoryLimit($bytes) { - $currentLimit = self::convertToBytes(@ini_get('memory_limit')); + $currentLimit = self::convertToBytes((string) @ini_get('memory_limit')); if ($currentLimit === -1) { return; } @@ -46,7 +46,7 @@ public static function setMinimumMemoryLimit($bytes) /** * @param string $memoryLimit * - * @return int|string + * @return int */ public static function convertToBytes($memoryLimit) { diff --git a/engine/Shopware/Components/Model/Generator.php b/engine/Shopware/Components/Model/Generator.php index 2a3296f4969..186f1fb4069 100644 --- a/engine/Shopware/Components/Model/Generator.php +++ b/engine/Shopware/Components/Model/Generator.php @@ -511,7 +511,7 @@ protected function getClassDefinition($table) // Check if the passed table is a Shopware attribute table. if (strpos($table->getName(), '_attributes')) { - //if the table is an attribute table we have to use the class name of the parent table. + // if the table is an attribute table we have to use the class name of the parent table. $parentClass = str_replace('_attributes', '', $table->getName()); $className = $this->getClassNameOfTableName($parentClass); diff --git a/engine/Shopware/Components/MultiEdit/Resource/Product/Filter.php b/engine/Shopware/Components/MultiEdit/Resource/Product/Filter.php index 535f0d24876..25d29ba8778 100644 --- a/engine/Shopware/Components/MultiEdit/Resource/Product/Filter.php +++ b/engine/Shopware/Components/MultiEdit/Resource/Product/Filter.php @@ -163,7 +163,7 @@ public function getArticleQueryBuilder($detailId) 'partial article.{id, name}', ]) ->from(Detail::class, 'detail') - //~ ->leftJoin('detail.article', 'article') + // ~ ->leftJoin('detail.article', 'article') ->where('detail.id = ?1') ->setParameter(1, $detailId); diff --git a/engine/Shopware/Components/Plugin/Bootstrap.php b/engine/Shopware/Components/Plugin/Bootstrap.php index c6fcec7f04d..afcb3ca63de 100644 --- a/engine/Shopware/Components/Plugin/Bootstrap.php +++ b/engine/Shopware/Components/Plugin/Bootstrap.php @@ -503,26 +503,26 @@ public function getDefaultControllerPath(Enlight_Event_EventArgs $arguments) throw new Enlight_Exception(sprintf('Controller "%s" can\'t load failure', $controller)); } - //register plugin model directory + // register plugin model directory if (file_exists($this->Path() . 'Models')) { $this->registerCustomModels(); } - //register plugin views directory + // register plugin views directory if (file_exists($this->Path() . 'Views')) { Shopware()->Template()->addTemplateDir( $this->Path() . 'Views/' ); } - //register plugin snippet directory + // register plugin snippet directory if (file_exists($this->Path() . 'Snippets')) { Shopware()->Snippets()->addConfigDir( $this->Path() . 'Snippets/' ); } - //register plugin component directory + // register plugin component directory if (file_exists($this->Path() . 'Components')) { Shopware()->Loader()->registerNamespace( 'Shopware_Components', diff --git a/engine/Shopware/Components/Plugin/FormSynchronizer.php b/engine/Shopware/Components/Plugin/FormSynchronizer.php index 8742907712d..75e79d97769 100644 --- a/engine/Shopware/Components/Plugin/FormSynchronizer.php +++ b/engine/Shopware/Components/Plugin/FormSynchronizer.php @@ -141,21 +141,21 @@ private function removeNotExistingElements(Plugin $plugin, array $names) return; } - //elements + // elements $query = $this->em->getConnection()->createQueryBuilder(); $query->delete('s_core_config_elements'); $query->where('id IN (:ids)'); $query->setParameter(':ids', $ids, Connection::PARAM_INT_ARRAY); $query->execute(); - //saved values + // saved values $query = $this->em->getConnection()->createQueryBuilder(); $query->delete('s_core_config_values'); $query->where('element_id IN (:ids)'); $query->setParameter(':ids', $ids, Connection::PARAM_INT_ARRAY); $query->execute(); - //translations + // translations $query = $this->em->getConnection()->createQueryBuilder(); $query->delete('s_core_config_element_translations'); $query->where('element_id IN (:ids)'); diff --git a/engine/Shopware/Components/Plugin/XmlReader/XmlConfigReader.php b/engine/Shopware/Components/Plugin/XmlReader/XmlConfigReader.php index 284765bf4a8..06fd655fed3 100644 --- a/engine/Shopware/Components/Plugin/XmlReader/XmlConfigReader.php +++ b/engine/Shopware/Components/Plugin/XmlReader/XmlConfigReader.php @@ -86,7 +86,7 @@ private function parseElementNodeList(DOMNodeList $list): array foreach ($list as $item) { $element = []; - //attributes + // attributes $element['scope'] = self::validateAttributeScope( $item->getAttribute('scope') ); @@ -101,7 +101,7 @@ private function parseElementNodeList(DOMNodeList $list): array 'text' ); - //elements + // elements if ($name = $item->getElementsByTagName('name')->item(0)) { $element['name'] = $name->nodeValue; } diff --git a/engine/Shopware/Components/Routing/Generators/RewriteGenerator.php b/engine/Shopware/Components/Routing/Generators/RewriteGenerator.php index 94e19da6930..6294006850a 100644 --- a/engine/Shopware/Components/Routing/Generators/RewriteGenerator.php +++ b/engine/Shopware/Components/Routing/Generators/RewriteGenerator.php @@ -121,7 +121,7 @@ public function generateList(array $list, Context $context) return $urls; } - //Add query / strtolower + // Add query / strtolower array_walk($urls, function (&$url, $key) use ($context, $list, $orgQueryList) { if (\is_string($url)) { if ($context->isUrlToLower()) { diff --git a/engine/Shopware/Components/Routing/Matchers/EventMatcher.php b/engine/Shopware/Components/Routing/Matchers/EventMatcher.php index 7c596e528d9..f829cf5b692 100644 --- a/engine/Shopware/Components/Routing/Matchers/EventMatcher.php +++ b/engine/Shopware/Components/Routing/Matchers/EventMatcher.php @@ -49,7 +49,7 @@ public function match($pathInfo, Context $context) if (str_starts_with($pathInfo, '/backend/') || str_starts_with($pathInfo, '/api/')) { return $pathInfo; } - if ($context->getShopId() === null) { //only frontend + if ($context->getShopId() === null) { // only frontend return $pathInfo; } diff --git a/engine/Shopware/Components/Routing/Router.php b/engine/Shopware/Components/Routing/Router.php index ee7486a163f..d05b74ca464 100644 --- a/engine/Shopware/Components/Routing/Router.php +++ b/engine/Shopware/Components/Routing/Router.php @@ -276,16 +276,16 @@ public function setPostFilters($postFilters) */ public function route(EnlightRequest $request) { - /* For enlight routing */ + /* For enlight routing */ $this->context->updateFromEnlightRequest($request); $params = $this->match($request->getPathInfo(), $this->context); if ($params !== false) { - /* For shopware routing (query === userParams) */ + /* For shopware routing (query === userParams) */ $request->setQuery($params); } - /* For enlight routing */ + /* For enlight routing */ $this->context->updateFromEnlightRequest($request); $this->context->setParams([]); diff --git a/engine/Shopware/Components/Session/PdoSessionHandler.php b/engine/Shopware/Components/Session/PdoSessionHandler.php index aa912c3e9ec..597a35e22b0 100644 --- a/engine/Shopware/Components/Session/PdoSessionHandler.php +++ b/engine/Shopware/Components/Session/PdoSessionHandler.php @@ -339,7 +339,7 @@ public function destroy($sessionId) */ public function write($sessionId, $data) { - $maxlifetime = (int) ini_get('session.gc_maxlifetime'); + $maxlifetime = (int) \ini_get('session.gc_maxlifetime'); try { // We use a single MERGE SQL query when supported by the database. @@ -429,7 +429,7 @@ public function close() protected function getConnection() { if ($this->pdo === null) { - $this->connect($this->dsn ?: ini_get('session.save_path')); + $this->connect($this->dsn ?: \ini_get('session.save_path')); } return $this->pdo; diff --git a/engine/Shopware/Components/SitePageMenu.php b/engine/Shopware/Components/SitePageMenu.php index 40fcfac697a..245e06859fe 100644 --- a/engine/Shopware/Components/SitePageMenu.php +++ b/engine/Shopware/Components/SitePageMenu.php @@ -170,7 +170,7 @@ private function buildSiteTree($parentId, $sites, $activeId) } $id = (int) $site['id']; - //call recursive for tree building + // call recursive for tree building $site['subPages'] = $this->buildSiteTree( $site['id'], $sites, diff --git a/engine/Shopware/Components/Snippet/Manager.php b/engine/Shopware/Components/Snippet/Manager.php index 2623d8138fc..15397f0cd60 100644 --- a/engine/Shopware/Components/Snippet/Manager.php +++ b/engine/Shopware/Components/Snippet/Manager.php @@ -313,7 +313,7 @@ private function getPluginDirs(): array ); foreach ($directories as $directory) { - //check valid directory + // check valid directory if ($directory->isDot() || !$directory->isDir() || $directory->getFilename() === '_cache') { continue; } @@ -340,7 +340,7 @@ private function getThemeDirs(?string $themeDir = null): array foreach (new DirectoryIterator( $themeDir ) as $directory) { - //check valid directory + // check valid directory if ($directory->isDot() || !$directory->isDir() || $directory->getFilename() === '_cache') { continue; } diff --git a/engine/Shopware/Components/Theme/Configurator.php b/engine/Shopware/Components/Theme/Configurator.php index 35b9a88b26f..3f515e39eb4 100644 --- a/engine/Shopware/Components/Theme/Configurator.php +++ b/engine/Shopware/Components/Theme/Configurator.php @@ -111,7 +111,7 @@ public function __construct( */ public function synchronize(Theme $theme) { - //prevents the theme configuration lazy loading + // prevents the theme configuration lazy loading $template = $this->getTemplate($theme); if (!$template instanceof Template) { $this->logger->error(sprintf('Could not synchronize theme. "%s" instance for theme "%s" not found', Template::class, $theme->getName())); @@ -119,10 +119,10 @@ public function synchronize(Theme $theme) return; } - //static main container which generated for each theme configuration. + // static main container which generated for each theme configuration. $container = new TabContainer('main_container'); - //inject the inheritance config container. + // inject the inheritance config container. $this->injectConfig($theme, $container); $this->eventManager->notify('Theme_Configurator_Container_Injected', [ @@ -141,7 +141,7 @@ public function synchronize(Theme $theme) 'container' => $container, ]); - //use the theme persister class to write the Shopware\Components\Form elements into the database + // use the theme persister class to write the Shopware\Components\Form elements into the database $this->persister->save($container, $template); $this->eventManager->notify('Theme_Configurator_Theme_Config_Saved', [ @@ -172,17 +172,17 @@ public function synchronize(Theme $theme) */ private function validateConfig(Container $container): void { - //check if the container implements the validation interface + // check if the container implements the validation interface if ($container instanceof Validate) { $container->validate(); } foreach ($container->getElements() as $element) { - //check recursive validation. + // check recursive validation. if ($element instanceof Container) { $this->validateConfig($element); - //check Form\Field validation + // check Form\Field validation } elseif ($element instanceof Validate) { $element->validate(); } @@ -239,9 +239,9 @@ private function synchronizeSets(Theme $theme, Template $template): void $synchronized[] = $existing; } - //iterates all sets of the template, file system and database + // iterates all sets of the template, file system and database foreach ($template->getConfigSets() as $existing) { - //check if the current set was synchronized in the foreach before + // check if the current set was synchronized in the foreach before $defined = $this->getExistingConfigSet( new ArrayCollection($synchronized), $existing->getName() @@ -251,7 +251,7 @@ private function synchronizeSets(Theme $theme, Template $template): void continue; } - //if it wasn't synchronized, the file system theme want to remove the set. + // if it wasn't synchronized, the file system theme want to remove the set. $this->entityManager->remove($existing); } @@ -436,7 +436,7 @@ private function injectConfig(Theme $theme, TabContainer $container): void return; } - //get Theme.php instance of the parent template + // get Theme.php instance of the parent template $parent = $this->util->getThemeByTemplate( $template->getParent() ); diff --git a/engine/Shopware/Components/Theme/Inheritance.php b/engine/Shopware/Components/Theme/Inheritance.php index 347f2c9e8dd..bee4dc3a44c 100644 --- a/engine/Shopware/Components/Theme/Inheritance.php +++ b/engine/Shopware/Components/Theme/Inheritance.php @@ -370,7 +370,7 @@ private function parseConfig(array $config, bool $lessCompatible = true): array return []; } - //creates a key value array for the configuration. + // creates a key value array for the configuration. $combinedArray = array_combine( array_column($config, 'name'), array_column($config, 'value') diff --git a/engine/Shopware/Components/Theme/Installer.php b/engine/Shopware/Components/Theme/Installer.php index c685177df7d..199b962ffab 100644 --- a/engine/Shopware/Components/Theme/Installer.php +++ b/engine/Shopware/Components/Theme/Installer.php @@ -267,7 +267,7 @@ private function synchronizePluginThemes() continue; } - //merge the plugin themes into the already detected plugin themes. + // merge the plugin themes into the already detected plugin themes. $themes = array_merge($themes, $pluginThemes); $this->entityManager->flush(); diff --git a/engine/Shopware/Components/Thumbnail/Generator/Basic.php b/engine/Shopware/Components/Thumbnail/Generator/Basic.php index 2d84735dd3f..63a4a22536c 100644 --- a/engine/Shopware/Components/Thumbnail/Generator/Basic.php +++ b/engine/Shopware/Components/Thumbnail/Generator/Basic.php @@ -180,7 +180,7 @@ private function calculateProportionalThumbnailSize(array $originalSize, int $wi $dstHeight = $srcHeight; $factor = 1; } else { - //Get the destination size + // Get the destination size $dstWidth = round($srcWidth * $factor); $dstHeight = round($srcHeight * $factor); } diff --git a/engine/Shopware/Components/Translation.php b/engine/Shopware/Components/Translation.php index f3ec8cb9e8b..b40a734e570 100644 --- a/engine/Shopware/Components/Translation.php +++ b/engine/Shopware/Components/Translation.php @@ -681,15 +681,15 @@ protected function fixArticleTranslation($languageId, $articleId, $data) ); foreach ($fallbacks as $id) { - //check if fallback ids contains an individual translation + // check if fallback ids contains an individual translation $existQuery->execute([':language' => $id, ':articleId' => $articleId]); $exist = $existQuery->fetch(PDO::FETCH_COLUMN); - //if shop translation of fallback exists, skip + // if shop translation of fallback exists, skip if ($exist) { continue; } - //add fallback translation to s_articles_translation for search requests. + // add fallback translation to s_articles_translation for search requests. $this->addProductTranslation($articleId, $id, $data); } } diff --git a/engine/Shopware/Components/UploadMaxSizeValidator.php b/engine/Shopware/Components/UploadMaxSizeValidator.php index b12d7e88a3c..43e61427066 100644 --- a/engine/Shopware/Components/UploadMaxSizeValidator.php +++ b/engine/Shopware/Components/UploadMaxSizeValidator.php @@ -115,7 +115,7 @@ public function getPostMaxSize() */ public function getNormalizedIniPostMaxSize() { - return strtoupper(trim((string) ini_get('post_max_size'))); + return strtoupper(trim((string) \ini_get('post_max_size'))); } /** diff --git a/engine/Shopware/Controllers/Backend/Analytics.php b/engine/Shopware/Controllers/Backend/Analytics.php index e2e612d3266..eec21b0b6e2 100644 --- a/engine/Shopware/Controllers/Backend/Analytics.php +++ b/engine/Shopware/Controllers/Backend/Analytics.php @@ -1228,14 +1228,14 @@ private function getFromDate(): DateTime private function getToDate(): DateTime { - //if a "to" date passed, format it over the \DateTime object. Otherwise, create a new date with today + // if a "to" date passed, format it over the \DateTime object. Otherwise, create a new date with today $toDate = $this->Request()->getParam('toDate'); if (empty($toDate)) { $toDate = new DateTime(); } else { $toDate = new DateTime($toDate); } - //to get the right value cause 2012-02-02 is smaller than 2012-02-02 15:33:12 + // to get the right value cause 2012-02-02 is smaller than 2012-02-02 15:33:12 $toDate = $toDate->add(new DateInterval('P1D')); return $toDate->sub(new DateInterval('PT1S')); diff --git a/engine/Shopware/Controllers/Backend/Application.php b/engine/Shopware/Controllers/Backend/Application.php index 32cf4a0eb09..9199bba6d4b 100644 --- a/engine/Shopware/Controllers/Backend/Application.php +++ b/engine/Shopware/Controllers/Backend/Application.php @@ -882,13 +882,13 @@ protected function resolveExtJsData($data) if ($data[$field]) { $associationModel = $this->getManager()->find($mapping['targetEntity'], $data[$field]); - //proxies need to be loaded, otherwise the validation will be failed. + // proxies need to be loaded, otherwise the validation will be failed. if ($associationModel instanceof Proxy && method_exists($associationModel, '__load')) { $associationModel->__load(); } $data[$mapping['fieldName']] = $associationModel; - //remove the foreign key data. + // remove the foreign key data. if ($field !== $mapping['fieldName']) { unset($data[$field]); } @@ -1029,12 +1029,12 @@ protected function getSortConditions($sort, $model, $alias, $whiteList = []) $fields = $this->getModelFields($model, $alias); $conditions = []; foreach ($sort as $condition) { - //check if the passed field is a valid doctrine model field of the configured model. + // check if the passed field is a valid doctrine model field of the configured model. if (!\array_key_exists($condition['property'], $fields)) { continue; } - //check if the developer limited the sortable fields and the passed property defined in the sort fields parameter. + // check if the developer limited the sortable fields and the passed property defined in the sort fields parameter. if (!empty($whiteList) && !\in_array($condition['property'], $whiteList, true)) { continue; } @@ -1091,7 +1091,7 @@ protected function getFilterConditions($filters, $model, $alias, $whiteList = [] foreach ($filters as $condition) { if ($condition['property'] === 'search') { foreach ($fields as $name => $field) { - //check if the developer limited the filterable fields and the passed property defined in the filter fields parameter. + // check if the developer limited the filterable fields and the passed property defined in the filter fields parameter. if (!empty($whiteList) && !\in_array($name, $whiteList, true)) { continue; } @@ -1105,7 +1105,7 @@ protected function getFilterConditions($filters, $model, $alias, $whiteList = [] ]; } } elseif (\array_key_exists($condition['property'], $fields)) { - //check if the developer limited the filterable fields and the passed property defined in the filter fields parameter. + // check if the developer limited the filterable fields and the passed property defined in the filter fields parameter. if (!empty($whiteList) && !\in_array($condition['property'], $whiteList, true)) { continue; } @@ -1166,7 +1166,7 @@ protected function formatSearchValue($value, array $field, $expression = null) break; case 'date': case 'datetime': - //validates the date value. If the value is no date value, return + // validates the date value. If the value is no date value, return $date = date_parse($value); if ($date['error_count'] > 0 || !checkdate((int) $date['month'], (int) $date['day'], (int) $date['year'])) { @@ -1179,7 +1179,7 @@ protected function formatSearchValue($value, array $field, $expression = null) return $value; } - //search values for date time should added the % wildcards to search for time values. + // search values for date time should added the % wildcards to search for time values. if ($field['type'] === 'datetime') { $value = '%' . $value . '%'; } diff --git a/engine/Shopware/Controllers/Backend/Article.php b/engine/Shopware/Controllers/Backend/Article.php index 57c280d0f92..e85f3b38823 100644 --- a/engine/Shopware/Controllers/Backend/Article.php +++ b/engine/Shopware/Controllers/Backend/Article.php @@ -752,7 +752,7 @@ public function getPropertyValuesAction() public function setPropertyListAction() { if (!$this->Request()->isPost()) { - //don't save the property list on a get request. This will only occur when there is an ext js problem + // don't save the property list on a get request. This will only occur when there is an ext js problem return; } $models = $this->get('models'); @@ -794,7 +794,7 @@ public function setPropertyListAction() $propertyValueModel = $propertyValueRepository->find($value['id']); } if ($propertyValueModel === null) { - //search for property value + // search for property value $propertyValueModel = $propertyValueRepository->findOneBy( [ 'value' => $value['value'], @@ -807,7 +807,7 @@ public function setPropertyListAction() $models->persist($propertyValueModel); } if (!$propertyValues->contains($propertyValueModel)) { - //add only new values + // add only new values $propertyValues->add($propertyValueModel); } } @@ -1595,10 +1595,10 @@ public function getEsdAction() $query->setHydrationMode(AbstractQuery::HYDRATE_ARRAY); $paginator = $this->getModelManager()->createPaginator($query); - //returns the total count of the query + // returns the total count of the query $totalResult = $paginator->count(); - //returns the customer data + // returns the customer data $result = $paginator->getIterator()->getArrayCopy(); $products = $this->buildListProducts($result); @@ -1626,13 +1626,13 @@ public function getEsdAction() $paginator = $this->getModelManager()->createPaginator($query); - //returns the total count of the query + // returns the total count of the query $totalResult = $paginator->count(); - //returns the customer data + // returns the customer data $result = $paginator->getIterator()->getArrayCopy(); - //inserts esd attributes into the result + // inserts esd attributes into the result $result = $this->getEsdListingAttributes($result); $this->View()->assign([ @@ -1660,10 +1660,10 @@ public function getSerialsAction() $paginator = $this->getModelManager()->createPaginator($query); - //returns the total count of the query + // returns the total count of the query $totalResult = $paginator->count(); - //returns the customer data + // returns the customer data $result = $paginator->getIterator()->getArrayCopy(); $this->View()->assign([ @@ -3450,7 +3450,7 @@ protected function prepareVariantData($variant, $detailData, &$counter, $depende return false; } - //create the new variant data + // create the new variant data $variantData = [ 'active' => 1, 'configuratorOptions' => $optionsModels, @@ -3957,7 +3957,7 @@ protected function prepareRelatedAssociatedData($data, $article) throw new ModelNotFoundException(Product::class, $relatedData['id']); } - //if the user select the cross + // if the user select the cross if ($relatedData['cross'] && !$relatedProduct->getRelated()->contains($article)) { $relatedProduct->getRelated()->add($article); $this->get('models')->persist($relatedProduct); @@ -4014,7 +4014,7 @@ protected function prepareSimilarAssociatedData($data, $article) throw new ModelNotFoundException(Product::class, $similarData['id']); } - //if the user select the cross + // if the user select the cross if ($similarData['cross'] && !$similarProduct->getSimilar()->contains($article)) { $similarProduct->getSimilar()->add($article); $this->get('models')->persist($similarProduct); @@ -4420,24 +4420,24 @@ protected function prepareNumberSyntax($syntax) */ protected function getCommandMapping($syntax) { - //we have to explode the current command to resolve the multiple properties. + // we have to explode the current command to resolve the multiple properties. $paths = explode('.', $syntax); - //we have to map the different properties to define the start cursor object. + // we have to map the different properties to define the start cursor object. switch ($paths[0]) { - //options are only available for the different product variants + // options are only available for the different product variants case 'options': $cursor = 'detail'; $paths[0] = 'configuratorOptions'; break; - //all other commands will rout to the product + // all other commands will rout to the product default: $cursor = 'article'; } $commands = []; - //now we convert the property names to the getter functions. + // now we convert the property names to the getter functions. foreach ($paths as $path) { $commands[] = ['origin' => $path, 'command' => 'get' . ucfirst($path)]; } diff --git a/engine/Shopware/Controllers/Backend/Config.php b/engine/Shopware/Controllers/Backend/Config.php index a166ffcdac4..1b9736ee250 100644 --- a/engine/Shopware/Controllers/Backend/Config.php +++ b/engine/Shopware/Controllers/Backend/Config.php @@ -397,7 +397,7 @@ public function getTableListAction() ]; $row['data'] = !\is_string($row['data']) ? var_export($row['data'], true) : $row['data']; } - //get the total count + // get the total count $select->reset(Zend_Db_Select::FROM); $select->reset(Zend_Db_Select::LIMIT_COUNT); $select->reset(Zend_Db_Select::LIMIT_OFFSET); diff --git a/engine/Shopware/Controllers/Backend/Customer.php b/engine/Shopware/Controllers/Backend/Customer.php index 8836a6f0b51..729256ed254 100644 --- a/engine/Shopware/Controllers/Backend/Customer.php +++ b/engine/Shopware/Controllers/Backend/Customer.php @@ -410,10 +410,10 @@ public function saveAction() */ public function deleteAction() { - //get posted customers + // get posted customers $customers = $this->Request()->getParam('customers', [['id' => $this->Request()->getParam('id')]]); - //iterate the customers and add the remove action + // iterate the customers and add the remove action foreach ($customers as $customer) { $entity = $this->getRepository()->find($customer['id']); if ($entity === null) { @@ -421,7 +421,7 @@ public function deleteAction() } $this->getManager()->remove($entity); } - //Performs all of the collected actions. + // Performs all of the collected actions. $this->getManager()->flush(); $this->View()->assign([ @@ -509,7 +509,7 @@ public function performOrderAction() ]); if ($shop->getHost()) { - //change the url to the subshop url + // change the url to the subshop url $url = str_replace('://' . $this->Request()->getHttpHost(), '://' . $shop->getHost(), $url); } diff --git a/engine/Shopware/Controllers/Backend/Index.php b/engine/Shopware/Controllers/Backend/Index.php index 1456b667c35..7514f0f2182 100644 --- a/engine/Shopware/Controllers/Backend/Index.php +++ b/engine/Shopware/Controllers/Backend/Index.php @@ -125,7 +125,7 @@ public function indexAction() $controller = Zend_Json::encode($controller); $this->View()->assign('controller', $controller, true); - $this->View()->assign('maxParameterLength', (int) ini_get('suhosin.get.max_value_length') + 0, true); + $this->View()->assign('maxParameterLength', (int) \ini_get('suhosin.get.max_value_length') + 0, true); $firstRunWizardEnabled = $this->isFirstRunWizardEnabled($identity); $sbpLogin = 0; diff --git a/engine/Shopware/Controllers/Backend/Notification.php b/engine/Shopware/Controllers/Backend/Notification.php index d343bf125ee..958e02ac78f 100644 --- a/engine/Shopware/Controllers/Backend/Notification.php +++ b/engine/Shopware/Controllers/Backend/Notification.php @@ -38,7 +38,7 @@ public function getArticleListAction() /** @var array $filter */ $filter = $this->Request()->getParam('filter', []); - //order data + // order data $order = (array) $this->Request()->getParam('sort', []); $repository = $this->get('models')->getRepository(Article::class); @@ -79,7 +79,7 @@ public function getCustomerListAction() /** @var array $filter */ $filter = $this->Request()->getParam('filter', []); - //order data + // order data $order = (array) $this->Request()->getParam('sort', []); $repository = $this->get('models')->getRepository(Article::class); diff --git a/engine/Shopware/Controllers/Backend/Order.php b/engine/Shopware/Controllers/Backend/Order.php index 77a970a17f0..486283b81b3 100644 --- a/engine/Shopware/Controllers/Backend/Order.php +++ b/engine/Shopware/Controllers/Backend/Order.php @@ -419,7 +419,7 @@ public function getStatusHistoryAction() $namespace = $this->get('snippets')->getNamespace('backend/order'); - //the backend order module have no function to create a new order so an order id must be passed. + // the backend order module have no function to create a new order so an order id must be passed. if (empty($orderId)) { $this->View()->assign([ 'success' => false, @@ -2085,7 +2085,7 @@ private function getAssociatedData(array $data): array if (!empty($data['customerId'])) { $data['customer'] = $this->getManager()->find(Customer::class, $data['customerId']); } else { - //if no customer id passed, we have to unset the array element, otherwise the existing customer model would be overwritten + // if no customer id passed, we have to unset the array element, otherwise the existing customer model would be overwritten unset($data['customer']); } diff --git a/engine/Shopware/Controllers/Backend/Partner.php b/engine/Shopware/Controllers/Backend/Partner.php index 950624c9558..34b340dc18a 100644 --- a/engine/Shopware/Controllers/Backend/Partner.php +++ b/engine/Shopware/Controllers/Backend/Partner.php @@ -351,7 +351,7 @@ protected function initAcl() */ private function getStatisticListTotalCount(Query $dataQuery): ?int { - //userCurrencyFactor has not to be part of the count parameters + // userCurrencyFactor has not to be part of the count parameters $originalParameters = $dataQuery->getParameters(); $countParameters = new ArrayCollection(); diff --git a/engine/Shopware/Controllers/Backend/Performance.php b/engine/Shopware/Controllers/Backend/Performance.php index f49c93bfd07..fc06acd24e5 100644 --- a/engine/Shopware/Controllers/Backend/Performance.php +++ b/engine/Shopware/Controllers/Backend/Performance.php @@ -619,13 +619,13 @@ protected function getPerformanceCheckData() 'id' => 1, 'name' => Shopware()->Snippets()->getNamespace('backend/performance/main')->get('cache/apc'), 'value' => \extension_loaded('apcu'), - 'valid' => \extension_loaded('apcu') === true && ini_get('apc.enabled') ? self::PERFORMANCE_VALID : self::PERFORMANCE_INVALID, + 'valid' => \extension_loaded('apcu') === true && \ini_get('apc.enabled') ? self::PERFORMANCE_VALID : self::PERFORMANCE_INVALID, ], [ 'id' => 3, 'name' => Shopware()->Snippets()->getNamespace('backend/performance/main')->get('cache/zend'), 'value' => \extension_loaded('Zend OPcache'), - 'valid' => \extension_loaded('Zend OPcache') === true && ini_get('opcache.enable') ? self::PERFORMANCE_VALID : self::PERFORMANCE_INVALID, + 'valid' => \extension_loaded('Zend OPcache') === true && \ini_get('opcache.enable') ? self::PERFORMANCE_VALID : self::PERFORMANCE_INVALID, ], [ 'id' => 4, diff --git a/engine/Shopware/Controllers/Backend/PluginInstaller.php b/engine/Shopware/Controllers/Backend/PluginInstaller.php index 996844d7f5c..595a237b412 100644 --- a/engine/Shopware/Controllers/Backend/PluginInstaller.php +++ b/engine/Shopware/Controllers/Backend/PluginInstaller.php @@ -88,7 +88,7 @@ public function updateAction() $plugin = $this->getPluginModel($technicalName); - //disable plugin and save state + // disable plugin and save state $active = $plugin->getActive(); $plugin->setActive(false); $this->get(ModelManager::class)->flush(); diff --git a/engine/Shopware/Controllers/Backend/Premium.php b/engine/Shopware/Controllers/Backend/Premium.php index 8a74b21e634..c013493adda 100644 --- a/engine/Shopware/Controllers/Backend/Premium.php +++ b/engine/Shopware/Controllers/Backend/Premium.php @@ -54,7 +54,7 @@ public function preDispatch() public function getSubShopsAction() { - //load shop repository + // load shop repository $repository = $this->get('models')->getRepository(Shop::class); $builder = $repository->createQueryBuilder('shops'); @@ -68,10 +68,10 @@ public function getSubShopsAction() $builder->leftJoin('shops.locale', 'shopLocale'); $query = $builder->getQuery(); - //select all shops as array + // select all shops as array $data = $query->getArrayResult(); - //return the data and total count + // return the data and total count $this->View()->assign(['success' => true, 'data' => $data]); } @@ -86,12 +86,12 @@ public function getPremiumArticlesAction() $start = $this->Request()->get('start'); $limit = $this->Request()->get('limit'); - //order data + // order data $order = (array) $this->Request()->getParam('sort', []); - //If a search-filter is set + // If a search-filter is set if ($this->Request()->get('filter')) { - //Get the value itself + // Get the value itself $filter = $this->Request()->get('filter'); $filter = $filter[\count($filter) - 1]; $filterValue = $filter['value']; @@ -136,10 +136,10 @@ public function createPremiumArticleAction() if (empty($params['orderNumber'])) { throw new Exception('No ordernumber was entered.'); } - //Fills the model by using the array $params + // Fills the model by using the array $params $premiumModel->fromArray($params); - //find the shop-model by using the subShopId + // find the shop-model by using the subShopId /** @var Shop $shop */ $shop = $this->get('models')->find(Shop::class, $params['shopId']); $premiumModel->setShop($shop); @@ -148,7 +148,7 @@ public function createPremiumArticleAction() $productVariant = $this->getArticleDetailRepository()->findOneBy(['number' => $params['orderNumber']]); $premiumModel->setArticleDetail($productVariant); - //If the product is already set as a premium-product + // If the product is already set as a premium-product $repository = $this->get('models')->getRepository(Premium::class); $result = $repository->findByOrderNumber($params['orderNumber']); $result = $this->get('models')->toArray($result); @@ -159,7 +159,7 @@ public function createPremiumArticleAction() return; } - //saves the model + // saves the model $this->get('models')->persist($premiumModel); $this->get('models')->flush(); @@ -190,7 +190,7 @@ public function editPremiumArticleAction() if (empty($params['orderNumberExport'])) { $params['orderNumberExport'] = $params['orderNumber']; } - //Replace a comma with a dot + // Replace a comma with a dot $params['startPrice'] = str_replace(',', '.', $params['startPrice']); $premiumModel->fromArray($params); diff --git a/engine/Shopware/Controllers/Backend/RiskManagement.php b/engine/Shopware/Controllers/Backend/RiskManagement.php index e0fc0fbf7fa..0c1c9b58be8 100644 --- a/engine/Shopware/Controllers/Backend/RiskManagement.php +++ b/engine/Shopware/Controllers/Backend/RiskManagement.php @@ -110,7 +110,7 @@ public function editRuleAction() unset($params['action']); unset($params['_dc']); - //2-dimensional array + // 2-dimensional array if ($params[0]) { $data = []; foreach ($params as $values) { diff --git a/engine/Shopware/Controllers/Backend/Site.php b/engine/Shopware/Controllers/Backend/Site.php index f2f78e5d87b..978b10cadb0 100644 --- a/engine/Shopware/Controllers/Backend/Site.php +++ b/engine/Shopware/Controllers/Backend/Site.php @@ -177,7 +177,7 @@ public function deleteGroupAction() // If the current site is associated with the requested group and has no other groups if (\in_array($key, $groups) && \count($groups) == 1) { - //set group to gDisabled to prevent orphanage + // set group to gDisabled to prevent orphanage Shopware()->Db()->query( 'UPDATE s_cms_static SET grouping = ? WHERE id = ?', ['disabled', $site['id']] @@ -210,13 +210,13 @@ public function deleteGroupAction() */ public function deleteSiteAction() { - //get id + // get id $params = $this->Request()->getParams(); $siteId = empty($params['siteId']) ? null : $params['siteId']; if (!empty($siteId)) { try { - //remove site + // remove site $model = $this->getSiteRepository()->find($siteId); if ($model !== null) { $this->getManager()->remove($model); @@ -224,15 +224,15 @@ public function deleteSiteAction() $this->getManager()->flush(); - //set the parentID of all children to 0 - //we don't want orphans + // set the parentID of all children to 0 + // we don't want orphans $sql = 'UPDATE s_cms_static SET parentID = 0 WHERE parentID = ?'; Shopware()->Db()->query($sql, [$siteId]); - //hand siteId to view + // hand siteId to view $this->View()->assign(['success' => true, 'data' => $siteId]); } catch (Exception $e) { - //catch all errors + // catch all errors $this->View()->assign(['success' => false, 'message' => $e->getMessage()]); } } @@ -245,7 +245,7 @@ public function deleteSiteAction() */ public function saveSiteAction() { - //get the id from the helperId field + // get the id from the helperId field $params = $this->Request()->getParams(); $siteId = empty($params['helperId']) ? null : $params['helperId']; diff --git a/engine/Shopware/Controllers/Backend/Vote.php b/engine/Shopware/Controllers/Backend/Vote.php index ba832ec2f3d..a0df4e07382 100644 --- a/engine/Shopware/Controllers/Backend/Vote.php +++ b/engine/Shopware/Controllers/Backend/Vote.php @@ -57,7 +57,7 @@ protected function getList($offset, $limit, $sort = [], $filter = [], array $who return $list; } - //assign shops over additional query to improve performance + // assign shops over additional query to improve performance $shops = $this->getShops($shopIds); return $this->assignShops($list, $shops); diff --git a/engine/Shopware/Controllers/Backend/Voucher.php b/engine/Shopware/Controllers/Backend/Voucher.php index 112625da011..9847403c47a 100644 --- a/engine/Shopware/Controllers/Backend/Voucher.php +++ b/engine/Shopware/Controllers/Backend/Voucher.php @@ -175,7 +175,7 @@ public function createVoucherCodesAction() $deletePreviousVoucherCodes = $this->Request()->deletePreviousVoucherCodes; $createdVoucherCodes = 0; - //verify the pattern of the code only the first time of batch processing batch + // verify the pattern of the code only the first time of batch processing batch if (!empty($codePattern) && $deletePreviousVoucherCodes === 'true') { if (!$this->validateCodePattern($codePattern, $numberOfUnits)) { $this->View()->assign(['success' => false, 'errorMsg' => 'CodePattern not complex enough']); @@ -183,7 +183,7 @@ public function createVoucherCodesAction() return; } } - //first delete available codes + // first delete available codes if ($deletePreviousVoucherCodes === 'true') { $this->deleteAllVoucherCodesById($voucherId); @@ -192,7 +192,7 @@ public function createVoucherCodesAction() return; } do { - //generate voucher codes till the numberOfUnits is reached + // generate voucher codes till the numberOfUnits is reached $this->generateVoucherCodes($voucherId, ($numberOfUnits - $createdVoucherCodes), $codePattern); $query = $this->getVoucherRepository()->getVoucherCodeCountQuery($voucherId); @@ -241,7 +241,7 @@ public function exportVoucherCodeAction() $this->Response()->headers->set('content-type', 'text/csv; charset=utf-8'); $this->Response()->headers->set('content-disposition', 'attachment;filename=voucherCodes.csv'); - //use this to set the BOM to show it in the right way for excel and stuff + // use this to set the BOM to show it in the right way for excel and stuff echo "\xEF\xBB\xBF"; $fp = fopen('php://output', 'w'); if (!\is_resource($fp)) { @@ -304,7 +304,7 @@ public function saveVoucherAction() if (!$this->_isAllowed('update', 'voucher')) { return; } - //edit voucher + // edit voucher $voucher = $this->getVoucherRepository()->find($voucherId); if (!$voucher instanceof Voucher) { throw new ModelNotFoundException(Voucher::class, $voucherId); @@ -313,11 +313,11 @@ public function saveVoucherAction() if (!$this->_isAllowed('create', 'voucher')) { return; } - //new voucher + // new voucher $voucher = new Voucher(); } - //save empty values + // save empty values $params = array_merge([ 'validFrom' => null, 'validTo' => null, @@ -432,7 +432,7 @@ protected function initAcl() protected function generateVoucherCodes($voucherId, $numberOfUnits, $codePattern) { $values = []; - //wrote in standard sql cause in this case its way faster than doctrine models + // wrote in standard sql cause in this case its way faster than doctrine models $sql = 'INSERT IGNORE INTO s_emarketing_voucher_codes (voucherID, code) VALUES'; for ($i = 1; $i <= $numberOfUnits; ++$i) { $code = $this->generateCode($codePattern); diff --git a/engine/Shopware/Controllers/Frontend/Blog.php b/engine/Shopware/Controllers/Frontend/Blog.php index 92f4a071945..fb5c7dcb2b6 100644 --- a/engine/Shopware/Controllers/Frontend/Blog.php +++ b/engine/Shopware/Controllers/Frontend/Blog.php @@ -458,7 +458,7 @@ public function ratingAction() $mail->addTo($this->Request()->getParam('eMail')); $mail->send(); } else { - //Save comment + // Save comment $commentData = $this->Request()->getPost(); $this->sSaveComment($commentData, $blogArticleId); } diff --git a/engine/Shopware/Controllers/Frontend/Checkout.php b/engine/Shopware/Controllers/Frontend/Checkout.php index 348cbe4f82d..736236bfe53 100644 --- a/engine/Shopware/Controllers/Frontend/Checkout.php +++ b/engine/Shopware/Controllers/Frontend/Checkout.php @@ -928,7 +928,7 @@ public function getUserData() if ($taxFree) { $system->sUSERGROUPDATA['tax'] = 0; - $system->sCONFIG['sARTICLESOUTPUTNETTO'] = 1; //Old template + $system->sCONFIG['sARTICLESOUTPUTNETTO'] = 1; // Old template Shopware()->Session()->set('sUserGroupData', $system->sUSERGROUPDATA); $userData['additional']['charge_vat'] = false; $userData['additional']['show_net'] = false; @@ -1533,7 +1533,7 @@ public function getSelectedPayment() $this->front->Request()->setPost('sPayment', (int) $payment['id']); $this->admin->sUpdatePayment(); - //if customer logged in and payment switched to fallback, display cart notice. Otherwise anonymous customers will see the message too + // if customer logged in and payment switched to fallback, display cart notice. Otherwise anonymous customers will see the message too if (Shopware()->Session()->get('sUserId')) { $this->flagPaymentBlocked(); } diff --git a/engine/Shopware/Controllers/Widgets/Emotion.php b/engine/Shopware/Controllers/Widgets/Emotion.php index 66c8435b46e..ea588b2b1b9 100644 --- a/engine/Shopware/Controllers/Widgets/Emotion.php +++ b/engine/Shopware/Controllers/Widgets/Emotion.php @@ -143,8 +143,8 @@ public function previewAction() $this->View()->assign($viewAssignments); - //fake to prevent rendering the templates with the widgets module. - //otherwise the template engine don't accept to load templates of the `frontend` module + // fake to prevent rendering the templates with the widgets module. + // otherwise the template engine don't accept to load templates of the `frontend` module $this->Request()->setModuleName('frontend'); } diff --git a/engine/Shopware/Core/sAdmin.php b/engine/Shopware/Core/sAdmin.php index 68918b3f33e..e2aa363e08e 100644 --- a/engine/Shopware/Core/sAdmin.php +++ b/engine/Shopware/Core/sAdmin.php @@ -915,7 +915,7 @@ public function sCheckUser() $passwordChangeDate, $userMail, $userId, - (int) ini_get('session.gc_maxlifetime'), + (int) \ini_get('session.gc_maxlifetime'), ] ); $getUser = $getUser ?: []; @@ -3268,7 +3268,7 @@ protected function loginUser($getUser, $email, $password, $isPreHashed, $encoder ] ); - //destroy cookie + // destroy cookie $this->front->Response()->setCookie('sUniqueID'); } diff --git a/engine/Shopware/Core/sArticles.php b/engine/Shopware/Core/sArticles.php index 87cb0823c7f..6a869479b30 100644 --- a/engine/Shopware/Core/sArticles.php +++ b/engine/Shopware/Core/sArticles.php @@ -1052,7 +1052,7 @@ public function sGetCheapestPrice( $getGroups = $this->db->fetchAll($sql, [$pricegroup, $this->sSYSTEM->sUSERGROUP]); - //if there are no discounts for this customergroup don't show "ab:" + // if there are no discounts for this customergroup don't show "ab:" if (empty($getGroups)) { return $cheapestPrice; } @@ -2398,8 +2398,8 @@ private function getPromotion(?int $category, string $number) $promotion['linkDetails'] .= "&sCategory=$category"; } - //check if the product has a configured property set which stored in s_filter. - //the mini product doesn't contains this data so we have to load this lazy. + // check if the product has a configured property set which stored in s_filter. + // the mini product doesn't contains this data so we have to load this lazy. if (!$product->hasProperties()) { return $promotion; } @@ -2627,7 +2627,7 @@ private function getLinksOfProduct(ListProduct $product, $categoryId, $addNumber */ private function getDescriptionKeywords($longDescription) { - //sDescriptionKeywords + // sDescriptionKeywords $string = strip_tags(html_entity_decode($longDescription, ENT_COMPAT | ENT_HTML401, 'UTF-8')); $string = str_replace(',', '', $string); $words = preg_split('/ /', $string, -1, PREG_SPLIT_NO_EMPTY); diff --git a/engine/Shopware/Core/sArticlesComparisons.php b/engine/Shopware/Core/sArticlesComparisons.php index 0c5c89dbd44..950bb7222c0 100644 --- a/engine/Shopware/Core/sArticlesComparisons.php +++ b/engine/Shopware/Core/sArticlesComparisons.php @@ -236,7 +236,7 @@ public function sGetComparisonProperties($articles) $properties = []; foreach ($articles as $product) { - //get all properties in the right order + // get all properties in the right order $sql = "SELECT options.id, options.name, @@ -269,7 +269,7 @@ public function sGetComparisonProperties($articles) foreach ($productProperties as $productProperty) { if (!\array_key_exists($productProperty['id'], $properties)) { - //the key is not part of the array so add it to the end + // the key is not part of the array so add it to the end $properties[$productProperty['id']] = $this->extractPropertyTranslation($productProperty); } } diff --git a/engine/Shopware/Core/sBasket.php b/engine/Shopware/Core/sBasket.php index de56cd64586..d9055603a58 100644 --- a/engine/Shopware/Core/sBasket.php +++ b/engine/Shopware/Core/sBasket.php @@ -2741,7 +2741,7 @@ private function getBasketProducts(array $getProducts): array $getProducts[$key]['amount'] = $quantity * round($price, 2); - //reset purchaseunit and save the original value in purchaseunitTemp + // reset purchaseunit and save the original value in purchaseunitTemp if ($getProducts[$key]['purchaseunit'] > 0) { $getProducts[$key]['purchaseunitTemp'] = $getProducts[$key]['purchaseunit']; $getProducts[$key]['purchaseunit'] = 1; diff --git a/engine/Shopware/Core/sExport.php b/engine/Shopware/Core/sExport.php index 02b1f6c7646..9b19c5765c8 100644 --- a/engine/Shopware/Core/sExport.php +++ b/engine/Shopware/Core/sExport.php @@ -2026,7 +2026,7 @@ private function hasMediaUrl(): bool private function ensurePHPTimeLimit(): void { - $maxExecutionTime = (int) ini_get('max_execution_time'); + $maxExecutionTime = (int) \ini_get('max_execution_time'); if ($maxExecutionTime <= self::DISABLED_MAX_EXECUTION_TIME || $maxExecutionTime >= self::DEFAULT_MAX_EXECUTION_TIME) { return; } diff --git a/engine/Shopware/Core/sOrder.php b/engine/Shopware/Core/sOrder.php index 9ffc1aa3189..830a42afca7 100644 --- a/engine/Shopware/Core/sOrder.php +++ b/engine/Shopware/Core/sOrder.php @@ -659,7 +659,7 @@ public function sSaveOrder() ); } } catch (Exception $e) { - //Payment method code failure + // Payment method code failure } $attributeData = $this->eventManager->filter( @@ -733,7 +733,7 @@ public function sSaveOrder() // Check for individual voucher - code if ($basketRow['modus'] == CartPositionsMode::VOUCHER) { - //reserve the basket voucher for the current user. + // reserve the basket voucher for the current user. $this->reserveVoucher( $basketRow['ordernumber'], $this->sUserData['additional']['user']['id'], diff --git a/engine/Shopware/Core/sRewriteTable.php b/engine/Shopware/Core/sRewriteTable.php index 823ce9650a6..8e397fd2992 100644 --- a/engine/Shopware/Core/sRewriteTable.php +++ b/engine/Shopware/Core/sRewriteTable.php @@ -542,7 +542,7 @@ public function sCreateRewriteTableBlog($offset = null, $limit = null, ShopConte ->getBlogCategoriesByParentQuery(Shopware()->Shop()->get('parentID')); $blogCategories = $query->getArrayResult(); - //get all blog category ids + // get all blog category ids $blogCategoryIds = []; foreach ($blogCategories as $blogCategory) { $blogCategoryIds[] = $blogCategory['id']; @@ -696,10 +696,10 @@ public function sCreateRewriteTableForSingleCampaign( */ public function sCreateRewriteTableContent($offset = null, $limit = null, ShopContextInterface $context = null) { - //form urls + // form urls $this->insertFormUrls($offset, $limit, $context); - //static pages urls + // static pages urls $this->insertStaticPageUrls($offset, $limit, $context); } diff --git a/engine/Shopware/Kernel.php b/engine/Shopware/Kernel.php index 8ee2106672f..06db524adc3 100644 --- a/engine/Shopware/Kernel.php +++ b/engine/Shopware/Kernel.php @@ -289,7 +289,7 @@ public function setPhpSettings(array $settings, $prefix = '') { foreach ($settings as $key => $value) { $key = empty($prefix) ? $key : $prefix . $key; - if (is_scalar($value)) { + if (\is_scalar($value)) { ini_set($key, (string) $value); } elseif (\is_array($value)) { $this->setPhpSettings($value, $key . '.'); @@ -550,7 +550,7 @@ protected function initializeContainer() $cache = new ConfigCache( $this->config['hook']['proxyDir'] . '/' . $class . '.php', - true //always check for file modified time + true // always check for file modified time ); if (!$cache->isFresh()) { diff --git a/engine/Shopware/Models/Article/Repository.php b/engine/Shopware/Models/Article/Repository.php index 4498e4aabe9..becb09bd0de 100644 --- a/engine/Shopware/Models/Article/Repository.php +++ b/engine/Shopware/Models/Article/Repository.php @@ -1995,12 +1995,12 @@ public function getSupplierListQueryBuilder($filter, array $orderBy) $builder->groupBy('supplier.id'); if (\is_array($filter) && ($filter[0]['property'] === 'name')) { - //filter the displayed columns with the passed filter + // filter the displayed columns with the passed filter $builder - ->where('supplier.name LIKE ?1') //Search only the beginning of the customer number. - ->orWhere('supplier.description LIKE ?1'); //Full text search for the first name of the customer + ->where('supplier.name LIKE ?1') // Search only the beginning of the customer number. + ->orWhere('supplier.description LIKE ?1'); // Full text search for the first name of the customer - //set the filter parameter for the different columns. + // set the filter parameter for the different columns. $builder->setParameter(1, '%' . $filter[0]['value'] . '%'); } diff --git a/engine/Shopware/Models/Category/Repository.php b/engine/Shopware/Models/Category/Repository.php index d9438b3233d..7d3890da15d 100644 --- a/engine/Shopware/Models/Category/Repository.php +++ b/engine/Shopware/Models/Category/Repository.php @@ -734,7 +734,7 @@ protected function getActiveQueryBuilder($customerGroupId = null, $shopId = null ->andHaving('COUNT(cg.id) = 0'); } - //to prevent a temporary table and file sort we have to set the same sort and group by condition + // to prevent a temporary table and file sort we have to set the same sort and group by condition $builder->groupBy('c.parentId') ->addGroupBy('c.position') ->addGroupBy('c.id') diff --git a/engine/Shopware/Models/Dispatch/Repository.php b/engine/Shopware/Models/Dispatch/Repository.php index 18d5879b024..5a2a4dae6af 100644 --- a/engine/Shopware/Models/Dispatch/Repository.php +++ b/engine/Shopware/Models/Dispatch/Repository.php @@ -460,7 +460,7 @@ public function getDispatchWithDeletedShopsQuery() */ protected function sortOrderQuery(\Doctrine\ORM\QueryBuilder $builder, $modelPrefix, $orderBy) { - //order the query with the passed orderBy parameter + // order the query with the passed orderBy parameter if (!empty($orderBy)) { foreach ($orderBy as $order) { if (!isset($order['direction'])) { diff --git a/engine/Shopware/Models/Document/Order.php b/engine/Shopware/Models/Document/Order.php index fb5cf3a2e56..63ac09f3b87 100644 --- a/engine/Shopware/Models/Document/Order.php +++ b/engine/Shopware/Models/Document/Order.php @@ -964,14 +964,14 @@ private function getTaxRateByApproximateTaxRate( $taxRate = Shopware()->Db()->fetchOne($sql, [ $approximateTaxRate, // p.e. 19.971195391 (approx. 20% VAT) $approximateTaxRate, - $maxDiff, //default: 0.1 + $maxDiff, // default: 0.1 $approximateTaxRate, $approximateTaxRate, $maxDiff, - $areaId, //p.e. 3 (Europe) + $areaId, // p.e. 3 (Europe) $countryId, // p.e. 23 (AT) - $stateId, //p.e. 0 - $customerGroupId, //p.e. 1 (EK) + $stateId, // p.e. 0 + $customerGroupId, // p.e. 1 (EK) ]); if ($taxRate === false) { diff --git a/engine/Shopware/Models/Media/Media.php b/engine/Shopware/Models/Media/Media.php index d318ec41806..b3de308a16b 100644 --- a/engine/Shopware/Models/Media/Media.php +++ b/engine/Shopware/Models/Media/Media.php @@ -716,7 +716,7 @@ public function onLoad() public function onRemove() { $mediaService = Shopware()->Container()->get(MediaServiceInterface::class); - //check if file exist and remove it + // check if file exist and remove it if ($mediaService->has($this->path)) { $mediaService->delete($this->path); } diff --git a/engine/Shopware/Models/Order/Document/Repository.php b/engine/Shopware/Models/Order/Document/Repository.php index dfa60062356..417449cb827 100644 --- a/engine/Shopware/Models/Order/Document/Repository.php +++ b/engine/Shopware/Models/Order/Document/Repository.php @@ -81,7 +81,7 @@ public function getListQuery($orderId, $filter = null, $orderBy = null, $limit = */ protected function selectListQuery(\Doctrine\ORM\QueryBuilder $builder) { - //select the different entities + // select the different entities $builder->select([ 'documents.id as id', 'documents.date as date', @@ -94,7 +94,7 @@ protected function selectListQuery(\Doctrine\ORM\QueryBuilder $builder) 'type.name as typeName', ]); - //join the required tables for the order list + // join the required tables for the order list $builder->from('Shopware\Models\Order\Document\Document', 'documents') ->join('documents.type', 'type'); diff --git a/engine/Shopware/Models/Shop/Repository.php b/engine/Shopware/Models/Shop/Repository.php index 27fa926f427..43578b4b2b6 100644 --- a/engine/Shopware/Models/Shop/Repository.php +++ b/engine/Shopware/Models/Shop/Repository.php @@ -402,7 +402,7 @@ public function getActiveShopByRequestAsArray(Enlight_Controller_Request_Request $shops = $this->getShopsArrayByHost($host); - //returns the right shop depending on the url + // returns the right shop depending on the url $shop = $this->findShopForRequest($shops, $requestPath); if ($shop !== null) { @@ -494,7 +494,7 @@ protected function findShopForRequest($shops, $requestPath) { $shop = null; foreach ($shops as $currentShop) { - //if the base url matches exactly the basePath we have found the main shop but the loop will continue + // if the base url matches exactly the basePath we have found the main shop but the loop will continue if ($currentShop['base_url'] === $currentShop['base_path']) { if ($shop === null) { $shop = $currentShop; diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/FeedbackCollector.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/FeedbackCollector.php index 445d1efefbf..94ce4d7b7a0 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/FeedbackCollector.php +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/FeedbackCollector.php @@ -118,8 +118,8 @@ private function gatherData() 'shopware_version' => $this->release->getVersion(), 'shopware_version_text' => $this->release->getVersionText(), 'shopware_version_revision' => $this->release->getRevision(), - 'max_execution_time' => ini_get('max_execution_time'), - 'memory_limit' => ini_get('memory_limit'), + 'max_execution_time' => \ini_get('max_execution_time'), + 'memory_limit' => \ini_get('memory_limit'), 'serverSoftware' => $serverSoftware, 'mysql_version' => $db->fetchColumn('SELECT VERSION()'), 'extension' => get_loaded_extensions(), diff --git a/engine/Shopware/Plugins/Default/Core/CronBirthday/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/CronBirthday/Bootstrap.php index 175f03d7b19..1de9b2735e7 100644 --- a/engine/Shopware/Plugins/Default/Core/CronBirthday/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Core/CronBirthday/Bootstrap.php @@ -144,7 +144,7 @@ public function onRun(Shopware_Components_Cron_CronJob $job) $shop = $repository->getActiveById($shopId); $this->get(ShopRegistrationServiceInterface::class)->registerShop($shop); - //language subshopID + // language subshopID $context = [ 'sUser' => $user, 'sVoucher' => $voucher, diff --git a/engine/Shopware/Plugins/Default/Core/HttpCache/CacheControl.php b/engine/Shopware/Plugins/Default/Core/HttpCache/CacheControl.php index fb5c88ca54b..863fc737b50 100644 --- a/engine/Shopware/Plugins/Default/Core/HttpCache/CacheControl.php +++ b/engine/Shopware/Plugins/Default/Core/HttpCache/CacheControl.php @@ -285,7 +285,7 @@ public function useNoCacheParameterForEsi(Request $request, $targetName) */ public function setContextCacheKey(Request $request, ShopContextInterface $context, Response $response) { - //not logged in => reset global context cookie + // not logged in => reset global context cookie if (!$this->session->offsetGet('sUserGroup')) { $this->resetCookies($request, $response); diff --git a/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/SimilarShown.php b/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/SimilarShown.php index e10c8f59029..5243a4bdd9d 100644 --- a/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/SimilarShown.php +++ b/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/SimilarShown.php @@ -85,13 +85,13 @@ public function initSimilarShown($offset = null, $limit = null) VALUES (:article_id, :related_article_id, :viewed, :init_date) '); - //iterate all selected articles which has to be initialed + // iterate all selected articles which has to be initialed foreach ($articles as $articleId) { - //now we select all similar articles of the s_emarketing_lastarticles table + // now we select all similar articles of the s_emarketing_lastarticles table $preparedSelect->execute(['articleId' => $articleId]); $combinations = $preparedSelect->fetchAll(); - //at least we have to insert each combination in the aggregate s_articles_similar_shown_ro table. + // at least we have to insert each combination in the aggregate s_articles_similar_shown_ro table. foreach ($combinations as $combination) { $preparedInsert->execute($combination); } @@ -142,10 +142,10 @@ public function updateElapsedSimilarShownArticles($limit = null) */ public function getSimilarShownValidationTime() { - //get similar shown validation time + // get similar shown validation time $interval = Shopware()->Config()->get('similarValidationTime', 10); - //create a new date time object to create the current date subtract the configured date interval. + // create a new date time object to create the current date subtract the configured date interval. $orderTime = new DateTime(); $orderTime->sub(new DateInterval('P' . $interval . 'D')); diff --git a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php index 37f3c2c3222..164f668d4cb 100644 --- a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php @@ -123,7 +123,7 @@ public function onBackendOrderPostDispatch(Enlight_Event_EventArgs $args) /** @var Enlight_View_Default $view */ $view = $args->getSubject()->View(); - //if the controller action name equals "load" we have to load all application components + // if the controller action name equals "load" we have to load all application components if ($args->getRequest()->getActionName() === 'load') { $view->addTemplateDir($this->Path() . 'Views/emotion/'); $view->extendsTemplate( diff --git a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php index 44d54bf39fd..6af2091c894 100644 --- a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php +++ b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php @@ -45,7 +45,7 @@ public function validate($paymentData) */ public function savePaymentData($userId, Enlight_Controller_Request_Request $request) { - //nothing to do, no return expected + // nothing to do, no return expected } /** @@ -53,7 +53,7 @@ public function savePaymentData($userId, Enlight_Controller_Request_Request $req */ public function getCurrentPaymentDataAsArray($userId) { - //nothing to do, array expected + // nothing to do, array expected return []; } diff --git a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php index a392b8c939b..3346f0fa02d 100644 --- a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php +++ b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php @@ -299,7 +299,7 @@ private function sendSepaEmail($orderNumber, $userId, $data) try { $mail->send(); } catch (Exception $e) { - //TODO: Handle email sending failure + // TODO: Handle email sending failure } } } diff --git a/engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php index f56883749ef..957483c39ac 100644 --- a/engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php @@ -87,9 +87,9 @@ public function onFilterRender(Enlight_Event_EventArgs $args) // Remove comments '#/\*.*?\*/#ms' => '', '#^\s*//.*$#m' => '', - //'#\n\s+#ms' => '', + // '#\n\s+#ms' => '', '#^\s+#ms' => '', - //'#\s+$#ms' => '', + // '#\s+$#ms' => '', ]; return preg_replace(array_keys($expressions), array_values($expressions), $source); diff --git a/engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php index 05344d165d4..c6c4d91d4fa 100644 --- a/engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php @@ -237,7 +237,7 @@ protected function upgradeShop($request, $response) } } - //currency switch + // currency switch if ($cookieKey === 'currency') { $path = rtrim((string) $shop->getBasePath(), '/') . '/'; $response->headers->setCookie(new Cookie($cookieKey, $cookieValue, 0, $path, null, $request->isSecure())); @@ -389,7 +389,7 @@ protected function getNewShopUrl(Request $request, Shop $newShop) $url = '/' . $url; } - //build full redirect url to allow host switches + // build full redirect url to allow host switches return sprintf( '%s://%s%s%s', $request->getScheme(), @@ -406,13 +406,13 @@ protected function getNewShopUrl(Request $request, Shop $newShop) */ protected function shouldRedirect(Request $request, Shop $shop) { - return //for example: template preview, direct shop selection via url + return // for example: template preview, direct shop selection via url ( $request->isGet() && $request->getQuery('__shop') !== null && (int) $request->getQuery('__shop') !== (int) $shop->getId() ) - //for example: shop language switch + // for example: shop language switch || ( $request->isPost() && $request->getPost('__shop') !== null diff --git a/engine/Shopware/Plugins/Default/Core/System/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/System/Bootstrap.php index fc1d5bbc9a5..f9b56d3f609 100644 --- a/engine/Shopware/Plugins/Default/Core/System/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Core/System/Bootstrap.php @@ -124,7 +124,7 @@ public function onInitResourceSystem(Enlight_Event_EventArgs $args) ', [$system->sUSERGROUP]); } if (empty($system->sUSERGROUPDATA['tax']) && !empty($system->sUSERGROUPDATA['id'])) { - $config['sARTICLESOUTPUTNETTO'] = 1; //Old template + $config['sARTICLESOUTPUTNETTO'] = 1; // Old template Shopware()->Session()->set('sOutputNet', true); } else { Shopware()->Session()->set('sOutputNet', false); diff --git a/engine/Shopware/Plugins/Default/Frontend/CronRefresh/Bootstrap.php b/engine/Shopware/Plugins/Default/Frontend/CronRefresh/Bootstrap.php index 6d40c722137..f5394edcba0 100644 --- a/engine/Shopware/Plugins/Default/Frontend/CronRefresh/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Frontend/CronRefresh/Bootstrap.php @@ -115,7 +115,7 @@ private function deleteOldReferrerData($maximumReferrerAge) if ($maximumReferrerAge === 0) { $maximumReferrerAge = 90; } - //negate the value and quote it for the sql statement + // negate the value and quote it for the sql statement $maximumReferrerAge = (int) $maximumReferrerAge * -1; $sql = ' DELETE FROM s_statistics_referer WHERE `datum` < date_add(current_date, INTERVAL ' . $maximumReferrerAge . ' DAY) @@ -139,7 +139,7 @@ private function deleteOldArticleImpressionData($maximumAge) if ($maximumAge === 0) { $maximumAge = 90; } - //negate the value and quote it for the sql statement + // negate the value and quote it for the sql statement $maximumAge = (int) $maximumAge * -1; $sql = ' DELETE FROM s_statistics_article_impression WHERE `date` < date_add(current_date, INTERVAL ' . $maximumAge . ' DAY) diff --git a/recovery/common/src/HttpClient/CurlClient.php b/recovery/common/src/HttpClient/CurlClient.php index 3cd6c32b710..1cb6732889e 100644 --- a/recovery/common/src/HttpClient/CurlClient.php +++ b/recovery/common/src/HttpClient/CurlClient.php @@ -93,7 +93,7 @@ private function call($url, $method = self::METHOD_GET, array $header = [], $dat throw new ClientException('Invalid URL given'); } - //Initializes the cURL instance + // Initializes the cURL instance $curl = curl_init(); curl_setopt($curl, CURLOPT_HTTPHEADER, $header); curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); diff --git a/recovery/install/index.php b/recovery/install/index.php index f325b767f7e..d725cffd68f 100644 --- a/recovery/install/index.php +++ b/recovery/install/index.php @@ -59,7 +59,7 @@ return $application->run($input); } -//the execution time will be increased, because the import can take a while +// the execution time will be increased, because the import can take a while ini_set('max_execution_time', 120); // Redirect to no mod rewrite path diff --git a/recovery/install/ping.php b/recovery/install/ping.php index 3b7f324ab59..9b3cf1c6d43 100644 --- a/recovery/install/ping.php +++ b/recovery/install/ping.php @@ -23,7 +23,7 @@ */ header('HTTP/1.1 200 OK'); -//no cache headers +// no cache headers header('Expires: Mon, 26 Jul 1990 05:00:00 GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); header('Cache-Control: no-store, no-cache, must-revalidate'); diff --git a/recovery/install/src/Requirements.php b/recovery/install/src/Requirements.php index 4a8d13c5889..fed375f9c41 100644 --- a/recovery/install/src/Requirements.php +++ b/recovery/install/src/Requirements.php @@ -160,7 +160,7 @@ private function getRuntimeValue($name) return true; } elseif (\function_exists($name)) { return true; - } elseif (($value = ini_get($name)) !== null) { + } elseif (($value = \ini_get($name)) !== null) { if (strtolower($value) == 'off' || (is_numeric($value) && $value == 0)) { return false; } elseif (strtolower($value) == 'on' || (is_numeric($value) && $value == 1)) { @@ -235,10 +235,10 @@ private function checkOpcache() 'name' => 'opcache.use_cwd', 'group' => 'core', 'required' => 1, - 'version' => ini_get('opcache.use_cwd'), - 'result' => ini_get('opcache.use_cwd'), + 'version' => \ini_get('opcache.use_cwd'), + 'result' => \ini_get('opcache.use_cwd'), 'notice' => '', - 'check' => $this->compare('opcache.use_cwd', ini_get('opcache.use_cwd'), '1'), + 'check' => $this->compare('opcache.use_cwd', \ini_get('opcache.use_cwd'), '1'), 'error' => '', ]]; @@ -248,10 +248,10 @@ private function checkOpcache() 'name' => 'opcache.validate_root', 'group' => 'core', 'required' => 1, - 'version' => ini_get('opcache.validate_root'), - 'result' => ini_get('opcache.validate_root'), + 'version' => \ini_get('opcache.validate_root'), + 'result' => \ini_get('opcache.validate_root'), 'notice' => '', - 'check' => $this->compare('opcache.validate_root', ini_get('opcache.validate_root'), '1'), + 'check' => $this->compare('opcache.validate_root', \ini_get('opcache.validate_root'), '1'), 'error' => '', ]; } @@ -358,7 +358,7 @@ private function checkSessionSavePath() { if (\function_exists('session_save_path')) { return (bool) session_save_path(); - } elseif (ini_get('session.save_path')) { + } elseif (\ini_get('session.save_path')) { return true; } @@ -372,7 +372,7 @@ private function checkSessionSavePath() */ private function checkSuhosinGetMaxValueLength() { - $length = (int) ini_get('suhosin.get.max_value_length'); + $length = (int) \ini_get('suhosin.get.max_value_length'); if ($length === 0) { return 2000; } diff --git a/tests/Functional/Bundle/AccountBundle/Controller/AccountTest.php b/tests/Functional/Bundle/AccountBundle/Controller/AccountTest.php index 38844f05cc3..fc427091f27 100644 --- a/tests/Functional/Bundle/AccountBundle/Controller/AccountTest.php +++ b/tests/Functional/Bundle/AccountBundle/Controller/AccountTest.php @@ -126,7 +126,7 @@ public function testNormalLogin(): void */ public function testHashPostLogin(): void { - //test with md5 password and without the ignoreAccountMode parameter + // test with md5 password and without the ignoreAccountMode parameter static::assertEmpty($this->session->offsetGet('sUserId')); $this->setUserDataToPost(); @@ -145,7 +145,7 @@ public function testHashPostLogin(): void */ public function testWithoutIgnoreLogin(): void { - //test the internal call of the method with the $ignoreAccountMode parameter + // test the internal call of the method with the $ignoreAccountMode parameter $this->setUserDataToPost(); $this->dispatch('/'); @@ -163,7 +163,7 @@ public function testWithoutIgnoreLogin(): void static::assertEmpty($result['sErrorMessages']); $this->logoutUser(); - //test the internal call of the method without the $ignoreAccountMode parameter + // test the internal call of the method without the $ignoreAccountMode parameter $this->setUserDataToPost(); @@ -184,7 +184,7 @@ public function testWithoutIgnoreLogin(): void */ public function testWithIgnoreLogin(): void { - //test the internal call of the method without the $ignoreAccountMode parameter + // test the internal call of the method without the $ignoreAccountMode parameter $this->setUserDataToPost(); $this->dispatch('/'); @@ -207,11 +207,11 @@ public function testWithIgnoreLogin(): void */ private function logoutUser(): void { - //reset the request + // reset the request $this->reset(); $this->Request()->setMethod('POST'); $this->dispatch('/account/logout'); - //reset the request + // reset the request $this->reset(); } diff --git a/tests/Functional/Bundle/SearchBundle/Condition/PriceConditionTest.php b/tests/Functional/Bundle/SearchBundle/Condition/PriceConditionTest.php index 8a58c01e779..1184f9af2ae 100644 --- a/tests/Functional/Bundle/SearchBundle/Condition/PriceConditionTest.php +++ b/tests/Functional/Bundle/SearchBundle/Condition/PriceConditionTest.php @@ -148,7 +148,7 @@ public function testPriceGroup(): void [ 'first' => ['EK' => 10], - //20,- € - 10% price group discount = 18,- € + // 20,- € - 10% price group discount = 18,- € 'second' => ['prices' => ['EK' => 20], 'priceGroup' => $priceGroup], 'third' => ['EK' => 30], ], @@ -177,7 +177,7 @@ public function testPriceGroupWithLastGraduation(): void $this->search( [ 'first' => ['EK' => 10], - //20,- € - 30% price group discount = 14,- € + // 20,- € - 30% price group discount = 14,- € 'second' => ['prices' => ['EK' => 20], 'priceGroup' => $priceGroup], 'third' => ['EK' => 30], ], diff --git a/tests/Functional/Bundle/SearchBundle/Condition/VoteAverageConditionTest.php b/tests/Functional/Bundle/SearchBundle/Condition/VoteAverageConditionTest.php index 1169be73a6f..984014bf552 100644 --- a/tests/Functional/Bundle/SearchBundle/Condition/VoteAverageConditionTest.php +++ b/tests/Functional/Bundle/SearchBundle/Condition/VoteAverageConditionTest.php @@ -72,16 +72,16 @@ public function testSubShopVotes(): void $this->search( [ 'first' => [ - 1 => [1], //shop = 1 1x vote with 1 point - 2 => [3], //shop = 2 1x vote with 3 point + 1 => [1], // shop = 1 1x vote with 1 point + 2 => [3], // shop = 2 1x vote with 3 point ], 'second' => [ - 1 => [4], //shop = 1 1x vote with 4 points - 2 => [4], //shop = 2 1x vote with 4 points + 1 => [4], // shop = 1 1x vote with 4 points + 2 => [4], // shop = 2 1x vote with 4 points ], 'third' => [ - 1 => [4], //shop = 1 1x vote with 4 points - 2 => [2], //shop = 2 1x vote with 2 points + 1 => [4], // shop = 1 1x vote with 4 points + 2 => [2], // shop = 2 1x vote with 2 points ], ], ['first', 'second'], @@ -101,18 +101,18 @@ public function testMixedVotes(): void $this->search( [ 'first' => [ - null => [5], //no assignment to shop - 1 => [1], //shop = 1 1x vote with 1 point - 2 => [4], //shop = 2 1x vote with 4 point + null => [5], // no assignment to shop + 1 => [1], // shop = 1 1x vote with 1 point + 2 => [4], // shop = 2 1x vote with 4 point ], 'second' => [ null => [5], - 1 => [4], //shop = 1 1x vote with 4 points - 2 => [3], //shop = 2 1x vote with 2 points + 1 => [4], // shop = 1 1x vote with 4 points + 2 => [3], // shop = 2 1x vote with 2 points ], 'third' => [ - 1 => [4], //shop = 1 1x vote with 4 points - 2 => [5], //shop = 2 1x vote with 2 points + 1 => [4], // shop = 1 1x vote with 4 points + 2 => [5], // shop = 2 1x vote with 2 points ], ], ['first', 'third'], @@ -132,18 +132,18 @@ public function testMixedVotesWithDisabledConfig(): void $this->search( [ 'first' => [ - null => [5], //no assignment to shop - 1 => [1], //shop = 1 1x vote with 1 point - 2 => [4], //shop = 2 1x vote with 4 point + null => [5], // no assignment to shop + 1 => [1], // shop = 1 1x vote with 1 point + 2 => [4], // shop = 2 1x vote with 4 point ], 'second' => [ null => [5], - 1 => [4], //shop = 1 1x vote with 4 points - 2 => [3], //shop = 2 1x vote with 2 points + 1 => [4], // shop = 1 1x vote with 4 points + 2 => [3], // shop = 2 1x vote with 2 points ], 'third' => [ - 1 => [4], //shop = 1 1x vote with 4 points - 2 => [5], //shop = 2 1x vote with 2 points + 1 => [4], // shop = 1 1x vote with 4 points + 2 => [5], // shop = 2 1x vote with 2 points ], ], ['second', 'third'], diff --git a/tests/Functional/Bundle/SearchBundle/Facet/VoteAverageFacetTest.php b/tests/Functional/Bundle/SearchBundle/Facet/VoteAverageFacetTest.php index 069ef77ba9d..4e1a0491e6a 100644 --- a/tests/Functional/Bundle/SearchBundle/Facet/VoteAverageFacetTest.php +++ b/tests/Functional/Bundle/SearchBundle/Facet/VoteAverageFacetTest.php @@ -47,7 +47,7 @@ public function testVoteAverageFacet(): void $result = $this->search( [ 'first' => [ - 1 => [1, 2], //shop = 1 1x vote with 1 point 1x vote with 2 points + 1 => [1, 2], // shop = 1 1x vote with 1 point 1x vote with 2 points ], 'second' => [ 1 => [4, 5], @@ -83,7 +83,7 @@ public function testVoteFacetWithoutSubshopVotes(): void $result = $this->search( [ 'first' => [ - 1 => [1, 2], //shop = 1 1x vote with 1 point 1x vote with 2 points + 1 => [1, 2], // shop = 1 1x vote with 1 point 1x vote with 2 points ], ], ['first'], @@ -107,7 +107,7 @@ public function testVoteFacetWithSubshopVotes(): void $result = $this->search( [ 'first' => [ - 2 => [1, 2], //shop = 1 1x vote with 1 point 1x vote with 2 points + 2 => [1, 2], // shop = 1 1x vote with 1 point 1x vote with 2 points ], ], ['first'], @@ -129,8 +129,8 @@ public function testVoteFacetWithNotAssignedSubShop(): void $result = $this->search( [ 'first' => [ - null => [1, 2], //shop = 1 1x vote with 1 point 1x vote with 2 points - 1 => [1, 2], //shop = null 1x vote with 1 point 1x vote with 2 points + null => [1, 2], // shop = 1 1x vote with 1 point 1x vote with 2 points + 1 => [1, 2], // shop = null 1x vote with 1 point 1x vote with 2 points ], ], ['first'], diff --git a/tests/Functional/Bundle/StoreFrontBundle/Helper.php b/tests/Functional/Bundle/StoreFrontBundle/Helper.php index 33fc20d290b..c4d53657ddd 100644 --- a/tests/Functional/Bundle/StoreFrontBundle/Helper.php +++ b/tests/Functional/Bundle/StoreFrontBundle/Helper.php @@ -513,8 +513,8 @@ public function createCustomerGroup(array $data = []): CustomerGroup 'name' => 'Unit test', 'tax' => true, 'taxInput' => true, - 'mode' => false, //use discounts? - 'discount' => 0, //percentage discount + 'mode' => false, // use discounts? + 'discount' => 0, // percentage discount ], $data ); diff --git a/tests/Functional/Bundle/StoreFrontBundle/VoteTest.php b/tests/Functional/Bundle/StoreFrontBundle/VoteTest.php index 71cb5872c6d..92b20c16eac 100644 --- a/tests/Functional/Bundle/StoreFrontBundle/VoteTest.php +++ b/tests/Functional/Bundle/StoreFrontBundle/VoteTest.php @@ -92,10 +92,10 @@ public function testAverage(): void { $this->assertShopVotes( __FUNCTION__, - //generate 2x vote entries for shop "1" with points 1 and 5 + // generate 2x vote entries for shop "1" with points 1 and 5 [1 => [1, 5]], - //expects shop "1" has a count of 3 votes and an average of 6 + // expects shop "1" has a count of 3 votes and an average of 6 [1 => ['count' => 2, 'average' => 6]] ); } @@ -104,10 +104,10 @@ public function testSimpleShopVotes(): void { $this->assertShopVotes( __FUNCTION__, - //generate 3x vote entries for shop "1" with points 3,4,5 + // generate 3x vote entries for shop "1" with points 3,4,5 [1 => [3, 4, 5]], - //expects shop "1" has a count of 3 votes and an average of 8 (average*2) + // expects shop "1" has a count of 3 votes and an average of 8 (average*2) [1 => ['count' => 3, 'average' => 8, 'points' => [3 => 1, 4 => 1, 5 => 1]]] ); } @@ -116,10 +116,10 @@ public function testShopVotes(): void { $this->assertShopVotes( __FUNCTION__, - //generate 3x vote entries for shop "1" with points 3,4,5 + // generate 3x vote entries for shop "1" with points 3,4,5 [1 => [3, 4, 5], 2 => [4, 4, 4]], - //expects shop "1" has a count of 3 votes and an average of 8 (average*2) + // expects shop "1" has a count of 3 votes and an average of 8 (average*2) [ 1 => ['count' => 3, 'average' => 8, 'points' => [3 => 1, 4 => 1, 5 => 1]], 2 => ['count' => 3, 'average' => 8, 'points' => [4 => 3]], @@ -132,13 +132,13 @@ public function testLegacyVotes(): void { $this->assertShopVotes( __FUNCTION__, - //generate 3x vote entries for shop "null" with points 3,4,5 and shop "1" three times with 4 points + // generate 3x vote entries for shop "null" with points 3,4,5 and shop "1" three times with 4 points [ null => [3, 4, 5], 1 => [4, 4, 4], ], - //expects shop "1" has a count of 6 votes and an average of 8 (average*2) + // expects shop "1" has a count of 6 votes and an average of 8 (average*2) [ 1 => ['count' => 6, 'average' => 8, 'points' => [3 => 1, 4 => 4, 5 => 1]], 2 => ['count' => 3, 'average' => 8, 'points' => [3 => 1, 4 => 1, 5 => 1]], @@ -188,7 +188,7 @@ public function testDisabledConfig(): void */ private function assertShopVotes(string $number, array $points = [], array $expected = [], array $configs = []): void { - //switch config values + // switch config values $config = Shopware()->Container()->get(Shopware_Components_Config::class); $originals = []; foreach ($configs as $key => $value) { @@ -196,38 +196,38 @@ private function assertShopVotes(string $number, array $points = [], array $expe $config->offsetSet($key, $value); } - //generate simple product + // generate simple product $context = $this->getContext(); $data = $this->getProduct($number, $context); $product = $this->helper->createProduct($data); - //generate shop specified votes generated + // generate shop specified votes generated foreach ($points as $shopId => $shopPoints) { - //fix for shop id = null as array key + // fix for shop id = null as array key if (!\is_int($shopId)) { $shopId = null; } $this->helper->createVotes($product->getId(), $shopPoints, $shopId); } - //load product struct + // load product struct $factory = Shopware()->Container()->get('shopware_storefront.base_product_factory'); $product = $factory->createBaseProduct($number); static::assertInstanceOf(BaseProduct::class, $product); $service = Shopware()->Container()->get(VoteServiceInterface::class); - //iterate all expected shop votes/averages + // iterate all expected shop votes/averages foreach ($expected as $shopId => $data) { $context = $this->getContext($shopId); - //validate vote count of provided shop + // validate vote count of provided shop if (\array_key_exists('count', $data)) { $votes = $service->get($product, $context); static::assertIsArray($votes); static::assertCount($data['count'], $votes, sprintf('Vote count %s for shop %s of product %s not match', $data['count'], $shopId, $product->getNumber())); } - //validates provided average value of provided shop + // validates provided average value of provided shop if (\array_key_exists('average', $data)) { $average = $service->getAverage($product, $context); static::assertInstanceOf(VoteAverage::class, $average); @@ -250,7 +250,7 @@ private function assertShopVotes(string $number, array $points = [], array $expe } } - //reset config values + // reset config values foreach ($originals as $key => $value) { $config->offsetSet($key, $value); } diff --git a/tests/Functional/Components/Api/ArticleTest.php b/tests/Functional/Components/Api/ArticleTest.php index 51fdecc61d7..75b7d6fcb47 100644 --- a/tests/Functional/Components/Api/ArticleTest.php +++ b/tests/Functional/Components/Api/ArticleTest.php @@ -2213,15 +2213,15 @@ public function testCreateWithMultiplePropertiesAndNewGroup(): void $this->resource->delete($articleId); - //delete test values in s_filter_values + // delete test values in s_filter_values $sql = 'DELETE FROM `s_filter_values` WHERE `optionId` = ?'; Shopware()->Db()->query($sql, [$databaseValuesOptions[0]['id']]); - //delete test values in s_filter_relations + // delete test values in s_filter_relations $sql = 'DELETE FROM `s_filter_relations` WHERE `optionId` = ?'; Shopware()->Db()->query($sql, [$databaseValuesOptions[0]['id']]); - //delete test values in s_filter_options + // delete test values in s_filter_options $builder->delete(\Shopware\Models\Property\Option::class, 'option')->andWhere( 'option.name = :optionName' )->setParameter('optionName', $optionName)->getQuery()->execute(); @@ -2334,15 +2334,15 @@ public function testUpdateWithMultiplePropertiesAndNewGroup(): void $this->resource->delete($articleId); - //delete test values in s_filter_values + // delete test values in s_filter_values $sql = 'DELETE FROM `s_filter_values` WHERE `optionId` = ?'; Shopware()->Db()->query($sql, [$databaseValuesOptions[0]['id']]); - //delete test values in s_filter_relations + // delete test values in s_filter_relations $sql = 'DELETE FROM `s_filter_relations` WHERE `optionId` = ?'; Shopware()->Db()->query($sql, [$databaseValuesOptions[0]['id']]); - //delete test values in s_filter_options + // delete test values in s_filter_options $builder->delete(\Shopware\Models\Property\Option::class, 'option')->andWhere( 'option.name = :optionName' )->setParameter('optionName', $optionName)->getQuery()->execute(); diff --git a/tests/Functional/Components/Api/CustomerTest.php b/tests/Functional/Components/Api/CustomerTest.php index 8fef00c79d3..814d44fdf57 100644 --- a/tests/Functional/Components/Api/CustomerTest.php +++ b/tests/Functional/Components/Api/CustomerTest.php @@ -198,7 +198,7 @@ public function testCreateShouldBeSuccessful(): int static::assertEquals($customer->getDefaultBillingAddress()->getAttribute()->getText1(), $testData['billing']['attribute']['text1']); static::assertEquals($customer->getDefaultShippingAddress()->getAttribute()->getText1(), $testData['shipping']['attribute']['text1']); - //test additional address lines + // test additional address lines static::assertEquals($customer->getDefaultShippingAddress()->getAdditionalAddressLine1(), $testData['shipping']['additionalAddressLine1']); static::assertEquals($customer->getDefaultShippingAddress()->getAdditionalAddressLine2(), $testData['shipping']['additionalAddressLine2']); static::assertEquals($customer->getDefaultBillingAddress()->getAdditionalAddressLine1(), $testData['billing']['additionalAddressLine1']); @@ -342,7 +342,7 @@ public function testUpdateShouldBeSuccessful(int $id): int static::assertInstanceOf(Address::class, $customer->getDefaultShippingAddress()); static::assertEquals($customer->getDefaultBillingAddress()->getFirstname(), $testData['billing']['firstname']); - //test additional fields + // test additional fields static::assertEquals($customer->getDefaultBillingAddress()->getAdditionalAddressLine1(), $testData['billing']['additionalAddressLine1']); static::assertEquals($customer->getDefaultBillingAddress()->getAdditionalAddressLine2(), $testData['billing']['additionalAddressLine2']); diff --git a/tests/Functional/Components/Api/MediaTest.php b/tests/Functional/Components/Api/MediaTest.php index 1364342e98a..ed506f37d03 100644 --- a/tests/Functional/Components/Api/MediaTest.php +++ b/tests/Functional/Components/Api/MediaTest.php @@ -48,7 +48,7 @@ public function testUploadName(): void $source = __DIR__ . '/fixtures/test-bild.jpg'; $dest = __DIR__ . '/fixtures/test-bild-used.jpg'; - //copy image to execute test case multiple times. + // copy image to execute test case multiple times. @unlink($dest); copy($source, $dest); @@ -62,7 +62,7 @@ public function testUploadName(): void $this->resource->create($data); static::assertTrue($mediaService->has($path)); - //check if the thumbnails are generated + // check if the thumbnails are generated $path = Shopware()->DocPath('media_image_thumbnail') . 'test-bild-used_140x140.jpg'; static::assertTrue($mediaService->has($path)); @@ -75,7 +75,7 @@ public function testUploadNameWithOver50Characters(): void $source = __DIR__ . '/fixtures/test-bild.jpg'; $dest = __DIR__ . '/fixtures/test-bild-with-more-than-50-characaters-more-more-more-more-used.jpg'; - //copy image to execute test case multiple times. + // copy image to execute test case multiple times. @unlink($dest); copy($source, $dest); @@ -86,7 +86,7 @@ public function testUploadNameWithOver50Characters(): void $mediaService = Shopware()->Container()->get(MediaServiceInterface::class); static::assertTrue($mediaService->has($pathPicture)); - //check if the thumbnails are generated + // check if the thumbnails are generated $path = Shopware()->DocPath('media_image_thumbnail') . $media->getName() . '_140x140.jpg'; static::assertTrue($mediaService->has($path)); @@ -134,7 +134,7 @@ public function testReplaceMedia(): void $source = __DIR__ . '/fixtures/test-bild.jpg'; $dest = __DIR__ . '/fixtures/test-bild-used.jpg'; - //copy image to execute test case multiple times. + // copy image to execute test case multiple times. @unlink($dest); copy($source, $dest); @@ -149,7 +149,7 @@ public function testReplaceMedia(): void $media = $this->resource->create($data); - //check if the thumbnails are generated + // check if the thumbnails are generated $this->resource->update($media->getId(), $updateData); $mediaPath = $mediaService->read($readPath); @@ -168,7 +168,7 @@ public function testUploadMediaWithNonWhitelistedExtension(): void $source = __DIR__ . '/fixtures/test-bild.jpg'; $dest = __DIR__ . '/fixtures/test-bild-used.foo'; - //copy image to execute test case multiple times. + // copy image to execute test case multiple times. @unlink($dest); copy($source, $dest); diff --git a/tests/Functional/Components/Api/TranslationTest.php b/tests/Functional/Components/Api/TranslationTest.php index e657bd692cc..2d17107419b 100644 --- a/tests/Functional/Components/Api/TranslationTest.php +++ b/tests/Functional/Components/Api/TranslationTest.php @@ -178,7 +178,7 @@ public function testCreateArticleByNumber(): int public function testCreateVariantTranslationByNumber(): void { $data = $this->getDummyData('variant'); - //Artikel mit Standardkonfigurator rot / 39 + // Artikel mit Standardkonfigurator rot / 39 $article = Shopware()->Db()->fetchRow("SELECT id, ordernumber, articleID FROM s_articles_details WHERE ordernumber = 'SW10201.11'"); $data['key'] = $article['ordernumber']; diff --git a/tests/Functional/Components/Cart/PaymentTokenServiceTest.php b/tests/Functional/Components/Cart/PaymentTokenServiceTest.php index 2daaf8dcd92..582269fd120 100644 --- a/tests/Functional/Components/Cart/PaymentTokenServiceTest.php +++ b/tests/Functional/Components/Cart/PaymentTokenServiceTest.php @@ -72,7 +72,7 @@ public function testPaymentTokenValidRequest(): void static::assertArrayHasKey($key, $cookies); static::assertNotNull($this->Response()->getHeader('Location')); - static::assertEquals(ini_get('session.cookie_path'), $cookies[$key]['path']); + static::assertEquals(\ini_get('session.cookie_path'), $cookies[$key]['path']); $request = Shopware()->Front()->Request(); static::assertNotNull($request); @@ -138,7 +138,7 @@ public function testPaymentTokenPath(string $virtualUrl, string $path): void $cookies = $this->Response()->getCookies(); static::assertArrayHasKey($key, $cookies); static::assertNotNull($this->Response()->getHeader('Location')); - static::assertEquals(ini_get('session.cookie_path'), $cookies[$key]['path']); + static::assertEquals(\ini_get('session.cookie_path'), $cookies[$key]['path']); Shopware()->Shop()->setBaseUrl($currentUrl); Shopware()->Shop()->setBasePath($currentPath); diff --git a/tests/Functional/Components/Theme/InstallerTest.php b/tests/Functional/Components/Theme/InstallerTest.php index cace2a13915..286cb7c7fdd 100644 --- a/tests/Functional/Components/Theme/InstallerTest.php +++ b/tests/Functional/Components/Theme/InstallerTest.php @@ -64,7 +64,7 @@ public function testSynchronizeThemeDirectory() $this->getSnippetHandler(), Shopware()->Container()->get(\Shopware\Components\Theme\Service::class), ); - //creates a directory iterator for the default theme directory (engine/Shopware/Themes) + // creates a directory iterator for the default theme directory (engine/Shopware/Themes) $directories = new DirectoryIterator( __DIR__ . '/Themes/' ); diff --git a/tests/Functional/Controllers/Backend/ArticleTest.php b/tests/Functional/Controllers/Backend/ArticleTest.php index 208d74524d8..e0c03132294 100644 --- a/tests/Functional/Controllers/Backend/ArticleTest.php +++ b/tests/Functional/Controllers/Backend/ArticleTest.php @@ -198,7 +198,7 @@ public function testSaveNetRegulationPrice(): void $regulationPrice = $this->getContainer()->get(Connection::class)->fetchOne('SELECT regulation_price FROM s_articles_prices WHERE articleID = ' . $firstArticle['id']); - //(119 / 119) * 100 + // (119 / 119) * 100 static::assertEquals(100, (float) $regulationPrice); } } diff --git a/tests/Functional/Controllers/Backend/PartnerTest.php b/tests/Functional/Controllers/Backend/PartnerTest.php index 56f1ed66b64..13c1a1ebb84 100644 --- a/tests/Functional/Controllers/Backend/PartnerTest.php +++ b/tests/Functional/Controllers/Backend/PartnerTest.php @@ -94,7 +94,7 @@ public function setUp(): void */ public function testGetList(): void { - //delete old data + // delete old data $repositoryData = $this->repository->findBy(['company' => $this->dummyData['company']]); foreach ($repositoryData as $testDummy) { $this->manager->remove($testDummy); @@ -128,14 +128,14 @@ public function testGetList(): void public function testSavePartner(): int { $params = $this->dummyData; - //test new partner + // test new partner $this->Request()->setParams($params); $this->dispatch('backend/Partner/savePartner'); static::assertTrue($this->View()->getAssign('success')); static::assertCount(19, $this->View()->getAssign('data')); static::assertEquals('streetDummy', $this->View()->getAssign('data')['street']); - //test update partner + // test update partner $params['id'] = $this->View()->getAssign('data')['id']; $params['street'] = $this->updateStreet; $this->Request()->setParams($params); @@ -210,7 +210,7 @@ public function testValidateTrackingCode(int $id): int $body = $this->Response()->getBody(); static::assertEmpty($body); - //delete the new dummy + // delete the new dummy $this->manager->remove($newDummy); $this->manager->flush(); diff --git a/tests/Functional/Controllers/Backend/UserManagerTest.php b/tests/Functional/Controllers/Backend/UserManagerTest.php index c9cd7fbb531..ebe6c8a7926 100644 --- a/tests/Functional/Controllers/Backend/UserManagerTest.php +++ b/tests/Functional/Controllers/Backend/UserManagerTest.php @@ -99,14 +99,14 @@ public function testWrongAdminLogin(): void */ public function testCreateAdminUser(): void { - //Delete the user in case the username is duplicated + // Delete the user in case the username is duplicated $this->deleteUserByUsername($this->temporaryAdminUserData['username']); $this->Request()->setParams($this->temporaryAdminUserData); $this->dispatch('/backend/UserManager/updateUser'); - //Verify that the admin user creation was successful + // Verify that the admin user creation was successful static::assertTrue($this->View()->getAssign('success')); } @@ -396,7 +396,7 @@ private function getUserByUsername(string $username): array */ private function deleteUserByUsername(string $name): void { - //Delete the admin user if it exists before attempting to create it (else we will have a duplicate user error) + // Delete the admin user if it exists before attempting to create it (else we will have a duplicate user error) Shopware()->Container() ->get(Connection::class) ->executeQuery( diff --git a/tests/Functional/Controllers/Frontend/SearchTest.php b/tests/Functional/Controllers/Frontend/SearchTest.php index 00ca943e45d..585f549c723 100644 --- a/tests/Functional/Controllers/Frontend/SearchTest.php +++ b/tests/Functional/Controllers/Frontend/SearchTest.php @@ -74,7 +74,7 @@ public function testAjaxSearch() static::assertStringNotContainsStringIgnoringCase('an error has occured', $body); // Check for error-handler response as well, which would fake a HTTP 200 OK response static::assertStringNotContainsStringIgnoringCase('ein fehler ist aufgetreten', $body); - //search for an emoji, might not be displayed correctly in IDE + // search for an emoji, might not be displayed correctly in IDE $this->Response()->clearBody(); $this->dispatch('ajax_search?sSearch=👨‍🚒'); diff --git a/tests/Functional/Core/AdminTest.php b/tests/Functional/Core/AdminTest.php index 4c0334e5253..28771a31591 100644 --- a/tests/Functional/Core/AdminTest.php +++ b/tests/Functional/Core/AdminTest.php @@ -874,7 +874,7 @@ public function testsGetCountryList(): void Shopware()->Db()->insert('s_core_translations', $demoStateData); } - //Hack current context, so next test works + // Hack current context, so next test works $context = Shopware()->Container()->get('shopware_storefront.context_service')->getShopContext(); $context->getShop()->setIsDefault(false); diff --git a/tests/Functional/Core/BasketTest.php b/tests/Functional/Core/BasketTest.php index c0e302df036..f86f8d1b89c 100644 --- a/tests/Functional/Core/BasketTest.php +++ b/tests/Functional/Core/BasketTest.php @@ -566,18 +566,18 @@ public function testPremiumOrderNumberExport(): void $ordernumberExport = 'test' . random_int(1000, 9999); - //Insert a new Premium product that has a ordernumber_export different from the ordernumber + // Insert a new Premium product that has a ordernumber_export different from the ordernumber $this->connection->insert('s_addon_premiums', ['startprice' => 0, 'ordernumber' => 'SW10137', 'ordernumber_export' => $ordernumberExport, 'subshopID' => 0]); - //sInsertPremium gets the premium to add from the Request, therefore we do set it here + // sInsertPremium gets the premium to add from the Request, therefore we do set it here $front = $this->getContainer()->get('front'); static::assertInstanceOf(Enlight_Controller_Request_Request::class, $front->Request()); $front->Request()->setQuery('sAddPremium', 'SW10137'); - //add the premium item to the basket + // add the premium item to the basket $this->module->sInsertPremium(); - //check if the ordernumber_export from s_addon_premiums has been added to s_order_basket as ordernumber + // check if the ordernumber_export from s_addon_premiums has been added to s_order_basket as ordernumber static::assertEquals( $ordernumberExport, $this->connection->fetchOne( diff --git a/tests/Functional/Core/sCategoriesTest.php b/tests/Functional/Core/sCategoriesTest.php index 5e6f1d08944..ed4e44374a8 100644 --- a/tests/Functional/Core/sCategoriesTest.php +++ b/tests/Functional/Core/sCategoriesTest.php @@ -74,7 +74,7 @@ public function testGetCategoriesWithSubcategory() */ public function testsGetCategoryIdByArticleId() { - //first category which assigned to the product 2 + // first category which assigned to the product 2 static::assertEquals(14, $this->module->sGetCategoryIdByArticleId(2)); // Check that searching in default category or with null is the same @@ -231,28 +231,28 @@ public function testsGetCategoryPath() */ public function testGetWholeCategoryTree() { - //set Category "Tees und Zubehör" to inactive so the childs should not be displayed + // set Category "Tees und Zubehör" to inactive so the childs should not be displayed $sql = "UPDATE `s_categories` SET `active` = '0' WHERE `id` =11"; Shopware()->Db()->exec($sql); $allCategories = $this->module->sGetWholeCategoryTree(3, 3); - //get "Genusswelten" this category should not have the inactive category "Tees and Zubehör" as subcategory + // get "Genusswelten" this category should not have the inactive category "Tees and Zubehör" as subcategory $category = $this->getCategoryById($allCategories, 5); static::assertIsArray($category); - //search for Tees und Zubehör + // search for Tees und Zubehör $result = $this->getCategoryById($category['sub'], 11); static::assertEmpty($result); - //if the parent category is inactive the child's should not be displayed - //category = "Genusswelten" the active child "Tees" and "Tees und Zubehör" should not be return because the father ist inactive + // if the parent category is inactive the child's should not be displayed + // category = "Genusswelten" the active child "Tees" and "Tees und Zubehör" should not be return because the father ist inactive $result = $this->getCategoryById($category['sub'], 12); static::assertEmpty($result); $result = $this->getCategoryById($category['sub'], 13); static::assertEmpty($result); - //set Category "Tees und Zubehör" to inactive so the childs should not be displayed + // set Category "Tees und Zubehör" to inactive so the childs should not be displayed $sql = "UPDATE `s_categories` SET `active` = '1' WHERE `id` = 11"; Shopware()->Db()->exec($sql); } diff --git a/tests/Functional/Helper/Utils.php b/tests/Functional/Helper/Utils.php index 8bdb8b4bb7e..4067071f0fd 100644 --- a/tests/Functional/Helper/Utils.php +++ b/tests/Functional/Helper/Utils.php @@ -41,7 +41,7 @@ public static function bindAndCall(Closure $fn, object $newThis) throw new RuntimeException('Could not create closure function'); } - return $func(); //faster + return $func(); // faster } /** diff --git a/tests/Functional/Models/Shop/ShopRepositoryTest.php b/tests/Functional/Models/Shop/ShopRepositoryTest.php index d7dad507479..a541356fd3b 100644 --- a/tests/Functional/Models/Shop/ShopRepositoryTest.php +++ b/tests/Functional/Models/Shop/ShopRepositoryTest.php @@ -103,22 +103,22 @@ public function testGetActiveByRequest(): void // Tests copied for SW-6768 $this->callGetActiveShopByRequest($this->mainShop['base_path'] . '/en', 'testShop3'); - //check virtual url with superfluous / like localhost/en/ + // check virtual url with superfluous / like localhost/en/ $this->callGetActiveShopByRequest($this->mainShop['base_path'] . '/en/', 'testShop3'); - //check virtual url with direct controller call like localhost/en/blog + // check virtual url with direct controller call like localhost/en/blog $this->callGetActiveShopByRequest($this->mainShop['base_path'] . '/en/blog', 'testShop3'); - //check base shop with direct controller call like localhost/en/blog + // check base shop with direct controller call like localhost/en/blog $this->callGetActiveShopByRequest($this->mainShop['base_path'] . '/blog', $this->mainShop['name']); - //check without virtual url but an url with the same beginning like localhost/entsorgung + // check without virtual url but an url with the same beginning like localhost/entsorgung $this->callGetActiveShopByRequest($this->mainShop['base_path'] . '/entsorgung', $this->mainShop['name']); - //check different virtual url with like localhost/ente + // check different virtual url with like localhost/ente $this->callGetActiveShopByRequest($this->mainShop['base_path'] . '/en/uk', 'testShop2'); - //check without virtual url it has to choose the main shop instead of the language shop without the virtual url + // check without virtual url it has to choose the main shop instead of the language shop without the virtual url $this->callGetActiveShopByRequest($this->mainShop['base_path'], $this->mainShop['name']); // These are just some basic urls diff --git a/tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php b/tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php index 273baa61cf2..4ec288d8803 100644 --- a/tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php +++ b/tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php @@ -126,7 +126,7 @@ public function testSimilarCronJobRefresh() $cron = $this->Db()->fetchRow("SELECT * FROM s_crontab WHERE action = 'RefreshSimilarShown'"); static::assertNotEmpty($cron); - //the cron plugin isn't installed, so we can't use a dispatch on /backend/cron + // the cron plugin isn't installed, so we can't use a dispatch on /backend/cron $this->Plugin()->refreshSimilarShown(new Enlight_Event_EventArgs(['subject' => $this])); $articles = $this->getAllSimilarShown(" WHERE init_date > '2010-01-01' "); diff --git a/tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php b/tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php index 827ec279e6f..c8bec418f3f 100644 --- a/tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php +++ b/tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php @@ -48,27 +48,27 @@ public function testInitTopSeller() public function testUpdateElapsedTopSeller() { - //init top seller to be sure that all articles has a row + // init top seller to be sure that all articles has a row $this->resetTopSeller(); $this->TopSeller()->initTopSeller(); $this->Db()->query("UPDATE s_articles_top_seller_ro SET last_cleared = '2010-01-01'"); - //check if the update script was successfully + // check if the update script was successfully $topSeller = $this->getAllTopSeller(" WHERE last_cleared > '2010-01-01' "); static::assertCount(0, $topSeller); - //update only 50 top seller articles to test the limit function + // update only 50 top seller articles to test the limit function $this->TopSeller()->updateElapsedTopSeller(50); - //check if only 50 top seller was updated. + // check if only 50 top seller was updated. $topSeller = $this->getAllTopSeller(" WHERE last_cleared > '2010-01-01' "); static::assertCount( 50, $topSeller ); - //now we can update the all other top seller data + // now we can update the all other top seller data $this->TopSeller()->updateElapsedTopSeller(); static::assertCount( \count($this->getAllTopSeller()), @@ -149,7 +149,7 @@ public function testTopSellerCronJobRefresh() $cron = $this->Db()->fetchRow("SELECT * FROM s_crontab WHERE action = 'RefreshTopSeller'"); static::assertNotEmpty($cron); - //the cron plugin isn't installed, so we can't use a dispatch on /backend/cron + // the cron plugin isn't installed, so we can't use a dispatch on /backend/cron $this->Plugin()->refreshTopSeller(); $topSeller = $this->getAllTopSeller(" WHERE last_cleared > '2010-01-01' "); @@ -175,7 +175,7 @@ public function testTopSellerManualRefresh() $topSeller = $this->getAllTopSeller(" WHERE last_cleared > '2010-01-01' "); static::assertCount(0, $topSeller); - //the cron plugin isn't installed, so we can't use a dispatch on /backend/cron + // the cron plugin isn't installed, so we can't use a dispatch on /backend/cron $this->Plugin()->refreshTopSeller(); $topSeller = $this->getAllTopSeller(" WHERE last_cleared > '2010-01-01' "); diff --git a/tests/Functional/Plugins/Core/MarketingAggregate/Modules/ArticleTest.php b/tests/Functional/Plugins/Core/MarketingAggregate/Modules/ArticleTest.php index abc1feb1338..8389eca0eae 100644 --- a/tests/Functional/Plugins/Core/MarketingAggregate/Modules/ArticleTest.php +++ b/tests/Functional/Plugins/Core/MarketingAggregate/Modules/ArticleTest.php @@ -62,8 +62,8 @@ public function testTopSellerSelection(): void $topSeller = array_values($topSeller); - //the article "2" pseudo sales are set to 1000 so we expect that this will be the first article - //in the top seller slider. + // the article "2" pseudo sales are set to 1000 so we expect that this will be the first article + // in the top seller slider. static::assertEquals(4, $topSeller[0]['articleID']); static::assertEquals(3, $topSeller[1]['articleID']); diff --git a/tests/Functional/Plugins/Core/PaymentMethods/Components/SepaPaymentMethodTest.php b/tests/Functional/Plugins/Core/PaymentMethods/Components/SepaPaymentMethodTest.php index 889b5f0aa09..14cec5f311b 100644 --- a/tests/Functional/Plugins/Core/PaymentMethods/Components/SepaPaymentMethodTest.php +++ b/tests/Functional/Plugins/Core/PaymentMethods/Components/SepaPaymentMethodTest.php @@ -53,7 +53,7 @@ public static function setUpBeforeClass(): void $pluginDir . '/Components/' ); - //SEPA needs to be active for this. Also, we need to save existing status to later restore it + // SEPA needs to be active for this. Also, we need to save existing status to later restore it $sepaPaymentMean = Shopware()->Models()->getRepository(Payment::class)->findOneBy(['name' => 'Sepa']); static::assertNotNull($sepaPaymentMean); @@ -147,7 +147,7 @@ public function testCreatePaymentInstanceWithNoPaymentData(): void $paymentId = 6; Shopware()->Session()->set('sUserId', $userId); - //for now, don't test email + // for now, don't test email Shopware()->Config()->offsetSet('sepaSendEmail', false); self::$sepaPaymentMethod->createPaymentInstance($orderId, $userId, $paymentId); @@ -218,7 +218,7 @@ public function testCreatePaymentInstance(): void $paymentId = 6; Shopware()->Session()->set('sUserId', $userId); - //for now, don't test email + // for now, don't test email Shopware()->Config()->offsetSet('sepaSendEmail', false); self::$sepaPaymentMethod->createPaymentInstance($orderId, $userId, $paymentId); diff --git a/tests/Mink/features/bootstrap/Element/BlogArticle.php b/tests/Mink/features/bootstrap/Element/BlogArticle.php index c9c581a1ff3..e624e9b35cc 100644 --- a/tests/Mink/features/bootstrap/Element/BlogArticle.php +++ b/tests/Mink/features/bootstrap/Element/BlogArticle.php @@ -161,11 +161,11 @@ protected function getUniqueTitle(array $titles) $title = array_unique($titles); switch (\count($title)) { - //normal case + // normal case case 1: return current($title); - //if blog article name is too long, it will be cut. So it's different from the other and has to be checked separately + // if blog article name is too long, it will be cut. So it's different from the other and has to be checked separately case 2: $check = [$title]; $result = Helper::checkArray($check); diff --git a/tests/Mink/features/bootstrap/Element/CartPosition.php b/tests/Mink/features/bootstrap/Element/CartPosition.php index d08d66d1366..c4cd326a370 100644 --- a/tests/Mink/features/bootstrap/Element/CartPosition.php +++ b/tests/Mink/features/bootstrap/Element/CartPosition.php @@ -129,11 +129,11 @@ protected function getUniqueName(array $names) $name = array_unique($names); switch (\count($name)) { - //normal case + // normal case case 1: return current($name); - //if articleName is too long, it will be cut. So it's different from the other and has to be checked separately + // if articleName is too long, it will be cut. So it's different from the other and has to be checked separately case 2: $check = [$name]; $result = Helper::checkArray($check); diff --git a/tests/Mink/features/bootstrap/Element/Paging.php b/tests/Mink/features/bootstrap/Element/Paging.php index 668df7c20e5..4fe29411917 100644 --- a/tests/Mink/features/bootstrap/Element/Paging.php +++ b/tests/Mink/features/bootstrap/Element/Paging.php @@ -108,9 +108,9 @@ public function moveToPage($page) */ public function noElement($locator, $throwException = true) { - if (Helper::getRequiredSelector($this, $locator)) { //previous or next + if (Helper::getRequiredSelector($this, $locator)) { // previous or next $result = Helper::countElements($this, $locator); - } else { //page number (1, 2, 3, 4, ...) + } else { // page number (1, 2, 3, 4, ...) $result = !$this->hasLink($locator); } diff --git a/tests/Mink/features/bootstrap/FeatureContext.php b/tests/Mink/features/bootstrap/FeatureContext.php index 5ca092a6677..0454a83059b 100644 --- a/tests/Mink/features/bootstrap/FeatureContext.php +++ b/tests/Mink/features/bootstrap/FeatureContext.php @@ -175,7 +175,7 @@ public function saveScreenshot(?string $filename = null, ?string $filepath = nul // Under Cygwin, uniqid with more_entropy must be set to true. // No effect in other environments. $filename = $filename ?: sprintf('%s_%s_%s.%s', $this->getMinkParameter('browser_name'), date('c'), uniqid('', true), 'png'); - $filepath = $filepath ?: (ini_get('upload_tmp_dir') ?: sys_get_temp_dir()); + $filepath = $filepath ?: (\ini_get('upload_tmp_dir') ?: sys_get_temp_dir()); file_put_contents($filepath . '/' . $filename, $this->getSession()->getScreenshot()); } @@ -316,12 +316,12 @@ private function prepare(): void $em = $this->getService(ModelManager::class); $em->generateAttributeModels(); - //refresh s_core_templates + // refresh s_core_templates $this->registerErrorHandler(); $this->getService(Installer::class)->synchronize(); restore_error_handler(); - //get the template id + // get the template id $sql = sprintf( 'SELECT id FROM `s_core_templates` WHERE template = "%s"', self::$suite->getSetting('template') @@ -332,7 +332,7 @@ private function prepare(): void throw new RuntimeException(sprintf('Unable to find template by name %s', self::$suite->getSetting('template'))); } - //set the template for shop "Deutsch" and activate SEPA payment method + // set the template for shop "Deutsch" and activate SEPA payment method $sql = <<<"EOD" UPDATE `s_core_shops` SET `template_id`= $templateId WHERE `id` = 1; UPDATE `s_core_paymentmeans` SET `active`= 1; diff --git a/tests/Mink/features/bootstrap/Helper.php b/tests/Mink/features/bootstrap/Helper.php index 44e8288fd11..dc69b0516be 100644 --- a/tests/Mink/features/bootstrap/Helper.php +++ b/tests/Mink/features/bootstrap/Helper.php @@ -631,21 +631,21 @@ public static function fillForm(HelperSelectorInterface $parent, $formKey, $valu return false; } - //Select + // Select if (empty($fieldType)) { $field->selectOption($fieldValue); return true; } - //Checkbox + // Checkbox if ($fieldType === 'checkbox') { $field->check(); return true; } - //Text + // Text $field->setValue($fieldValue); return true; diff --git a/tests/Mink/features/bootstrap/ShopwareContext.php b/tests/Mink/features/bootstrap/ShopwareContext.php index 247fa7ac056..0e2218a6dd5 100644 --- a/tests/Mink/features/bootstrap/ShopwareContext.php +++ b/tests/Mink/features/bootstrap/ShopwareContext.php @@ -178,19 +178,19 @@ public function iConfirmTheLinkInTheEmail($limit = 1) $link = substr($link, 0, $anchor); } - //Blogartikel-Bewertung + // Blogartikel-Bewertung if (empty($query)) { $mask = '%s/sConfirmation/%s'; } else { parse_str($query, $args); switch ($args['action']) { - //Artikel-Benachrichtigungen + // Artikel-Benachrichtigungen case 'notify': $mask = '%s&sNotificationConfirmation=%s&sNotify=1&action=notifyConfirm'; break; - //Artikel-Bewertungen + // Artikel-Bewertungen default: $mask = '%s&sConfirmation=%s'; break; diff --git a/tests/Unit/Components/Hook/HookManagerTest.php b/tests/Unit/Components/Hook/HookManagerTest.php index bf2a5c9a697..4fd40ae0e90 100644 --- a/tests/Unit/Components/Hook/HookManagerTest.php +++ b/tests/Unit/Components/Hook/HookManagerTest.php @@ -960,11 +960,11 @@ function (Enlight_Hook_HookArgs $args) use ($classArg, $methodArg, $contextArg, /** * Uncomment with 5.8 */ - //public function testFalseClassThrowsException() - //{ + // public function testFalseClassThrowsException() + // { // self::expectException(\Enlight_Hook_Exception::class); // $this->hookManager->getProxy(HookManagerTestNoTarget::class); - //} + // } /** * @param string $methodName diff --git a/tests/Unit/Components/HttpCache/StoreTest.php b/tests/Unit/Components/HttpCache/StoreTest.php index 7d0856eedbc..f26c9ae304b 100644 --- a/tests/Unit/Components/HttpCache/StoreTest.php +++ b/tests/Unit/Components/HttpCache/StoreTest.php @@ -36,7 +36,7 @@ public function setUp(): void 'test', [], true, - [ //Set of parameters that must be ignored in the url + [ // Set of parameters that must be ignored in the url 'foo', '_foo', '__foo', diff --git a/tests/Unit/Components/Plugin/XmlReader/XmlConfigReaderTest.php b/tests/Unit/Components/Plugin/XmlReader/XmlConfigReaderTest.php index 5e32df83cb8..5a7963130c1 100644 --- a/tests/Unit/Components/Plugin/XmlReader/XmlConfigReaderTest.php +++ b/tests/Unit/Components/Plugin/XmlReader/XmlConfigReaderTest.php @@ -46,7 +46,7 @@ public function testReadFile(): void { $result = $this->readFile('config.xml'); - //form label + // form label static::assertArrayHasKey('label', $result); static::assertCount(2, $result['label']); static::assertArrayHasKey('en', $result['label']); @@ -54,7 +54,7 @@ public function testReadFile(): void static::assertEquals('My Form Label', $result['label']['en']); static::assertEquals('Meine Form', $result['label']['de']); - //form description + // form description static::assertArrayHasKey('description', $result); static::assertCount(2, $result['description']); static::assertArrayHasKey('en', $result['description']); @@ -62,10 +62,10 @@ public function testReadFile(): void static::assertEquals('My Form description', $result['description']['en']); static::assertEquals('Meine Form Beschreibung', $result['description']['de']); - //elements + // elements static::assertArrayHasKey('elements', $result); - //first element + // first element $element1 = $result['elements'][0]; static::assertArrayHasKey('options', $element1); @@ -75,10 +75,10 @@ public function testReadFile(): void static::assertEquals('1', $element1['options']['minValue']); static::assertEquals('2', $element1['options']['maxValue']); - //second element store + // second element store $element2 = $result['elements'][1]; - //element label + // element label static::assertArrayHasKey('label', $element2); static::assertCount(2, $element2['label']); static::assertArrayHasKey('en', $element2['label']); @@ -86,7 +86,7 @@ public function testReadFile(): void static::assertEquals('My Textfield', $element2['label']['en']); static::assertEquals('Mein textfeld', $element2['label']['de']); - //element description + // element description static::assertArrayHasKey('description', $element2); static::assertCount(2, $element2['description']); static::assertArrayHasKey('en', $element2['description']); @@ -143,19 +143,19 @@ public function testParseElementNodeListEmpty(): void public function testValidateAttributeScope(): void { - //default value SCOPE_LOCALE + // default value SCOPE_LOCALE static::assertEquals( XmlReaderBase::SCOPE_LOCALE, XmlConfigReader::validateAttributeScope('') ); - //SCOPE_LOCALE + // SCOPE_LOCALE static::assertEquals( XmlReaderBase::SCOPE_LOCALE, XmlConfigReader::validateAttributeScope('locale') ); - //SCOPE_SHOP + // SCOPE_SHOP static::assertEquals( XmlReaderBase::SCOPE_SHOP, XmlConfigReader::validateAttributeScope('shop') diff --git a/tests/Unit/Components/Plugin/XmlReader/XmlReaderBaseTest.php b/tests/Unit/Components/Plugin/XmlReader/XmlReaderBaseTest.php index 3fe79433afe..18ddc634b2f 100644 --- a/tests/Unit/Components/Plugin/XmlReader/XmlReaderBaseTest.php +++ b/tests/Unit/Components/Plugin/XmlReader/XmlReaderBaseTest.php @@ -131,7 +131,7 @@ public function testGetFirstItemOfNodeList(): void public function testValidateBooleanAttribute(): void { - //required="true" + // required="true" $element1 = $this->xpath->query('//config/elements/element'); static::assertInstanceOf(DOMNodeList::class, $element1); $element1 = $element1->item(0); @@ -143,7 +143,7 @@ public function testValidateBooleanAttribute(): void static::assertIsBool($element1Result); static::assertTrue($element1Result); - //required not given - passed default value + // required not given - passed default value $element2 = $this->xpath->query('//config/elements/element'); static::assertInstanceOf(DOMNodeList::class, $element2); $element2 = $element2->item(1); @@ -158,7 +158,7 @@ public function testValidateBooleanAttribute(): void public function testParseStoreNodeList(): void { - //ExtJs Store + // ExtJs Store $store1 = $this->xpath->query('//config/elements/element[3]/store'); static::assertInstanceOf(DOMNodeList::class, $store1); $store1Result = XmlReaderBase::parseStoreNodeList($store1); @@ -166,7 +166,7 @@ public function testParseStoreNodeList(): void static::assertIsString($store1Result); static::assertEquals('EXTJS-STORE', $store1Result); - //Xml Store + // Xml Store $store2 = $this->xpath->query('//config/elements/element[4]/store'); static::assertInstanceOf(DOMNodeList::class, $store2); $store2Result = XmlReaderBase::parseStoreNodeList($store2); @@ -176,7 +176,7 @@ public function testParseStoreNodeList(): void static::assertEquals('value2', $store2Result[1][0]); static::assertEquals('label2', $store2Result[1][1]['en']); - //No store found + // No store found $store3 = $this->xpath->query('//config/elements/element[5]/store'); static::assertInstanceOf(DOMNodeList::class, $store3); $store3Result = XmlReaderBase::parseStoreNodeList($store3); @@ -200,7 +200,7 @@ public function testParseOptionsNodeList(): void public function testParseOptionsNodeListNoOptions(): void { - //cannot test with file because of the xsd validation + // cannot test with file because of the xsd validation $dom = new DOMDocument(); $dom->loadXML(''); @@ -212,7 +212,7 @@ public function testParseOptionsNodeListNoOptions(): void public function testParseOptionsNodeListEmptyOptions(): void { - //cannot test with file because of the xsd validation + // cannot test with file because of the xsd validation $dom = new DOMDocument(); $dom->loadXML(''); diff --git a/vendor-bin/cs-fixer/composer.json b/vendor-bin/cs-fixer/composer.json index 65b33fecad7..c5f01a8b9cf 100644 --- a/vendor-bin/cs-fixer/composer.json +++ b/vendor-bin/cs-fixer/composer.json @@ -1,7 +1,7 @@ { "require-dev": { - "friendsofphp/php-cs-fixer": "3.5.0", - "kubawerlos/php-cs-fixer-custom-fixers": "3.6.3" + "friendsofphp/php-cs-fixer": "3.8.0", + "kubawerlos/php-cs-fixer-custom-fixers": "3.11.0" }, "sort-packages": true } diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock index 00469c9c625..1a4b27034fc 100644 --- a/vendor-bin/cs-fixer/composer.lock +++ b/vendor-bin/cs-fixer/composer.lock @@ -4,35 +4,35 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1cccc6de4c31c5406389f2d8b56ee452", + "content-hash": "c73d2aa36b6f28acfea62dd96ff45381", "packages": [], "packages-dev": [ { "name": "composer/pcre", - "version": "1.0.0", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2" + "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/3d322d715c43a1ac36c7fe215fa59336265500f2", - "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2", + "url": "https://api.github.com/repos/composer/pcre/zipball/e300eb6c535192decd27a85bc72a9290f0d6b3bd", + "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd", "shasum": "" }, "require": { - "php": "^5.3.2 || ^7.0 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^1", + "phpstan/phpstan": "^1.3", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^4.2 || ^5" + "symfony/phpunit-bridge": "^5" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.x-dev" + "dev-main": "3.x-dev" } }, "autoload": { @@ -60,7 +60,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/1.0.0" + "source": "https://github.com/composer/pcre/tree/3.0.0" }, "funding": [ { @@ -76,27 +76,27 @@ "type": "tidelift" } ], - "time": "2021-12-06T15:17:27+00:00" + "time": "2022-02-25T20:21:48+00:00" }, { "name": "composer/semver", - "version": "3.2.7", + "version": "3.3.2", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "deac27056b57e46faf136fae7b449eeaa71661ee" + "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/deac27056b57e46faf136fae7b449eeaa71661ee", - "reference": "deac27056b57e46faf136fae7b449eeaa71661ee", + "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9", + "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9", "shasum": "" }, "require": { "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^0.12.54", + "phpstan/phpstan": "^1.4", "symfony/phpunit-bridge": "^4.2 || ^5" }, "type": "library", @@ -141,7 +141,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.2.7" + "source": "https://github.com/composer/semver/tree/3.3.2" }, "funding": [ { @@ -157,24 +157,24 @@ "type": "tidelift" } ], - "time": "2022-01-04T09:57:54+00:00" + "time": "2022-04-01T19:23:25+00:00" }, { "name": "composer/xdebug-handler", - "version": "3.0.1", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "12f1b79476638a5615ed00ea6adbb269cec96fd8" + "reference": "ced299686f41dce890debac69273b47ffe98a40c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/12f1b79476638a5615ed00ea6adbb269cec96fd8", - "reference": "12f1b79476638a5615ed00ea6adbb269cec96fd8", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", + "reference": "ced299686f41dce890debac69273b47ffe98a40c", "shasum": "" }, "require": { - "composer/pcre": "^1", + "composer/pcre": "^1 || ^2 || ^3", "php": "^7.2.5 || ^8.0", "psr/log": "^1 || ^2 || ^3" }, @@ -207,7 +207,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/3.0.1" + "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" }, "funding": [ { @@ -223,7 +223,7 @@ "type": "tidelift" } ], - "time": "2022-01-04T18:29:42+00:00" + "time": "2022-02-25T21:32:43+00:00" }, { "name": "doctrine/annotations", @@ -299,16 +299,16 @@ }, { "name": "doctrine/lexer", - "version": "1.2.2", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c" + "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c", - "reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229", + "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229", "shasum": "" }, "require": { @@ -316,7 +316,7 @@ }, "require-dev": { "doctrine/coding-standard": "^9.0", - "phpstan/phpstan": "1.3", + "phpstan/phpstan": "^1.3", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", "vimeo/psalm": "^4.11" }, @@ -355,7 +355,7 @@ ], "support": { "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/1.2.2" + "source": "https://github.com/doctrine/lexer/tree/1.2.3" }, "funding": [ { @@ -371,25 +371,25 @@ "type": "tidelift" } ], - "time": "2022-01-12T08:27:12+00:00" + "time": "2022-02-28T11:07:21+00:00" }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.5.0", + "version": "v3.8.0", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "333f15e07c866e33e2765e84ba1e0b88e6a3af3b" + "reference": "cbad1115aac4b5c3c5540e7210d3c9fba2f81fa3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/333f15e07c866e33e2765e84ba1e0b88e6a3af3b", - "reference": "333f15e07c866e33e2765e84ba1e0b88e6a3af3b", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/cbad1115aac4b5c3c5540e7210d3c9fba2f81fa3", + "reference": "cbad1115aac4b5c3c5540e7210d3c9fba2f81fa3", "shasum": "" }, "require": { "composer/semver": "^3.2", - "composer/xdebug-handler": "^3.0", + "composer/xdebug-handler": "^3.0.3", "doctrine/annotations": "^1.13", "ext-json": "*", "ext-tokenizer": "*", @@ -401,8 +401,8 @@ "symfony/finder": "^5.4 || ^6.0", "symfony/options-resolver": "^5.4 || ^6.0", "symfony/polyfill-mbstring": "^1.23", - "symfony/polyfill-php80": "^1.23", - "symfony/polyfill-php81": "^1.23", + "symfony/polyfill-php80": "^1.25", + "symfony/polyfill-php81": "^1.25", "symfony/process": "^5.4 || ^6.0", "symfony/stopwatch": "^5.4 || ^6.0" }, @@ -452,7 +452,7 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", - "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.5.0" + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.8.0" }, "funding": [ { @@ -460,31 +460,32 @@ "type": "github" } ], - "time": "2022-01-14T00:29:20+00:00" + "time": "2022-03-18T17:20:59+00:00" }, { "name": "kubawerlos/php-cs-fixer-custom-fixers", - "version": "v3.6.3", + "version": "v3.11.0", "source": { "type": "git", "url": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers.git", - "reference": "0d3367ac5f3576c18726ff5bb153fa2e9c1c67be" + "reference": "a1e78f0c1ffeb1addcef94c334c5e56e3c53dbe8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kubawerlos/php-cs-fixer-custom-fixers/zipball/0d3367ac5f3576c18726ff5bb153fa2e9c1c67be", - "reference": "0d3367ac5f3576c18726ff5bb153fa2e9c1c67be", + "url": "https://api.github.com/repos/kubawerlos/php-cs-fixer-custom-fixers/zipball/a1e78f0c1ffeb1addcef94c334c5e56e3c53dbe8", + "reference": "a1e78f0c1ffeb1addcef94c334c5e56e3c53dbe8", "shasum": "" }, "require": { "ext-filter": "*", "ext-tokenizer": "*", - "friendsofphp/php-cs-fixer": "^3.1.0", - "php": "^7.2 || ^8.0", - "symfony/finder": "^4.0 || ^5.0 || ^6.0" + "php": "^7.4 || ^8.0" + }, + "conflict": { + "friendsofphp/php-cs-fixer": "<3.6.0" }, "require-dev": { - "phpunit/phpunit": "^8.5.3 || ^9.1.1" + "phpunit/phpunit": "^9.5.20" }, "type": "library", "autoload": { @@ -505,9 +506,9 @@ "description": "A set of custom fixers for PHP CS Fixer", "support": { "issues": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/issues", - "source": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.6.3" + "source": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.11.0" }, - "time": "2022-01-16T18:56:13+00:00" + "time": "2022-05-19T16:59:35+00:00" }, { "name": "php-cs-fixer/diff", @@ -760,16 +761,16 @@ }, { "name": "symfony/console", - "version": "v5.4.2", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "a2c6b7ced2eb7799a35375fb9022519282b5405e" + "reference": "829d5d1bf60b2efeb0887b7436873becc71a45eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/a2c6b7ced2eb7799a35375fb9022519282b5405e", - "reference": "a2c6b7ced2eb7799a35375fb9022519282b5405e", + "url": "https://api.github.com/repos/symfony/console/zipball/829d5d1bf60b2efeb0887b7436873becc71a45eb", + "reference": "829d5d1bf60b2efeb0887b7436873becc71a45eb", "shasum": "" }, "require": { @@ -839,7 +840,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.2" + "source": "https://github.com/symfony/console/tree/v5.4.9" }, "funding": [ { @@ -855,20 +856,20 @@ "type": "tidelift" } ], - "time": "2021-12-20T16:11:12+00:00" + "time": "2022-05-18T06:17:34+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.0", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8" + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8", - "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", "shasum": "" }, "require": { @@ -906,7 +907,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.1" }, "funding": [ { @@ -922,20 +923,20 @@ "type": "tidelift" } ], - "time": "2021-07-12T14:48:14+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.4.0", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb" + "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/27d39ae126352b9fa3be5e196ccf4617897be3eb", - "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc", + "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc", "shasum": "" }, "require": { @@ -991,7 +992,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.0" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.9" }, "funding": [ { @@ -1007,20 +1008,20 @@ "type": "tidelift" } ], - "time": "2021-11-23T10:19:22+00:00" + "time": "2022-05-05T16:45:39+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v2.5.0", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a" + "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/66bea3b09be61613cd3b4043a65a8ec48cfa6d2a", - "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1", + "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1", "shasum": "" }, "require": { @@ -1070,7 +1071,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.1" }, "funding": [ { @@ -1086,20 +1087,20 @@ "type": "tidelift" } ], - "time": "2021-07-12T14:48:14+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/filesystem", - "version": "v5.4.0", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01" + "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/731f917dc31edcffec2c6a777f3698c33bea8f01", - "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/36a017fa4cce1eff1b8e8129ff53513abcef05ba", + "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba", "shasum": "" }, "require": { @@ -1134,7 +1135,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.0" + "source": "https://github.com/symfony/filesystem/tree/v5.4.9" }, "funding": [ { @@ -1150,20 +1151,20 @@ "type": "tidelift" } ], - "time": "2021-10-28T13:39:27+00:00" + "time": "2022-05-20T13:55:35+00:00" }, { "name": "symfony/finder", - "version": "v5.4.2", + "version": "v5.4.8", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "e77046c252be48c48a40816187ed527703c8f76c" + "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/e77046c252be48c48a40816187ed527703c8f76c", - "reference": "e77046c252be48c48a40816187ed527703c8f76c", + "url": "https://api.github.com/repos/symfony/finder/zipball/9b630f3427f3ebe7cd346c277a1408b00249dad9", + "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9", "shasum": "" }, "require": { @@ -1197,7 +1198,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.2" + "source": "https://github.com/symfony/finder/tree/v5.4.8" }, "funding": [ { @@ -1213,20 +1214,20 @@ "type": "tidelift" } ], - "time": "2021-12-15T11:06:13+00:00" + "time": "2022-04-15T08:07:45+00:00" }, { "name": "symfony/options-resolver", - "version": "v5.4.0", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "b0fb78576487af19c500aaddb269fd36701d4847" + "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/b0fb78576487af19c500aaddb269fd36701d4847", - "reference": "b0fb78576487af19c500aaddb269fd36701d4847", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/cc1147cb11af1b43f503ac18f31aa3bec213aba8", + "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8", "shasum": "" }, "require": { @@ -1266,7 +1267,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.4.0" + "source": "https://github.com/symfony/options-resolver/tree/v5.4.3" }, "funding": [ { @@ -1282,11 +1283,11 @@ "type": "tidelift" } ], - "time": "2021-11-23T10:19:22+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -1318,12 +1319,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1348,7 +1349,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0" }, "funding": [ { @@ -1368,7 +1369,7 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", @@ -1397,12 +1398,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1429,7 +1430,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.25.0" }, "funding": [ { @@ -1449,7 +1450,7 @@ }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -1478,12 +1479,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -1513,7 +1514,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0" }, "funding": [ { @@ -1533,7 +1534,7 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", @@ -1565,12 +1566,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1596,7 +1597,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0" }, "funding": [ { @@ -1616,7 +1617,7 @@ }, { "name": "symfony/polyfill-php73", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", @@ -1642,12 +1643,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -1675,7 +1676,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.25.0" }, "funding": [ { @@ -1695,16 +1696,16 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9" + "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9", - "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c", + "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c", "shasum": "" }, "require": { @@ -1721,12 +1722,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -1758,7 +1759,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0" }, "funding": [ { @@ -1774,11 +1775,11 @@ "type": "tidelift" } ], - "time": "2021-09-13T13:58:33+00:00" + "time": "2022-03-04T08:16:47+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", @@ -1804,12 +1805,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php81\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -1837,7 +1838,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.25.0" }, "funding": [ { @@ -1857,16 +1858,16 @@ }, { "name": "symfony/process", - "version": "v5.4.2", + "version": "v5.4.8", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "2b3ba8722c4aaf3e88011be5e7f48710088fb5e4" + "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/2b3ba8722c4aaf3e88011be5e7f48710088fb5e4", - "reference": "2b3ba8722c4aaf3e88011be5e7f48710088fb5e4", + "url": "https://api.github.com/repos/symfony/process/zipball/597f3fff8e3e91836bb0bd38f5718b56ddbde2f3", + "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3", "shasum": "" }, "require": { @@ -1899,7 +1900,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.2" + "source": "https://github.com/symfony/process/tree/v5.4.8" }, "funding": [ { @@ -1915,26 +1916,26 @@ "type": "tidelift" } ], - "time": "2021-12-27T21:01:00+00:00" + "time": "2022-04-08T05:07:18+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.5.0", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc" + "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", - "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c", + "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c", "shasum": "" }, "require": { "php": ">=7.2.5", "psr/container": "^1.1", - "symfony/deprecation-contracts": "^2.1" + "symfony/deprecation-contracts": "^2.1|^3" }, "conflict": { "ext-psr": "<1.1|>=2" @@ -1982,7 +1983,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.0" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.1" }, "funding": [ { @@ -1998,20 +1999,20 @@ "type": "tidelift" } ], - "time": "2021-11-04T16:48:04+00:00" + "time": "2022-03-13T20:07:29+00:00" }, { "name": "symfony/stopwatch", - "version": "v5.4.0", + "version": "v5.4.5", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "208ef96122bfed82a8f3a61458a07113a08bdcfe" + "reference": "4d04b5c24f3c9a1a168a131f6cbe297155bc0d30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/208ef96122bfed82a8f3a61458a07113a08bdcfe", - "reference": "208ef96122bfed82a8f3a61458a07113a08bdcfe", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/4d04b5c24f3c9a1a168a131f6cbe297155bc0d30", + "reference": "4d04b5c24f3c9a1a168a131f6cbe297155bc0d30", "shasum": "" }, "require": { @@ -2044,7 +2045,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.4.0" + "source": "https://github.com/symfony/stopwatch/tree/v5.4.5" }, "funding": [ { @@ -2060,20 +2061,20 @@ "type": "tidelift" } ], - "time": "2021-11-23T10:19:22+00:00" + "time": "2022-02-18T16:06:09+00:00" }, { "name": "symfony/string", - "version": "v5.4.2", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d" + "reference": "985e6a9703ef5ce32ba617c9c7d97873bb7b2a99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d", - "reference": "e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d", + "url": "https://api.github.com/repos/symfony/string/zipball/985e6a9703ef5ce32ba617c9c7d97873bb7b2a99", + "reference": "985e6a9703ef5ce32ba617c9c7d97873bb7b2a99", "shasum": "" }, "require": { @@ -2095,12 +2096,12 @@ }, "type": "library", "autoload": { - "psr-4": { - "Symfony\\Component\\String\\": "" - }, "files": [ "Resources/functions.php" ], + "psr-4": { + "Symfony\\Component\\String\\": "" + }, "exclude-from-classmap": [ "/Tests/" ] @@ -2130,7 +2131,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.2" + "source": "https://github.com/symfony/string/tree/v5.4.9" }, "funding": [ { @@ -2146,7 +2147,7 @@ "type": "tidelift" } ], - "time": "2021-12-16T21:52:00+00:00" + "time": "2022-04-19T10:40:37+00:00" } ], "aliases": [], @@ -2156,5 +2157,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } From 703158c64150bffc1f57a7554674025b3ba3f33f Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Tue, 31 May 2022 11:13:07 +0200 Subject: [PATCH 025/730] SW-26706 - Update PHPStan Doctrine plugin --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 938475ac43c..35cef882b6b 100644 --- a/composer.json +++ b/composer.json @@ -107,7 +107,7 @@ "phpspec/prophecy-phpunit": "^2.0", "phpstan/extension-installer": "1.1.0", "phpstan/phpstan": "1.7.1", - "phpstan/phpstan-doctrine": "1.3.5", + "phpstan/phpstan-doctrine": "1.3.6", "phpstan/phpstan-phpunit": "1.1.1", "phpstan/phpstan-symfony": "1.1.8", "phpunit/phpunit": "^9.4", diff --git a/composer.lock b/composer.lock index 153932ffe33..1fbaa931c4d 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": "0d0be9d9b3cca2bd56c8f51d9477e658", + "content-hash": "b710fe9bdbd36286988fbf1ddb550352", "packages": [ { "name": "aws/aws-crt-php", @@ -8227,16 +8227,16 @@ }, { "name": "phpstan/phpstan-doctrine", - "version": "1.3.5", + "version": "1.3.6", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-doctrine.git", - "reference": "73979203c9cb56efd2dfcce1c795254f3b55ce39" + "reference": "317e47b31bb92df5b344ed208dd358a6099c8507" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/73979203c9cb56efd2dfcce1c795254f3b55ce39", - "reference": "73979203c9cb56efd2dfcce1c795254f3b55ce39", + "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/317e47b31bb92df5b344ed208dd358a6099c8507", + "reference": "317e47b31bb92df5b344ed208dd358a6099c8507", "shasum": "" }, "require": { @@ -8289,9 +8289,9 @@ "description": "Doctrine extensions for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-doctrine/issues", - "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.5" + "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.6" }, - "time": "2022-05-23T13:09:30+00:00" + "time": "2022-05-27T18:47:50+00:00" }, { "name": "phpstan/phpstan-phpunit", From 73704364cfc7fc60f817453ddd10773691ff1424 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Tue, 31 May 2022 11:27:25 +0200 Subject: [PATCH 026/730] SW-26706 - Update PHPStan Symfony plugin --- .phpstan-baseline.neon | 20 ++++++++++++++++++++ composer.json | 2 +- composer.lock | 21 +++++++++------------ 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index a8f0456385c..fa4ae80f3b5 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -16810,6 +16810,21 @@ parameters: count: 1 path: engine/Shopware/Components/DependencyInjection/Bridge/Router.php + - + message: "#^Offset 'save_handler' on array\\{cookie_lifetime\\: int, cookie_httponly\\: int, gc_probability\\: int, gc_divisor\\: int, save_handler\\: string, use_trans_sid\\: int, locking\\: bool\\} in isset\\(\\) always exists and is not nullable\\.$#" + count: 1 + path: engine/Shopware/Components/DependencyInjection/Bridge/Session.php + + - + message: "#^Offset 'save_path' on array\\{cookie_lifetime\\: int, cookie_httponly\\: int, gc_probability\\: int, gc_divisor\\: int, save_handler\\?\\: string, use_trans_sid\\: int, name\\: non\\-empty\\-string, cookie_secure\\?\\: true, \\.\\.\\.\\} in isset\\(\\) does not exist\\.$#" + count: 1 + path: engine/Shopware/Components/DependencyInjection/Bridge/Session.php + + - + message: "#^Offset 'unitTestEnabled' on array\\{cookie_lifetime\\: int, cookie_httponly\\: int, gc_probability\\: int, gc_divisor\\: int, save_handler\\?\\: string, use_trans_sid\\: int, name\\: non\\-empty\\-string, cookie_secure\\?\\: true, \\.\\.\\.\\} in empty\\(\\) does not exist\\.$#" + count: 1 + path: engine/Shopware/Components/DependencyInjection/Bridge/Session.php + - message: "#^Parameter \\#2 \\$resource of method Shopware\\\\Components\\\\DependencyInjection\\\\Container\\:\\:set\\(\\) expects object\\|null, string given\\.$#" count: 1 @@ -38775,6 +38790,11 @@ parameters: count: 1 path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Validation.php + - + message: "#^Call to function array_key_exists\\(\\) with 'SwagSecurity' and array\\{ErrorHandler\\: string, Router\\: string, System\\: string, ViewportForward\\: string, Shop\\: string, PostFilter\\: string, ControllerBase\\: string, RouterRewrite\\: string, \\.\\.\\.\\} will always evaluate to false\\.$#" + count: 1 + path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Controllers/Backend/SwagUpdate.php + - message: "#^Cannot access property \\$version on ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Struct\\\\Version\\|null\\.$#" count: 2 diff --git a/composer.json b/composer.json index 35cef882b6b..f589fbbad0f 100644 --- a/composer.json +++ b/composer.json @@ -109,7 +109,7 @@ "phpstan/phpstan": "1.7.1", "phpstan/phpstan-doctrine": "1.3.6", "phpstan/phpstan-phpunit": "1.1.1", - "phpstan/phpstan-symfony": "1.1.8", + "phpstan/phpstan-symfony": "1.2.2", "phpunit/phpunit": "^9.4", "sensiolabs/behat-page-object-extension": "2.3.4", "symfony/browser-kit": "~4.4.27", diff --git a/composer.lock b/composer.lock index 1fbaa931c4d..8b132c5b808 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": "b710fe9bdbd36286988fbf1ddb550352", + "content-hash": "c268850de8501e4434ac49f9adefcfcd", "packages": [ { "name": "aws/aws-crt-php", @@ -8347,22 +8347,22 @@ }, { "name": "phpstan/phpstan-symfony", - "version": "1.1.8", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-symfony.git", - "reference": "4bdffcf1033b6c60662a28419d0192e0dda5684f" + "reference": "30f12aeab960c7f324eee3b39645655cf8a84146" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/4bdffcf1033b6c60662a28419d0192e0dda5684f", - "reference": "4bdffcf1033b6c60662a28419d0192e0dda5684f", + "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/30f12aeab960c7f324eee3b39645655cf8a84146", + "reference": "30f12aeab960c7f324eee3b39645655cf8a84146", "shasum": "" }, "require": { "ext-simplexml": "*", - "php": "^7.1 || ^8.0", - "phpstan/phpstan": "^1.4" + "php": "^7.2 || ^8.0", + "phpstan/phpstan": "^1.6" }, "conflict": { "symfony/framework-bundle": "<3.0" @@ -8386,9 +8386,6 @@ }, "type": "phpstan-extension", "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - }, "phpstan": { "includes": [ "extension.neon", @@ -8415,9 +8412,9 @@ "description": "Symfony Framework extensions and rules for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-symfony/issues", - "source": "https://github.com/phpstan/phpstan-symfony/tree/1.1.8" + "source": "https://github.com/phpstan/phpstan-symfony/tree/1.2.2" }, - "time": "2022-03-24T07:56:03+00:00" + "time": "2022-05-28T15:18:51+00:00" }, { "name": "phpunit/php-code-coverage", From f9e73cd9de8ddad0b1b6940675f91038ba716047 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Tue, 31 May 2022 11:28:02 +0200 Subject: [PATCH 027/730] SW-26706 - Add missing versions in UPGRADE-5.7.md file --- UPGRADE-5.7.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index ffb9903ecea..8d0f5199b06 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -2,9 +2,9 @@ This changelog references changes done in Shopware 5.7 patch versions. -## 5.7.10 +## 5.7.12 -[View all changes from v5.7.9...v5.7.10](https://github.com/shopware/shopware/compare/v5.7.9...v5.7.10) +[View all changes from v5.7.11...v5.7.12](https://github.com/shopware/shopware/compare/v5.7.11...v5.7.12) ### Deprecations @@ -50,6 +50,13 @@ This changelog references changes done in Shopware 5.7 patch versions. ### Removals +## 5.7.11 + +[View all changes from v5.7.10...v5.7.11](https://github.com/shopware/shopware/compare/v5.7.10...v5.7.11) + +## 5.7.10 + +[View all changes from v5.7.9...v5.7.10](https://github.com/shopware/shopware/compare/v5.7.9...v5.7.10) ## 5.7.9 From 0a813873066f3af25bac2e0c73690cf84646d78b Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 1 Jun 2022 08:02:56 +0200 Subject: [PATCH 028/730] SW-26706 - Update PHPStan --- .phpstan-baseline.neon | 9 +++++++-- composer.json | 2 +- composer.lock | 14 +++++++------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index fa4ae80f3b5..37dbd34e992 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -16810,18 +16810,23 @@ parameters: count: 1 path: engine/Shopware/Components/DependencyInjection/Bridge/Router.php + - + message: "#^Offset 'save_handler' on array\\{cookie_lifetime\\: int, cookie_httponly\\: int, gc_probability\\: int, gc_divisor\\: int, save_handler\\: string, use_trans_sid\\: int, locking\\: bool, name\\: non\\-empty\\-string, \\.\\.\\.\\} in isset\\(\\) always exists and is not nullable\\.$#" + count: 1 + path: engine/Shopware/Components/DependencyInjection/Bridge/Session.php + - message: "#^Offset 'save_handler' on array\\{cookie_lifetime\\: int, cookie_httponly\\: int, gc_probability\\: int, gc_divisor\\: int, save_handler\\: string, use_trans_sid\\: int, locking\\: bool\\} in isset\\(\\) always exists and is not nullable\\.$#" count: 1 path: engine/Shopware/Components/DependencyInjection/Bridge/Session.php - - message: "#^Offset 'save_path' on array\\{cookie_lifetime\\: int, cookie_httponly\\: int, gc_probability\\: int, gc_divisor\\: int, save_handler\\?\\: string, use_trans_sid\\: int, name\\: non\\-empty\\-string, cookie_secure\\?\\: true, \\.\\.\\.\\} in isset\\(\\) does not exist\\.$#" + message: "#^Offset 'save_path' on array\\{cookie_lifetime\\: int, cookie_httponly\\: int, gc_probability\\: int, gc_divisor\\: int, save_handler\\: string, use_trans_sid\\: int, locking\\: bool, name\\: non\\-empty\\-string, \\.\\.\\.\\} in isset\\(\\) does not exist\\.$#" count: 1 path: engine/Shopware/Components/DependencyInjection/Bridge/Session.php - - message: "#^Offset 'unitTestEnabled' on array\\{cookie_lifetime\\: int, cookie_httponly\\: int, gc_probability\\: int, gc_divisor\\: int, save_handler\\?\\: string, use_trans_sid\\: int, name\\: non\\-empty\\-string, cookie_secure\\?\\: true, \\.\\.\\.\\} in empty\\(\\) does not exist\\.$#" + message: "#^Offset 'unitTestEnabled' on array\\{cookie_lifetime\\: int, cookie_httponly\\: int, gc_probability\\: int, gc_divisor\\: int, save_handler\\: string, use_trans_sid\\: int, locking\\: bool, name\\: non\\-empty\\-string, \\.\\.\\.\\} in empty\\(\\) does not exist\\.$#" count: 1 path: engine/Shopware/Components/DependencyInjection/Bridge/Session.php diff --git a/composer.json b/composer.json index f589fbbad0f..cfaeff6a4f8 100644 --- a/composer.json +++ b/composer.json @@ -106,7 +106,7 @@ "php-parallel-lint/php-var-dump-check": "^0.5", "phpspec/prophecy-phpunit": "^2.0", "phpstan/extension-installer": "1.1.0", - "phpstan/phpstan": "1.7.1", + "phpstan/phpstan": "1.7.8", "phpstan/phpstan-doctrine": "1.3.6", "phpstan/phpstan-phpunit": "1.1.1", "phpstan/phpstan-symfony": "1.2.2", diff --git a/composer.lock b/composer.lock index 8b132c5b808..615fa0f1944 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": "c268850de8501e4434ac49f9adefcfcd", + "content-hash": "8e74f864ddd05175f34ddb1e6d3ab1fd", "packages": [ { "name": "aws/aws-crt-php", @@ -8168,16 +8168,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.7.1", + "version": "1.7.8", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "e3baed2ee2ef322e0f9b8fe8f87fdbe024c7c719" + "reference": "2bf3d43015d56abac4d002a4d2d6c3a7d6fa627a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e3baed2ee2ef322e0f9b8fe8f87fdbe024c7c719", - "reference": "e3baed2ee2ef322e0f9b8fe8f87fdbe024c7c719", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2bf3d43015d56abac4d002a4d2d6c3a7d6fa627a", + "reference": "2bf3d43015d56abac4d002a4d2d6c3a7d6fa627a", "shasum": "" }, "require": { @@ -8203,7 +8203,7 @@ "description": "PHPStan - PHP Static Analysis Tool", "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.7.1" + "source": "https://github.com/phpstan/phpstan/tree/1.7.8" }, "funding": [ { @@ -8223,7 +8223,7 @@ "type": "tidelift" } ], - "time": "2022-05-24T09:05:09+00:00" + "time": "2022-06-01T13:43:17+00:00" }, { "name": "phpstan/phpstan-doctrine", From b4870e674bae2819113296dd43e7635a6ce081fd Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 1 Jun 2022 15:59:54 +0200 Subject: [PATCH 029/730] SW-26706 - Activate bleeding edge features of PHPStan --- .phpstan-baseline.neon | 25 ------------------- .phpstan.neon | 6 ++++- .../Compiler/LegacyApiResourcesPass.php | 2 +- .../HttpCache/UrlProvider/FormProvider.php | 4 +-- .../Shopware/Controllers/Backend/Config.php | 8 ++---- .../features/bootstrap/Element/HeaderCart.php | 7 ------ tests/Mink/features/bootstrap/Helper.php | 6 +++-- .../Mink/features/bootstrap/Page/Listing.php | 2 +- 8 files changed, 15 insertions(+), 45 deletions(-) diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index 37dbd34e992..1f2abfeaf1c 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -46910,21 +46910,11 @@ parameters: count: 1 path: tests/Mink/features/bootstrap/Element/HeaderCart.php - - - message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\HeaderCart\\:\\:clickCart\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Mink/features/bootstrap/Element/HeaderCart.php - - message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\HeaderCart\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 path: tests/Mink/features/bootstrap/Element/HeaderCart.php - - - message: "#^Parameter \\#2 \\$keys of static method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:findElements\\(\\) expects array, string given\\.$#" - count: 1 - path: tests/Mink/features/bootstrap/Element/HeaderCart.php - - message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\HeaderCart\\:\\:\\$selector type has no value type specified in iterable type array\\.$#" count: 1 @@ -47370,11 +47360,6 @@ parameters: count: 1 path: tests/Mink/features/bootstrap/Helper.php - - - message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:findElements\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#" - count: 1 - path: tests/Mink/features/bootstrap/Helper.php - - message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:floatArray\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#" count: 1 @@ -47410,16 +47395,6 @@ parameters: count: 1 path: tests/Mink/features/bootstrap/Helper.php - - - message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:getRequiredSelectors\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#" - count: 1 - path: tests/Mink/features/bootstrap/Helper.php - - - - message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:getRequiredSelectors\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: tests/Mink/features/bootstrap/Helper.php - - message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:getUnique\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#" count: 1 diff --git a/.phpstan.neon b/.phpstan.neon index b3540c918ca..99987db73a7 100644 --- a/.phpstan.neon +++ b/.phpstan.neon @@ -1,5 +1,6 @@ includes: - - .phpstan-baseline.neon + - .phpstan-baseline.neon + - vendor/phpstan/phpstan/conf/bleedingEdge.neon services: - @@ -183,3 +184,6 @@ parameters: - # The doctrine extension has problems with detecting the select within an if condition. see https://github.com/phpstan/phpstan-doctrine/issues/331 message: '#Error: Expected Doctrine\\ORM\\Query\\Lexer::T_FROM, got end of string#' path: engine/Shopware/Components/Api/Resource/EmotionPreset.php + + # This is a bleeding edge feature and not working well since now. See https://github.com/phpstan/phpstan-doctrine/issues/332 + - '#Parameter .* of method Doctrine\\ORM\\.*::.*\(\) expects .*literal-string.* given#' diff --git a/engine/Shopware/Components/DependencyInjection/Compiler/LegacyApiResourcesPass.php b/engine/Shopware/Components/DependencyInjection/Compiler/LegacyApiResourcesPass.php index 3c0902873b9..1c8ecbb2873 100644 --- a/engine/Shopware/Components/DependencyInjection/Compiler/LegacyApiResourcesPass.php +++ b/engine/Shopware/Components/DependencyInjection/Compiler/LegacyApiResourcesPass.php @@ -31,7 +31,7 @@ /** * This class adds to all shopware.api services the tag shopware.api_resource * - * @depracted in 5.6 and will be removed with Shopware 5.8. Please use the tag `shopware.api_resource` instead. + * @deprecated in 5.6 and will be removed with Shopware 5.8. Please use the tag `shopware.api_resource` instead. */ class LegacyApiResourcesPass implements CompilerPassInterface { diff --git a/engine/Shopware/Components/HttpCache/UrlProvider/FormProvider.php b/engine/Shopware/Components/HttpCache/UrlProvider/FormProvider.php index 58e7efbae19..11ba3dc44b7 100644 --- a/engine/Shopware/Components/HttpCache/UrlProvider/FormProvider.php +++ b/engine/Shopware/Components/HttpCache/UrlProvider/FormProvider.php @@ -79,12 +79,12 @@ public function getUrls(Context $context, $limit = null, $offset = null): array } return $this->router->generateList( - array_filter(array_map( + array_map( function ($custom) { return ['sViewport' => 'forms', 'sFid' => $custom['id']]; }, $result - )), + ), $context ); } diff --git a/engine/Shopware/Controllers/Backend/Config.php b/engine/Shopware/Controllers/Backend/Config.php index 1b9736ee250..c7d7929e517 100644 --- a/engine/Shopware/Controllers/Backend/Config.php +++ b/engine/Shopware/Controllers/Backend/Config.php @@ -261,10 +261,7 @@ public function saveFormAction() */ public function getListAction() { - /** @var string $name */ - $name = $this->Request()->get('_repositoryClass'); - - /** @var QueryBuilder $builder */ + $name = (string) $this->Request()->get('_repositoryClass'); $builder = $this->getRepository($name)->createQueryBuilder($name); switch ($name) { @@ -458,8 +455,7 @@ public function getTableListAction() */ public function getValuesAction() { - $name = $this->Request()->get('_repositoryClass'); - /** @var QueryBuilder $builder */ + $name = (string) $this->Request()->get('_repositoryClass'); $builder = $this->getRepository($name)->createQueryBuilder($name); switch ($name) { diff --git a/tests/Mink/features/bootstrap/Element/HeaderCart.php b/tests/Mink/features/bootstrap/Element/HeaderCart.php index 873b84310fe..bf73251a1fc 100644 --- a/tests/Mink/features/bootstrap/Element/HeaderCart.php +++ b/tests/Mink/features/bootstrap/Element/HeaderCart.php @@ -89,11 +89,4 @@ public function checkCart($quantity, $amount) Helper::throwException($message); } } - - public function clickCart() - { - $element = Helper::findElements($this, 'link'); - - $element['link']->click(); - } } diff --git a/tests/Mink/features/bootstrap/Helper.php b/tests/Mink/features/bootstrap/Helper.php index dc69b0516be..10b8955fba2 100644 --- a/tests/Mink/features/bootstrap/Helper.php +++ b/tests/Mink/features/bootstrap/Helper.php @@ -223,11 +223,12 @@ public static function compareArrays($array1, $array2) * Finds elements by their selectors * * @param Page|Element|HelperSelectorInterface $parent + * @param array $keys * @param bool $throwExceptions * * @throws Exception|PendingException * - * @return Element[] + * @return array */ public static function findElements(HelperSelectorInterface $parent, array $keys, $throwExceptions = true) { @@ -307,12 +308,13 @@ public static function findAllOfElements(HelperSelectorInterface $parent, array * Returns the requested element css selectors * * @param Page|Element|HelperSelectorInterface $parent + * @param array $keys * @param bool $throwExceptions * * @throws Exception * @throws PendingException * - * @return array + * @return array */ public static function getRequiredSelectors(HelperSelectorInterface $parent, array $keys, $throwExceptions = true) { diff --git a/tests/Mink/features/bootstrap/Page/Listing.php b/tests/Mink/features/bootstrap/Page/Listing.php index 5b96efb46ba..247d2b901b7 100644 --- a/tests/Mink/features/bootstrap/Page/Listing.php +++ b/tests/Mink/features/bootstrap/Page/Listing.php @@ -154,7 +154,7 @@ public function filter(FilterGroup $filterGroups, array $properties) */ public function checkView($view) { - $elements = array_filter(Helper::findElements($this, ['viewTable', 'viewList'], false)); + $elements = Helper::findElements($this, ['viewTable', 'viewList'], false); if (key($elements) !== $view) { $message = sprintf('"%s" is active! (should be "%s")', key($elements), $view); From 86a8b33bd01243f3043ea4105d42dc20e5e984d0 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 2 Jun 2022 10:11:20 +0200 Subject: [PATCH 030/730] SW-26706 - Update PHPStan Doctrine plugin again --- composer.json | 2 +- composer.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index cfaeff6a4f8..9d187d1d780 100644 --- a/composer.json +++ b/composer.json @@ -107,7 +107,7 @@ "phpspec/prophecy-phpunit": "^2.0", "phpstan/extension-installer": "1.1.0", "phpstan/phpstan": "1.7.8", - "phpstan/phpstan-doctrine": "1.3.6", + "phpstan/phpstan-doctrine": "1.3.7", "phpstan/phpstan-phpunit": "1.1.1", "phpstan/phpstan-symfony": "1.2.2", "phpunit/phpunit": "^9.4", diff --git a/composer.lock b/composer.lock index 615fa0f1944..1b9d6faf4fa 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": "8e74f864ddd05175f34ddb1e6d3ab1fd", + "content-hash": "c247ccdda253d97c68ad3851acf5e190", "packages": [ { "name": "aws/aws-crt-php", @@ -8227,21 +8227,21 @@ }, { "name": "phpstan/phpstan-doctrine", - "version": "1.3.6", + "version": "1.3.7", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-doctrine.git", - "reference": "317e47b31bb92df5b344ed208dd358a6099c8507" + "reference": "85339d71b2dde4871d84bc369002fa1a3b460b07" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/317e47b31bb92df5b344ed208dd358a6099c8507", - "reference": "317e47b31bb92df5b344ed208dd358a6099c8507", + "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/85339d71b2dde4871d84bc369002fa1a3b460b07", + "reference": "85339d71b2dde4871d84bc369002fa1a3b460b07", "shasum": "" }, "require": { "php": "^7.2 || ^8.0", - "phpstan/phpstan": "^1.7.0" + "phpstan/phpstan": "^1.7.3" }, "conflict": { "doctrine/collections": "<1.0", @@ -8289,9 +8289,9 @@ "description": "Doctrine extensions for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-doctrine/issues", - "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.6" + "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.7" }, - "time": "2022-05-27T18:47:50+00:00" + "time": "2022-06-01T13:19:10+00:00" }, { "name": "phpstan/phpstan-phpunit", From 5b1bca60e9acdbd8978c1242ebd04a28761418e4 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 2 Jun 2022 15:23:41 +0200 Subject: [PATCH 031/730] SW-26686 - Update Symfony and indirect dependencies --- UPGRADE-5.7.md | 22 ++-- composer.lock | 334 +++++++++++++++++++++++++------------------------ 2 files changed, 181 insertions(+), 175 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 8d0f5199b06..b2e51fd9243 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -29,21 +29,21 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `mpdf/mpdf` to version 8.1.1 * Updated `phpunit/phpunit` to version 9.5.20 * Updated `symfony/browser-kit` to version 4.4.37 -* Updated `symfony/config` to version 4.4.41 -* Updated `symfony/console` to version 4.4.41 -* Updated `symfony/dependency-injection` to version 4.4.41 -* Updated `symfony/dom-crawler` to version 4.4.39 +* Updated `symfony/config` to version 4.4.42 +* Updated `symfony/console` to version 4.4.42 +* Updated `symfony/dependency-injection` to version 4.4.42 +* Updated `symfony/dom-crawler` to version 4.4.42 * Updated `symfony/expression-language` to version 4.4.41 -* Updated `symfony/filesystem` to version 4.4.39 +* Updated `symfony/filesystem` to version 4.4.42 * Updated `symfony/finder` to version 4.4.41 -* Updated `symfony/form` to version 4.4.41 -* Updated `symfony/http-foundation` to version 4.4.41 -* Updated `symfony/http-kernel` to version 4.4.41 +* Updated `symfony/form` to version 4.4.42 +* Updated `symfony/http-foundation` to version 4.4.42 +* Updated `symfony/http-kernel` to version 4.4.42 * Updated `symfony/options-resolver` to version 4.4.37 -* Updated `symfony/polyfill-php80` to version 1.25.0 -* Updated `symfony/polyfill-php81` to version 1.25.0 +* Updated `symfony/polyfill-php80` to version 1.26.0 +* Updated `symfony/polyfill-php81` to version 1.26.0 * Updated `symfony/process` to version 4.4.41 -* Updated `symfony/serializer` to version 5.4.8 +* Updated `symfony/serializer` to version 5.4.9 * Updated `symfony/validator` to version 4.4.41 * Updated `symfony/web-link` to version 4.4.37 * Updated several indirect dependencies diff --git a/composer.lock b/composer.lock index 1b9d6faf4fa..27dd4e3ebdc 100644 --- a/composer.lock +++ b/composer.lock @@ -58,16 +58,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.222.0", + "version": "3.224.2", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "0074bca70bf023f049532b177bf90d3a75e425cd" + "reference": "a2e6461261a92570128e6c2b6fb1896f3d16b424" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0074bca70bf023f049532b177bf90d3a75e425cd", - "reference": "0074bca70bf023f049532b177bf90d3a75e425cd", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a2e6461261a92570128e6c2b6fb1896f3d16b424", + "reference": "a2e6461261a92570128e6c2b6fb1896f3d16b424", "shasum": "" }, "require": { @@ -143,9 +143,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.222.0" + "source": "https://github.com/aws/aws-sdk-php/tree/3.224.2" }, - "time": "2022-04-27T18:36:42+00:00" + "time": "2022-06-01T18:17:06+00:00" }, { "name": "bcremer/line-reader", @@ -1689,23 +1689,28 @@ }, { "name": "firebase/php-jwt", - "version": "v6.1.2", + "version": "v6.2.0", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "c297139da7c6873dbd67cbd1093f09ec0bbd0c50" + "reference": "d28e6df83830252650da4623c78aaaf98fb385f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/c297139da7c6873dbd67cbd1093f09ec0bbd0c50", - "reference": "c297139da7c6873dbd67cbd1093f09ec0bbd0c50", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/d28e6df83830252650da4623c78aaaf98fb385f3", + "reference": "d28e6df83830252650da4623c78aaaf98fb385f3", "shasum": "" }, "require": { "php": "^7.1||^8.0" }, "require-dev": { - "phpunit/phpunit": "^7.5||9.5" + "guzzlehttp/guzzle": "^6.5||^7.4", + "phpspec/prophecy-phpunit": "^1.1", + "phpunit/phpunit": "^7.5||^9.5", + "psr/cache": "^1.0||^2.0", + "psr/http-client": "^1.0", + "psr/http-factory": "^1.0" }, "suggest": { "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present" @@ -1740,9 +1745,9 @@ ], "support": { "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v6.1.2" + "source": "https://github.com/firebase/php-jwt/tree/v6.2.0" }, - "time": "2022-04-21T14:37:18+00:00" + "time": "2022-05-13T20:54:50+00:00" }, { "name": "friendsofphp/proxy-manager-lts", @@ -1886,16 +1891,16 @@ }, { "name": "google/cloud-core", - "version": "v1.44.3", + "version": "v1.45.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-cloud-php-core.git", - "reference": "eac417a907beaa3bc2783a17b90c0113b7aa86e6" + "reference": "28181b5ec2d40e9c9cdf2085096b33bac1f237fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/eac417a907beaa3bc2783a17b90c0113b7aa86e6", - "reference": "eac417a907beaa3bc2783a17b90c0113b7aa86e6", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/28181b5ec2d40e9c9cdf2085096b33bac1f237fd", + "reference": "28181b5ec2d40e9c9cdf2085096b33bac1f237fd", "shasum": "" }, "require": { @@ -1914,8 +1919,9 @@ "google/gax": "^1.9", "opis/closure": "^3", "phpdocumentor/reflection": "^3.0", - "phpunit/phpunit": "^4.8|^5.0", - "squizlabs/php_codesniffer": "2.*" + "phpunit/phpunit": "^4.8|^5.0|^8.0", + "squizlabs/php_codesniffer": "2.*", + "yoast/phpunit-polyfills": "^1.0" }, "suggest": { "opis/closure": "May be used to serialize closures to process jobs in the batch daemon. Please require version ^3.", @@ -1944,9 +1950,9 @@ ], "description": "Google Cloud PHP shared dependency, providing functionality useful to all components.", "support": { - "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.44.3" + "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.45.0" }, - "time": "2022-04-27T23:24:15+00:00" + "time": "2022-05-13T22:51:50+00:00" }, { "name": "google/cloud-storage", @@ -4036,16 +4042,16 @@ }, { "name": "symfony/cache", - "version": "v5.4.8", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "4c6747cf7e56c6b8e3094dd24852bd3e364375b1" + "reference": "a50b7249bea81ddd6d3b799ce40c5521c2f72f0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/4c6747cf7e56c6b8e3094dd24852bd3e364375b1", - "reference": "4c6747cf7e56c6b8e3094dd24852bd3e364375b1", + "url": "https://api.github.com/repos/symfony/cache/zipball/a50b7249bea81ddd6d3b799ce40c5521c2f72f0b", + "reference": "a50b7249bea81ddd6d3b799ce40c5521c2f72f0b", "shasum": "" }, "require": { @@ -4113,7 +4119,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v5.4.8" + "source": "https://github.com/symfony/cache/tree/v5.4.9" }, "funding": [ { @@ -4129,7 +4135,7 @@ "type": "tidelift" } ], - "time": "2022-04-26T13:19:20+00:00" + "time": "2022-05-21T10:24:18+00:00" }, { "name": "symfony/cache-contracts", @@ -4212,16 +4218,16 @@ }, { "name": "symfony/config", - "version": "v4.4.41", + "version": "v4.4.42", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7" + "reference": "83cdafd1bd3370de23e3dc2ed01026908863be81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7", - "reference": "9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7", + "url": "https://api.github.com/repos/symfony/config/zipball/83cdafd1bd3370de23e3dc2ed01026908863be81", + "reference": "83cdafd1bd3370de23e3dc2ed01026908863be81", "shasum": "" }, "require": { @@ -4270,7 +4276,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v4.4.41" + "source": "https://github.com/symfony/config/tree/v4.4.42" }, "funding": [ { @@ -4286,20 +4292,20 @@ "type": "tidelift" } ], - "time": "2022-04-12T15:19:55+00:00" + "time": "2022-05-17T07:10:14+00:00" }, { "name": "symfony/console", - "version": "v4.4.41", + "version": "v4.4.42", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "0e1e62083b20ccb39c2431293de060f756af905c" + "reference": "cce7a9f99e22937a71a16b23afa762558808d587" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/0e1e62083b20ccb39c2431293de060f756af905c", - "reference": "0e1e62083b20ccb39c2431293de060f756af905c", + "url": "https://api.github.com/repos/symfony/console/zipball/cce7a9f99e22937a71a16b23afa762558808d587", + "reference": "cce7a9f99e22937a71a16b23afa762558808d587", "shasum": "" }, "require": { @@ -4360,7 +4366,7 @@ "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/console/tree/v4.4.41" + "source": "https://github.com/symfony/console/tree/v4.4.42" }, "funding": [ { @@ -4376,7 +4382,7 @@ "type": "tidelift" } ], - "time": "2022-04-12T15:19:55+00:00" + "time": "2022-05-14T12:35:33+00:00" }, { "name": "symfony/debug", @@ -4448,16 +4454,16 @@ }, { "name": "symfony/dependency-injection", - "version": "v4.4.41", + "version": "v4.4.42", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "74c7f55de0eced4d3c9654809b1871870386a577" + "reference": "f6fdbf252765a09c7ac243617f79f1babef792c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/74c7f55de0eced4d3c9654809b1871870386a577", - "reference": "74c7f55de0eced4d3c9654809b1871870386a577", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f6fdbf252765a09c7ac243617f79f1babef792c9", + "reference": "f6fdbf252765a09c7ac243617f79f1babef792c9", "shasum": "" }, "require": { @@ -4514,7 +4520,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v4.4.41" + "source": "https://github.com/symfony/dependency-injection/tree/v4.4.42" }, "funding": [ { @@ -4530,7 +4536,7 @@ "type": "tidelift" } ], - "time": "2022-04-12T15:19:55+00:00" + "time": "2022-05-24T15:15:52+00:00" }, { "name": "symfony/deprecation-contracts", @@ -4669,16 +4675,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v4.4.37", + "version": "v4.4.42", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "3ccfcfb96ecce1217d7b0875a0736976bc6e63dc" + "reference": "708e761740c16b02c86e3f0c932018a06b895d40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3ccfcfb96ecce1217d7b0875a0736976bc6e63dc", - "reference": "3ccfcfb96ecce1217d7b0875a0736976bc6e63dc", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/708e761740c16b02c86e3f0c932018a06b895d40", + "reference": "708e761740c16b02c86e3f0c932018a06b895d40", "shasum": "" }, "require": { @@ -4733,7 +4739,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.37" + "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.42" }, "funding": [ { @@ -4749,7 +4755,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:41:36+00:00" + "time": "2022-05-05T15:33:49+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -4895,16 +4901,16 @@ }, { "name": "symfony/filesystem", - "version": "v4.4.39", + "version": "v4.4.42", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "72a5b35fecaa670b13954e6eaf414acbe2a67b35" + "reference": "815412ee8971209bd4c1eecd5f4f481eacd44bf5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/72a5b35fecaa670b13954e6eaf414acbe2a67b35", - "reference": "72a5b35fecaa670b13954e6eaf414acbe2a67b35", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/815412ee8971209bd4c1eecd5f4f481eacd44bf5", + "reference": "815412ee8971209bd4c1eecd5f4f481eacd44bf5", "shasum": "" }, "require": { @@ -4938,7 +4944,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v4.4.39" + "source": "https://github.com/symfony/filesystem/tree/v4.4.42" }, "funding": [ { @@ -4954,7 +4960,7 @@ "type": "tidelift" } ], - "time": "2022-02-25T10:38:15+00:00" + "time": "2022-05-20T08:49:14+00:00" }, { "name": "symfony/finder", @@ -5020,16 +5026,16 @@ }, { "name": "symfony/form", - "version": "v4.4.41", + "version": "v4.4.42", "source": { "type": "git", "url": "https://github.com/symfony/form.git", - "reference": "d874bd4208741fd88bd5a1c6d22f2b30a28dc47e" + "reference": "b19668b10c18deb56ff8068070afa5300f01f500" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/form/zipball/d874bd4208741fd88bd5a1c6d22f2b30a28dc47e", - "reference": "d874bd4208741fd88bd5a1c6d22f2b30a28dc47e", + "url": "https://api.github.com/repos/symfony/form/zipball/b19668b10c18deb56ff8068070afa5300f01f500", + "reference": "b19668b10c18deb56ff8068070afa5300f01f500", "shasum": "" }, "require": { @@ -5098,7 +5104,7 @@ "description": "Allows to easily create, process and reuse HTML forms", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/form/tree/v4.4.41" + "source": "https://github.com/symfony/form/tree/v4.4.42" }, "funding": [ { @@ -5114,7 +5120,7 @@ "type": "tidelift" } ], - "time": "2022-04-22T17:25:21+00:00" + "time": "2022-05-21T14:03:14+00:00" }, { "name": "symfony/http-client-contracts", @@ -5196,16 +5202,16 @@ }, { "name": "symfony/http-foundation", - "version": "v4.4.41", + "version": "v4.4.42", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "27441220aebeb096b4eb8267acaaa7feb5e4266c" + "reference": "8e87b3ec23ebbcf7440d91dec8f7ca70dd591eb3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/27441220aebeb096b4eb8267acaaa7feb5e4266c", - "reference": "27441220aebeb096b4eb8267acaaa7feb5e4266c", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8e87b3ec23ebbcf7440d91dec8f7ca70dd591eb3", + "reference": "8e87b3ec23ebbcf7440d91dec8f7ca70dd591eb3", "shasum": "" }, "require": { @@ -5244,7 +5250,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v4.4.41" + "source": "https://github.com/symfony/http-foundation/tree/v4.4.42" }, "funding": [ { @@ -5260,20 +5266,20 @@ "type": "tidelift" } ], - "time": "2022-04-21T07:22:34+00:00" + "time": "2022-05-17T11:15:18+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.41", + "version": "v4.4.42", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "7f8ce5bffc3939c63b7da32de5a546c98eb67698" + "reference": "04181de9459df639512dadf83d544ce12edd6776" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/7f8ce5bffc3939c63b7da32de5a546c98eb67698", - "reference": "7f8ce5bffc3939c63b7da32de5a546c98eb67698", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/04181de9459df639512dadf83d544ce12edd6776", + "reference": "04181de9459df639512dadf83d544ce12edd6776", "shasum": "" }, "require": { @@ -5348,7 +5354,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v4.4.41" + "source": "https://github.com/symfony/http-kernel/tree/v4.4.42" }, "funding": [ { @@ -5364,7 +5370,7 @@ "type": "tidelift" } ], - "time": "2022-04-27T17:13:11+00:00" + "time": "2022-05-27T07:04:21+00:00" }, { "name": "symfony/intl", @@ -5456,16 +5462,16 @@ }, { "name": "symfony/mime", - "version": "v5.4.8", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "af49bc163ec3272f677bde3bc44c0d766c1fd662" + "reference": "2b3802a24e48d0cfccf885173d2aac91e73df92e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/af49bc163ec3272f677bde3bc44c0d766c1fd662", - "reference": "af49bc163ec3272f677bde3bc44c0d766c1fd662", + "url": "https://api.github.com/repos/symfony/mime/zipball/2b3802a24e48d0cfccf885173d2aac91e73df92e", + "reference": "2b3802a24e48d0cfccf885173d2aac91e73df92e", "shasum": "" }, "require": { @@ -5519,7 +5525,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.8" + "source": "https://github.com/symfony/mime/tree/v5.4.9" }, "funding": [ { @@ -5535,7 +5541,7 @@ "type": "tidelift" } ], - "time": "2022-04-12T15:48:08+00:00" + "time": "2022-05-21T10:24:18+00:00" }, { "name": "symfony/options-resolver", @@ -5606,16 +5612,16 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "81b86b50cf841a64252b439e738e97f4a34e2783" + "reference": "433d05519ce6990bf3530fba6957499d327395c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783", - "reference": "81b86b50cf841a64252b439e738e97f4a34e2783", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2", + "reference": "433d05519ce6990bf3530fba6957499d327395c2", "shasum": "" }, "require": { @@ -5627,7 +5633,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5667,7 +5673,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0" }, "funding": [ { @@ -5683,20 +5689,20 @@ "type": "tidelift" } ], - "time": "2021-11-23T21:10:46+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "749045c69efb97c70d25d7463abba812e91f3a44" + "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44", - "reference": "749045c69efb97c70d25d7463abba812e91f3a44", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8", + "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8", "shasum": "" }, "require": { @@ -5710,7 +5716,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5754,7 +5760,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.26.0" }, "funding": [ { @@ -5770,20 +5776,20 @@ "type": "tidelift" } ], - "time": "2021-09-14T14:02:44+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" + "reference": "219aa369ceff116e673852dce47c3a41794c14bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd", + "reference": "219aa369ceff116e673852dce47c3a41794c14bd", "shasum": "" }, "require": { @@ -5795,7 +5801,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5838,7 +5844,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0" }, "funding": [ { @@ -5854,20 +5860,20 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", "shasum": "" }, "require": { @@ -5882,7 +5888,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5921,7 +5927,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" }, "funding": [ { @@ -5937,20 +5943,20 @@ "type": "tidelift" } ], - "time": "2021-11-30T18:21:41+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c" + "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c", - "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace", + "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace", "shasum": "" }, "require": { @@ -5959,7 +5965,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6004,7 +6010,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0" }, "funding": [ { @@ -6020,20 +6026,20 @@ "type": "tidelift" } ], - "time": "2022-03-04T08:16:47+00:00" + "time": "2022-05-10T07:21:04+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f" + "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f", - "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1", + "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1", "shasum": "" }, "require": { @@ -6042,7 +6048,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6083,7 +6089,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0" }, "funding": [ { @@ -6099,7 +6105,7 @@ "type": "tidelift" } ], - "time": "2021-09-13T13:58:11+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/process", @@ -6246,16 +6252,16 @@ }, { "name": "symfony/property-info", - "version": "v5.4.7", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/property-info.git", - "reference": "0fc07795712972b9792f203d0fe0e77c26c3281d" + "reference": "6f0a452aaba45e763f89e328df437f73a720e18e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-info/zipball/0fc07795712972b9792f203d0fe0e77c26c3281d", - "reference": "0fc07795712972b9792f203d0fe0e77c26c3281d", + "url": "https://api.github.com/repos/symfony/property-info/zipball/6f0a452aaba45e763f89e328df437f73a720e18e", + "reference": "6f0a452aaba45e763f89e328df437f73a720e18e", "shasum": "" }, "require": { @@ -6317,7 +6323,7 @@ "validator" ], "support": { - "source": "https://github.com/symfony/property-info/tree/v5.4.7" + "source": "https://github.com/symfony/property-info/tree/v5.4.9" }, "funding": [ { @@ -6333,20 +6339,20 @@ "type": "tidelift" } ], - "time": "2022-03-30T13:40:48+00:00" + "time": "2022-05-17T09:47:20+00:00" }, { "name": "symfony/serializer", - "version": "v5.4.8", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "a806b1031c45bf2ee583beee6df734ecf34d5cfc" + "reference": "b54815117a06a8120604bdf00219e3a55288ee1e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/a806b1031c45bf2ee583beee6df734ecf34d5cfc", - "reference": "a806b1031c45bf2ee583beee6df734ecf34d5cfc", + "url": "https://api.github.com/repos/symfony/serializer/zipball/b54815117a06a8120604bdf00219e3a55288ee1e", + "reference": "b54815117a06a8120604bdf00219e3a55288ee1e", "shasum": "" }, "require": { @@ -6420,7 +6426,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v5.4.8" + "source": "https://github.com/symfony/serializer/tree/v5.4.9" }, "funding": [ { @@ -6436,7 +6442,7 @@ "type": "tidelift" } ], - "time": "2022-04-12T16:02:29+00:00" + "time": "2022-05-10T09:18:46+00:00" }, { "name": "symfony/service-contracts", @@ -6523,16 +6529,16 @@ }, { "name": "symfony/string", - "version": "v5.4.8", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8" + "reference": "985e6a9703ef5ce32ba617c9c7d97873bb7b2a99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8", - "reference": "3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8", + "url": "https://api.github.com/repos/symfony/string/zipball/985e6a9703ef5ce32ba617c9c7d97873bb7b2a99", + "reference": "985e6a9703ef5ce32ba617c9c7d97873bb7b2a99", "shasum": "" }, "require": { @@ -6589,7 +6595,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.8" + "source": "https://github.com/symfony/string/tree/v5.4.9" }, "funding": [ { @@ -6793,16 +6799,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.8", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "cdcadd343d31ad16fc5e006b0de81ea307435053" + "reference": "af52239a330fafd192c773795520dc2dd62b5657" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/cdcadd343d31ad16fc5e006b0de81ea307435053", - "reference": "cdcadd343d31ad16fc5e006b0de81ea307435053", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/af52239a330fafd192c773795520dc2dd62b5657", + "reference": "af52239a330fafd192c773795520dc2dd62b5657", "shasum": "" }, "require": { @@ -6862,7 +6868,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.8" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.9" }, "funding": [ { @@ -6878,20 +6884,20 @@ "type": "tidelift" } ], - "time": "2022-04-26T13:19:20+00:00" + "time": "2022-05-21T10:24:18+00:00" }, { "name": "symfony/var-exporter", - "version": "v5.4.8", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "7e132a3fcd4b57add721b4207236877b6017ec93" + "reference": "63249ebfca4e75a357679fa7ba2089cfb898aa67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/7e132a3fcd4b57add721b4207236877b6017ec93", - "reference": "7e132a3fcd4b57add721b4207236877b6017ec93", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/63249ebfca4e75a357679fa7ba2089cfb898aa67", + "reference": "63249ebfca4e75a357679fa7ba2089cfb898aa67", "shasum": "" }, "require": { @@ -6935,7 +6941,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v5.4.8" + "source": "https://github.com/symfony/var-exporter/tree/v5.4.9" }, "funding": [ { @@ -6951,7 +6957,7 @@ "type": "tidelift" } ], - "time": "2022-04-26T13:19:20+00:00" + "time": "2022-05-21T10:24:18+00:00" }, { "name": "symfony/web-link", @@ -7624,16 +7630,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.13.2", + "version": "v4.14.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "210577fe3cf7badcc5814d99455df46564f3c077" + "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077", - "reference": "210577fe3cf7badcc5814d99455df46564f3c077", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1", + "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1", "shasum": "" }, "require": { @@ -7674,9 +7680,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.14.0" }, - "time": "2021-11-30T19:35:32+00:00" + "time": "2022-05-31T20:59:12+00:00" }, { "name": "phar-io/manifest", @@ -10017,16 +10023,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v4.4.39", + "version": "v4.4.42", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "4e9215a8b533802ba84a3cc5bd3c43103e7a6dc3" + "reference": "be5a04618e5d44e71d013f177df80d3ec4b192a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/4e9215a8b533802ba84a3cc5bd3c43103e7a6dc3", - "reference": "4e9215a8b533802ba84a3cc5bd3c43103e7a6dc3", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/be5a04618e5d44e71d013f177df80d3ec4b192a0", + "reference": "be5a04618e5d44e71d013f177df80d3ec4b192a0", "shasum": "" }, "require": { @@ -10071,7 +10077,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v4.4.39" + "source": "https://github.com/symfony/dom-crawler/tree/v4.4.42" }, "funding": [ { @@ -10087,7 +10093,7 @@ "type": "tidelift" } ], - "time": "2022-02-25T10:38:15+00:00" + "time": "2022-04-30T18:34:00+00:00" }, { "name": "symfony/translation", From 253897b70e7703c350fd55e5d17fded818b04194 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 2 Jun 2022 15:48:59 +0200 Subject: [PATCH 032/730] SW-26686 - Update doctrine dependencies --- UPGRADE-5.7.md | 4 ++- composer.json | 6 ++--- composer.lock | 70 ++++++++++++++++++++++++++++++-------------------- 3 files changed, 48 insertions(+), 32 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index b2e51fd9243..f0510bd07c0 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -17,9 +17,11 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `bamarni/composer-bin-plugin` to version 1.5.0 * Updated `behat/mink` to version 1.10.0 * Updated `behat/mink-selenium2-driver` to version 1.6.0 +* Updated `doctrine/cache` to version 1.13.0 * Updated `doctrine/common` to version 3.3.0 * Updated `doctrine/dbal` to version 2.13.8 -* Updated `doctrine/persistence` to version 2.5.1 +* Updated `doctrine/orm` to version 2.12.2 +* Updated `doctrine/persistence` to version 2.5.3 * Updated `elasticsearch/elasticsearch` to version 7.17.0 * Updated `friendsofphp/proxy-manager-lts` to version 1.0.7 * Updated `google/cloud-storage` to version 1.26.2 diff --git a/composer.json b/composer.json index 9d187d1d780..6126c347b49 100644 --- a/composer.json +++ b/composer.json @@ -41,13 +41,13 @@ "beberlei/doctrineextensions": "1.3.0", "cocur/slugify": "4.1.0", "doctrine/annotations": "1.13.2", - "doctrine/cache": "1.12.1", + "doctrine/cache": "1.13.0", "doctrine/collections": "1.6.8", "doctrine/common": "3.3.0", "doctrine/dbal": "2.13.8", "doctrine/event-manager": "1.1.1", - "doctrine/orm": "2.12.1", - "doctrine/persistence": "2.5.1", + "doctrine/orm": "2.12.2", + "doctrine/persistence": "2.5.3", "elasticsearch/elasticsearch": "^7", "fig/link-util": "1.1.2", "friendsofphp/proxy-manager-lts": "1.0.7", diff --git a/composer.lock b/composer.lock index 27dd4e3ebdc..615c9ebea14 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": "c247ccdda253d97c68ad3851acf5e190", + "content-hash": "8e92d789ab108cca1a8171f5cdae0fa4", "packages": [ { "name": "aws/aws-crt-php", @@ -523,16 +523,16 @@ }, { "name": "doctrine/cache", - "version": "1.12.1", + "version": "1.13.0", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "4cf401d14df219fa6f38b671f5493449151c9ad8" + "reference": "56cd022adb5514472cb144c087393c1821911d09" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/4cf401d14df219fa6f38b671f5493449151c9ad8", - "reference": "4cf401d14df219fa6f38b671f5493449151c9ad8", + "url": "https://api.github.com/repos/doctrine/cache/zipball/56cd022adb5514472cb144c087393c1821911d09", + "reference": "56cd022adb5514472cb144c087393c1821911d09", "shasum": "" }, "require": { @@ -544,13 +544,13 @@ "require-dev": { "alcaeus/mongo-php-adapter": "^1.1", "cache/integration-tests": "dev-master", - "doctrine/coding-standard": "^8.0", + "doctrine/coding-standard": "^9", "mongodb/mongodb": "^1.1", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", "predis/predis": "~1.0", "psr/cache": "^1.0 || ^2.0 || ^3.0", - "symfony/cache": "^4.4 || ^5.2 || ^6.0@dev", - "symfony/var-exporter": "^4.4 || ^5.2 || ^6.0@dev" + "symfony/cache": "^4.4 || ^5.4 || ^6", + "symfony/var-exporter": "^4.4 || ^5.4 || ^6" }, "suggest": { "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver" @@ -602,7 +602,7 @@ ], "support": { "issues": "https://github.com/doctrine/cache/issues", - "source": "https://github.com/doctrine/cache/tree/1.12.1" + "source": "https://github.com/doctrine/cache/tree/1.13.0" }, "funding": [ { @@ -618,7 +618,7 @@ "type": "tidelift" } ], - "time": "2021-07-17T14:39:21+00:00" + "time": "2022-05-20T20:06:54+00:00" }, { "name": "doctrine/collections", @@ -1264,16 +1264,16 @@ }, { "name": "doctrine/orm", - "version": "2.12.1", + "version": "2.12.2", "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "2e4a8722721b934149ff53b191522a6829b6d73b" + "reference": "8291a7f09b12d14783ed6537b4586583d155869e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/2e4a8722721b934149ff53b191522a6829b6d73b", - "reference": "2e4a8722721b934149ff53b191522a6829b6d73b", + "url": "https://api.github.com/repos/doctrine/orm/zipball/8291a7f09b12d14783ed6537b4586583d155869e", + "reference": "8291a7f09b12d14783ed6537b4586583d155869e", "shasum": "" }, "require": { @@ -1282,7 +1282,7 @@ "doctrine/collections": "^1.5", "doctrine/common": "^3.0.3", "doctrine/dbal": "^2.13.1 || ^3.2", - "doctrine/deprecations": "^0.5.3", + "doctrine/deprecations": "^0.5.3 || ^1", "doctrine/event-manager": "^1.1", "doctrine/inflector": "^1.4 || ^2.0", "doctrine/instantiator": "^1.3", @@ -1302,13 +1302,13 @@ "doctrine/annotations": "^1.13", "doctrine/coding-standard": "^9.0", "phpbench/phpbench": "^0.16.10 || ^1.0", - "phpstan/phpstan": "~1.4.10 || 1.5.0", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4", + "phpstan/phpstan": "~1.4.10 || 1.6.3", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", "psr/log": "^1 || ^2 || ^3", "squizlabs/php_codesniffer": "3.6.2", "symfony/cache": "^4.4 || ^5.4 || ^6.0", "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0", - "vimeo/psalm": "4.22.0" + "vimeo/psalm": "4.23.0" }, "suggest": { "symfony/cache": "Provides cache support for Setup Tool with doctrine/cache 2.0", @@ -1357,28 +1357,28 @@ ], "support": { "issues": "https://github.com/doctrine/orm/issues", - "source": "https://github.com/doctrine/orm/tree/2.12.1" + "source": "https://github.com/doctrine/orm/tree/2.12.2" }, - "time": "2022-04-22T17:46:03+00:00" + "time": "2022-05-02T19:10:07+00:00" }, { "name": "doctrine/persistence", - "version": "2.5.1", + "version": "2.5.3", "source": { "type": "git", "url": "https://github.com/doctrine/persistence.git", - "reference": "4473480044c88f30e0e8288e7123b60c7eb9efa3" + "reference": "d7edf274b6d35ad82328e223439cc2bb2f92bd9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/persistence/zipball/4473480044c88f30e0e8288e7123b60c7eb9efa3", - "reference": "4473480044c88f30e0e8288e7123b60c7eb9efa3", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/d7edf274b6d35ad82328e223439cc2bb2f92bd9e", + "reference": "d7edf274b6d35ad82328e223439cc2bb2f92bd9e", "shasum": "" }, "require": { "doctrine/cache": "^1.11 || ^2.0", "doctrine/collections": "^1.0", - "doctrine/deprecations": "^0.5.3", + "doctrine/deprecations": "^0.5.3 || ^1", "doctrine/event-manager": "^1.0", "php": "^7.1 || ^8.0", "psr/cache": "^1.0 || ^2.0 || ^3.0" @@ -1445,9 +1445,23 @@ ], "support": { "issues": "https://github.com/doctrine/persistence/issues", - "source": "https://github.com/doctrine/persistence/tree/2.5.1" + "source": "https://github.com/doctrine/persistence/tree/2.5.3" }, - "time": "2022-04-14T21:47:17+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fpersistence", + "type": "tidelift" + } + ], + "time": "2022-05-03T09:16:53+00:00" }, { "name": "elasticsearch/elasticsearch", From 9dcda4156586b775388107186ac8c9dbcf40f351 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 2 Jun 2022 16:22:57 +0200 Subject: [PATCH 033/730] SW-26686 - Update ProxyManager, Google Cloud storage and monolog dependencies --- UPGRADE-5.7.md | 6 ++--- composer.json | 6 ++--- composer.lock | 62 +++++++++++++++++++++++++++----------------------- 3 files changed, 40 insertions(+), 34 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index f0510bd07c0..0fb61a17120 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -23,11 +23,11 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `doctrine/orm` to version 2.12.2 * Updated `doctrine/persistence` to version 2.5.3 * Updated `elasticsearch/elasticsearch` to version 7.17.0 -* Updated `friendsofphp/proxy-manager-lts` to version 1.0.7 -* Updated `google/cloud-storage` to version 1.26.2 +* Updated `friendsofphp/proxy-manager-lts` to version 1.0.12 +* Updated `google/cloud-storage` to version 1.27.1 * Updated `guzzlehttp/guzzle` to version 7.4.2 * Updated `laminas/laminas-escaper` to version 2.10.0 -* Updated `monolog/monolog` to version 2.5.0 +* Updated `monolog/monolog` to version 2.6.0 * Updated `mpdf/mpdf` to version 8.1.1 * Updated `phpunit/phpunit` to version 9.5.20 * Updated `symfony/browser-kit` to version 4.4.37 diff --git a/composer.json b/composer.json index 6126c347b49..401c1f8436f 100644 --- a/composer.json +++ b/composer.json @@ -50,15 +50,15 @@ "doctrine/persistence": "2.5.3", "elasticsearch/elasticsearch": "^7", "fig/link-util": "1.1.2", - "friendsofphp/proxy-manager-lts": "1.0.7", - "google/cloud-storage": "1.26.2", + "friendsofphp/proxy-manager-lts": "1.0.12", + "google/cloud-storage": "1.27.1", "guzzlehttp/guzzle": "7.4.3", "guzzlehttp/psr7": "2.2.1", "laminas/laminas-code": "4.5.1", "laminas/laminas-escaper": "2.10.0", "league/flysystem": "~1.1.4", "league/flysystem-aws-s3-v3": "1.0.29", - "monolog/monolog": "2.5.0", + "monolog/monolog": "2.6.0", "mpdf/mpdf": "8.1.1", "ongr/elasticsearch-dsl": "7.2.2", "psr/link": "1.0.0", diff --git a/composer.lock b/composer.lock index 615c9ebea14..34b945a6cdd 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": "8e92d789ab108cca1a8171f5cdae0fa4", + "content-hash": "6ba0011c11fa8435a00814e37c91dc78", "packages": [ { "name": "aws/aws-crt-php", @@ -1765,16 +1765,16 @@ }, { "name": "friendsofphp/proxy-manager-lts", - "version": "v1.0.7", + "version": "v1.0.12", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/proxy-manager-lts.git", - "reference": "c828ced1f932094ab79e4120a106a666565e4d9c" + "reference": "8419f0158715b30d4b99a5bd37c6a39671994ad7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/proxy-manager-lts/zipball/c828ced1f932094ab79e4120a106a666565e4d9c", - "reference": "c828ced1f932094ab79e4120a106a666565e4d9c", + "url": "https://api.github.com/repos/FriendsOfPHP/proxy-manager-lts/zipball/8419f0158715b30d4b99a5bd37c6a39671994ad7", + "reference": "8419f0158715b30d4b99a5bd37c6a39671994ad7", "shasum": "" }, "require": { @@ -1831,7 +1831,7 @@ ], "support": { "issues": "https://github.com/FriendsOfPHP/proxy-manager-lts/issues", - "source": "https://github.com/FriendsOfPHP/proxy-manager-lts/tree/v1.0.7" + "source": "https://github.com/FriendsOfPHP/proxy-manager-lts/tree/v1.0.12" }, "funding": [ { @@ -1843,7 +1843,7 @@ "type": "tidelift" } ], - "time": "2022-03-02T09:29:19+00:00" + "time": "2022-05-05T09:31:05+00:00" }, { "name": "google/auth", @@ -1970,16 +1970,16 @@ }, { "name": "google/cloud-storage", - "version": "v1.26.2", + "version": "v1.27.1", "source": { "type": "git", "url": "https://github.com/googleapis/google-cloud-php-storage.git", - "reference": "a515dc6f80bee00ded6364626953b3b8de15c303" + "reference": "f66d228d5991674c015bd32e5ed8d857d9d8352d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/a515dc6f80bee00ded6364626953b3b8de15c303", - "reference": "a515dc6f80bee00ded6364626953b3b8de15c303", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/f66d228d5991674c015bd32e5ed8d857d9d8352d", + "reference": "f66d228d5991674c015bd32e5ed8d857d9d8352d", "shasum": "" }, "require": { @@ -1989,10 +1989,11 @@ "require-dev": { "erusev/parsedown": "^1.6", "google/cloud-pubsub": "^1.0", - "phpdocumentor/reflection": "^3.0", - "phpseclib/phpseclib": "^2", - "phpunit/phpunit": "^4.8|^5.0", - "squizlabs/php_codesniffer": "2.*" + "phpdocumentor/reflection": "^3.0||^4.0", + "phpseclib/phpseclib": "^2.0||^3.0", + "phpunit/phpunit": "^4.8|^5.0|^8.0", + "squizlabs/php_codesniffer": "2.*", + "yoast/phpunit-polyfills": "^1.0" }, "suggest": { "google/cloud-pubsub": "May be used to register a topic to receive bucket notifications.", @@ -2018,9 +2019,9 @@ ], "description": "Cloud Storage Client for PHP", "support": { - "source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.26.2" + "source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.27.1" }, - "time": "2022-04-20T18:34:50+00:00" + "time": "2022-06-02T21:53:43+00:00" }, { "name": "google/crc32", @@ -2722,16 +2723,16 @@ }, { "name": "monolog/monolog", - "version": "2.5.0", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "4192345e260f1d51b365536199744b987e160edc" + "reference": "247918972acd74356b0a91dfaa5adcaec069b6c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/4192345e260f1d51b365536199744b987e160edc", - "reference": "4192345e260f1d51b365536199744b987e160edc", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/247918972acd74356b0a91dfaa5adcaec069b6c0", + "reference": "247918972acd74356b0a91dfaa5adcaec069b6c0", "shasum": "" }, "require": { @@ -2744,18 +2745,23 @@ "require-dev": { "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", - "elasticsearch/elasticsearch": "^7", + "elasticsearch/elasticsearch": "^7 || ^8", + "ext-json": "*", "graylog2/gelf-php": "^1.4.2", + "guzzlehttp/guzzle": "^7.4", + "guzzlehttp/psr7": "^2.2", "mongodb/mongodb": "^1.8", "php-amqplib/php-amqplib": "~2.4 || ^3", "php-console/php-console": "^3.1.3", - "phpspec/prophecy": "^1.6.1", + "phpspec/prophecy": "^1.15", "phpstan/phpstan": "^0.12.91", - "phpunit/phpunit": "^8.5", + "phpunit/phpunit": "^8.5.14", "predis/predis": "^1.1", "rollbar/rollbar": "^1.3 || ^2 || ^3", - "ruflin/elastica": ">=0.90@dev", - "swiftmailer/swiftmailer": "^5.3|^6.0" + "ruflin/elastica": "^7", + "swiftmailer/swiftmailer": "^5.3|^6.0", + "symfony/mailer": "^5.4 || ^6", + "symfony/mime": "^5.4 || ^6" }, "suggest": { "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", @@ -2805,7 +2811,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.5.0" + "source": "https://github.com/Seldaek/monolog/tree/2.6.0" }, "funding": [ { @@ -2817,7 +2823,7 @@ "type": "tidelift" } ], - "time": "2022-04-08T15:43:54+00:00" + "time": "2022-05-10T09:36:00+00:00" }, { "name": "mpdf/mpdf", From 1fc0a93b3a55b975bc7d2800a570607d0ee27c4f Mon Sep 17 00:00:00 2001 From: Tino Vogel Date: Fri, 6 May 2022 08:24:13 +0200 Subject: [PATCH 034/730] SW-26721 - Fix redirect to external links configured in categories fixes https://github.com/shopware/shopware/pull/2494 --- .../Shopware/Controllers/Frontend/Listing.php | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/engine/Shopware/Controllers/Frontend/Listing.php b/engine/Shopware/Controllers/Frontend/Listing.php index c81064a75aa..8981b38f7a5 100644 --- a/engine/Shopware/Controllers/Frontend/Listing.php +++ b/engine/Shopware/Controllers/Frontend/Listing.php @@ -118,7 +118,7 @@ public function indexAction(Request $request, ShopContextInterface $shopContext) ); $location = $this->getRedirectLocation($categoryContent, $emotionConfiguration['hasEmotion'], $shopContext); - if (!empty($location)) { + if (null !== $location) { $this->redirect($location, ['code' => 301]); return; @@ -331,19 +331,21 @@ private function hasProducts(int $categoryId, ShopContextInterface $context, ?in /** * @param array $categoryContent * - * @return array{controller?: string, sArticle?: int} + * @return string|null */ - private function getRedirectLocation(array $categoryContent, bool $hasEmotion, ShopContextInterface $context): array + private function getRedirectLocation(array $categoryContent, bool $hasEmotion, ShopContextInterface $context): ?string { - $location = []; + if (!empty($categoryContent['external'])) { + return $categoryContent['external']; + } + + if ($this->isShopsBaseCategoryPage($categoryContent['id'])) { + return $this->Front()->Router()->assemble(['controller' => 'index']); + } $checkRedirect = ($hasEmotion && $this->Request()->getParam('sPage')) || (!$hasEmotion); - if (!empty($categoryContent['external'])) { - $location = $categoryContent['external']; - } elseif ($this->isShopsBaseCategoryPage($categoryContent['id'])) { - $location = ['controller' => 'index']; - } elseif ($checkRedirect && $this->config->get('categoryDetailLink')) { + if ($checkRedirect && $this->config->get('categoryDetailLink')) { $criteria = $this->storeFrontCriteriaFactory->createListingCriteria($this->Request(), $context); $criteria->resetFacets() @@ -358,11 +360,15 @@ private function getRedirectLocation(array $categoryContent, bool $hasEmotion, S if (\count($result->getProducts()) === 1) { $products = $result->getProducts(); $first = array_shift($products); - $location = ['controller' => 'detail', 'sArticle' => $first->getId()]; + + return $this->Front()->Router()->assemble([ + 'controller' => 'detail', + 'sArticle' => $first->getId() + ]); } } - return $location; + return null; } /** From 17876827647f9c626acfacb297bea92599298c4e Mon Sep 17 00:00:00 2001 From: Rafael Prukop Date: Tue, 10 May 2022 14:48:09 +0200 Subject: [PATCH 035/730] SW-26723 - Fix typo in modernizr path in template fixes https://github.com/shopware/shopware/pull/2496 --- themes/Frontend/Bare/frontend/index/header.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/Frontend/Bare/frontend/index/header.tpl b/themes/Frontend/Bare/frontend/index/header.tpl index 59343dd2089..d76fa89fb6b 100644 --- a/themes/Frontend/Bare/frontend/index/header.tpl +++ b/themes/Frontend/Bare/frontend/index/header.tpl @@ -106,7 +106,7 @@ {* Add Modernizr in the ""-element to have all the classes before the page was rendered *} {block name="frontend_index_header_javascript_modernizr_lib"} {if !$theme.asyncJavascriptLoading} - + {/if} {/block} From 692995544cb64229cc756620ebe37f68d80a1967 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Fri, 3 Jun 2022 10:45:36 +0200 Subject: [PATCH 036/730] SW-26721 - Add tests and improve code quality --- .phpstan-baseline.neon | 215 ------------------ .../Enlight/Components/Test/TestCase.php | 2 +- .../Shopware/Controllers/Frontend/Listing.php | 82 ++++--- engine/Shopware/Core/sCategories.php | 2 +- .../AccountBundle/Controller/RegisterTest.php | 172 +++++++------- .../Controllers/Backend/NewsletterTest.php | 16 +- .../Controllers/Frontend/ListingTest.php | 110 +++++++-- 7 files changed, 238 insertions(+), 361 deletions(-) diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index 1f2abfeaf1c..c583c197533 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -28000,41 +28000,6 @@ parameters: count: 1 path: engine/Shopware/Controllers/Frontend/Index.php - - - message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#" - count: 2 - path: engine/Shopware/Controllers/Frontend/Listing.php - - - - message: "#^Method Shopware_Controllers_Frontend_Listing\\:\\:filterListingEmotions\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Controllers/Frontend/Listing.php - - - - message: "#^Method Shopware_Controllers_Frontend_Listing\\:\\:getBreadcrumb\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Controllers/Frontend/Listing.php - - - - message: "#^Method Shopware_Controllers_Frontend_Listing\\:\\:getEmotionConfiguration\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Controllers/Frontend/Listing.php - - - - message: "#^Method Shopware_Controllers_Frontend_Listing\\:\\:hasListing\\(\\) has parameter \\$devicesWithEmotion with no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Controllers/Frontend/Listing.php - - - - message: "#^Offset 'streamId' does not exist on array\\|null\\.$#" - count: 1 - path: engine/Shopware/Controllers/Frontend/Listing.php - - - - message: "#^Variable \\$showListing in empty\\(\\) always exists and is not falsy\\.$#" - count: 1 - path: engine/Shopware/Controllers/Frontend/Listing.php - - message: "#^Method Shopware_Controllers_Frontend_Media\\:\\:fallbackAction\\(\\) has no return type specified\\.$#" count: 1 @@ -30205,11 +30170,6 @@ parameters: count: 1 path: engine/Shopware/Core/sCategories.php - - - message: "#^Method sCategories\\:\\:sGetCategoriesByParent\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Core/sCategories.php - - message: "#^Method sCategories\\:\\:sGetCategoriesByParentId\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -40245,176 +40205,6 @@ parameters: count: 1 path: tests/Functional/Bundle/AccountBundle/Controller/AddressTest.php - - - message: "#^Cannot access offset 'data' on array\\\\|false\\.$#" - count: 2 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Cannot access offset 'doubleOptinEmailSen…' on array\\\\|false\\.$#" - count: 2 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Cannot access offset 'hash' on array\\\\|false\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Cannot access offset 'id' on array\\\\|false\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Cannot access offset 'type' on array\\\\|false\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:assertAddress\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:assertAddress\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:deleteCustomer\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:deleteCustomer\\(\\) has parameter \\$email with no type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:doubleOptinSet\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:getBillingData\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:getBillingData\\(\\) has parameter \\$data with no type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:getPersonalData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:getPersonalData\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:getShippingData\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:getShippingData\\(\\) has parameter \\$data with no type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:sendRequestAndAssertCustomer\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:sendRequestAndAssertCustomer\\(\\) has parameter \\$billing with no type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:sendRequestAndAssertCustomer\\(\\) has parameter \\$email with no type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:sendRequestAndAssertCustomer\\(\\) has parameter \\$personal with no type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:sendRequestAndAssertCustomer\\(\\) has parameter \\$shipping with no type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:sendRequestAndAssertCustomerWithDoubleOptIn\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:sendRequestAndAssertCustomerWithDoubleOptIn\\(\\) has parameter \\$email with no type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:sendRequestAndAssertDOIConfirmation\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:sendRequestAndAssertDOIConfirmation\\(\\) has parameter \\$email with no type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:sendRequestAndAssertDOIConfirmation\\(\\) has parameter \\$hash with no type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:testCompanyRegistration\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:testDefaultPayment\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:testDoubleOptInRegistration\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:testFastRegistration\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:testRegistrationWithShipping\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:testSimpleRegistration\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Parameter \\#2 \\$array of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertArrayHasKey\\(\\) expects array\\|ArrayAccess, array\\\\|false given\\.$#" - count: 2 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - - - message: "#^Parameter \\#2 \\$string of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringEndsWith\\(\\) expects string, string\\|null given\\.$#" - count: 1 - path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php - - message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertNull\\(\\) with int will always evaluate to false\\.$#" count: 1 @@ -43985,11 +43775,6 @@ parameters: count: 1 path: tests/Functional/Controllers/Backend/MediaManagerTest.php - - - message: "#^Parameter \\#2 \\$string of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertMatchesRegularExpression\\(\\) expects string, array\\|string\\|null given\\.$#" - count: 2 - path: tests/Functional/Controllers/Backend/NewsletterTest.php - - message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$data\\.$#" count: 1 diff --git a/engine/Library/Enlight/Components/Test/TestCase.php b/engine/Library/Enlight/Components/Test/TestCase.php index 6da3b1c39f9..729d28c4e69 100644 --- a/engine/Library/Enlight/Components/Test/TestCase.php +++ b/engine/Library/Enlight/Components/Test/TestCase.php @@ -50,7 +50,7 @@ protected function tearDown(): void /** * Allows to set a Shopware config * - * @param bool|string|null $value + * @param bool|float|int|string|null $value */ protected function setConfig(string $name, $value): void { diff --git a/engine/Shopware/Controllers/Frontend/Listing.php b/engine/Shopware/Controllers/Frontend/Listing.php index 8981b38f7a5..2a82a3913e3 100644 --- a/engine/Shopware/Controllers/Frontend/Listing.php +++ b/engine/Shopware/Controllers/Frontend/Listing.php @@ -40,9 +40,11 @@ use Shopware\Components\ProductStream\CriteriaFactoryInterface; use Shopware\Components\ProductStream\FacetFilterInterface; use Shopware\Components\ProductStream\RepositoryInterface as ProductStreamRepositoryInterface; +use Shopware\Models\Category\Category; use Shopware\Models\Category\Repository as CategoryRepository; use Shopware\Models\CustomerStream\CustomerStreamRepositoryInterface; use Shopware\Models\Emotion\Emotion; +use Symfony\Component\HttpFoundation\Response; class Shopware_Controllers_Frontend_Listing extends Enlight_Controller_Action { @@ -118,8 +120,8 @@ public function indexAction(Request $request, ShopContextInterface $shopContext) ); $location = $this->getRedirectLocation($categoryContent, $emotionConfiguration['hasEmotion'], $shopContext); - if (null !== $location) { - $this->redirect($location, ['code' => 301]); + if (\is_string($location)) { + $this->redirect($location, ['code' => Response::HTTP_MOVED_PERMANENTLY]); return; } @@ -156,7 +158,7 @@ public function layoutAction(Request $request) $categoryContent = Shopware()->Modules()->Categories()->sGetCategoryContent($categoryId); - $config = $this->getEmotionConfiguration($categoryId, true, $categoryContent['streamId']); + $config = $this->getEmotionConfiguration($categoryId, true, $categoryContent['streamId'] ?? null); $config = array_merge($config, [ 'sBanner' => Shopware()->Modules()->Marketing()->sBanner($categoryId), @@ -257,7 +259,7 @@ public function manufacturerAction(ShopContextInterface $context) * * @param int $categoryId * - * @return array listing breadcrumb + * @return array listing breadcrumb * * @deprecated in 5.6, will be private in 5.8 */ @@ -275,7 +277,7 @@ public function getBreadcrumb($categoryId) * @param bool $withStreams * @param int $streamId * - * @return array{emotions: array, hasEmotion: bool, showListing: bool, isHomePage: bool, showListingButton: bool} + * @return array{emotions: array>, hasEmotion: bool, showListing: bool, isHomePage: bool, showListingButton: bool} */ protected function getEmotionConfiguration($categoryId, $withStreams = false, $streamId = null) { @@ -330,12 +332,10 @@ private function hasProducts(int $categoryId, ShopContextInterface $context, ?in /** * @param array $categoryContent - * - * @return string|null */ private function getRedirectLocation(array $categoryContent, bool $hasEmotion, ShopContextInterface $context): ?string { - if (!empty($categoryContent['external'])) { + if (\is_string($categoryContent['external']) && $categoryContent['external'] !== '') { return $categoryContent['external']; } @@ -345,30 +345,29 @@ private function getRedirectLocation(array $categoryContent, bool $hasEmotion, S $checkRedirect = ($hasEmotion && $this->Request()->getParam('sPage')) || (!$hasEmotion); - if ($checkRedirect && $this->config->get('categoryDetailLink')) { - $criteria = $this->storeFrontCriteriaFactory->createListingCriteria($this->Request(), $context); - - $criteria->resetFacets() - ->resetConditions() - ->resetSorting() - ->offset(0) - ->limit(2) - ->setFetchCount(false); - - $result = $this->productNumberSearch->search($criteria, $context); - - if (\count($result->getProducts()) === 1) { - $products = $result->getProducts(); - $first = array_shift($products); + if (!$checkRedirect || !$this->config->get('categoryDetailLink')) { + return null; + } - return $this->Front()->Router()->assemble([ - 'controller' => 'detail', - 'sArticle' => $first->getId() - ]); - } + $criteria = $this->storeFrontCriteriaFactory->createListingCriteria($this->Request(), $context); + $criteria->resetFacets() + ->resetConditions() + ->resetSorting() + ->offset(0) + ->limit(2) + ->setFetchCount(false); + $result = $this->productNumberSearch->search($criteria, $context); + if (\count($result->getProducts()) !== 1) { + return null; } - return null; + $products = $result->getProducts(); + $firstProducts = array_shift($products); + + return $this->Front()->Router()->assemble([ + 'controller' => 'detail', + 'sArticle' => $firstProducts->getId(), + ]); } /** @@ -404,7 +403,12 @@ private function getSeoDataOfManufacturer(Manufacturer $manufacturer): array */ private function isValidCategoryPath(int $categoryId): bool { - $defaultShopCategoryId = Shopware()->Shop()->getCategory()->getId(); + $category = $this->get('shop')->getCategory(); + if (!$category instanceof Category) { + return false; + } + + $defaultShopCategoryId = $category->getId(); $categoryPath = $this->categoryRepository->getPathById($categoryId); @@ -414,7 +418,7 @@ private function isValidCategoryPath(int $categoryId): bool if (!\array_key_exists($defaultShopCategoryId, $categoryPath)) { $this->Request()->setQuery('sCategory', $defaultShopCategoryId); - $this->Response()->setStatusCode(404); + $this->Response()->setStatusCode(Response::HTTP_NOT_FOUND); return false; } @@ -428,7 +432,12 @@ private function isValidCategoryPath(int $categoryId): bool */ private function isShopsBaseCategoryPage(int $categoryId): bool { - $defaultShopCategoryId = Shopware()->Shop()->getCategory()->getId(); + $category = $this->get('shop')->getCategory(); + if (!$category instanceof Category) { + return false; + } + + $defaultShopCategoryId = $category->getId(); $queryParamsWhiteList = ['controller', 'action', 'sCategory', 'sViewport', 'rewriteUrl', 'module']; $queryParamsNames = array_keys($this->Request()->getParams()); @@ -440,7 +449,8 @@ private function isShopsBaseCategoryPage(int $categoryId): bool /** * Determines if the product listing has to be loaded/shown at all * - * @param array $emotions + * @param array> $emotions + * @param array $devicesWithEmotion */ private function hasListing(array $emotions, array $devicesWithEmotion): bool { @@ -482,7 +492,7 @@ private function hasListing(array $emotions, array $devicesWithEmotion): bool * * @param array $emotions * - * @return int[] + * @return array */ private function getDevicesWithListing(array $emotions): array { @@ -659,7 +669,9 @@ private function loadListing(array $emotionConfiguration, Request $request): boo } /** - * @param array $emotions + * @param array> $emotions + * + * @return array> */ private function filterListingEmotions(array $emotions): array { diff --git a/engine/Shopware/Core/sCategories.php b/engine/Shopware/Core/sCategories.php index 1c278ea11ac..0a34b4d64d8 100644 --- a/engine/Shopware/Core/sCategories.php +++ b/engine/Shopware/Core/sCategories.php @@ -275,7 +275,7 @@ public function sGetMainCategories() * * @param int $id Id of the category * - * @return array Array of categories in path + * @return array Array of categories in path */ public function sGetCategoriesByParent($id) { diff --git a/tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php b/tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php index c0ab8c43df7..aa6991578ad 100644 --- a/tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php +++ b/tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php @@ -1,4 +1,6 @@ Container()->get(\Doctrine\DBAL\Connection::class)->beginTransaction(); - $this->deleteCustomer(self::TEST_MAIL); - Shopware()->Container()->get(\Shopware\Components\Model\ModelManager::class)->clear(); + $this->getContainer()->get(Connection::class)->beginTransaction(); + $this->deleteCustomer(); + $this->getContainer()->get(ModelManager::class)->clear(); } protected function tearDown(): void { parent::tearDown(); - Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->rollback(); - $this->deleteCustomer(self::TEST_MAIL); - Shopware()->Container()->get(\Shopware\Components\Model\ModelManager::class)->clear(); + $this->getContainer()->get(Connection::class)->rollBack(); + $this->deleteCustomer(); + $this->getContainer()->get(ModelManager::class)->clear(); } - public function testSimpleRegistration() + public function testSimpleRegistration(): void { $this->Request()->setMethod('POST'); $this->Request()->setPost([ @@ -71,7 +75,6 @@ public function testSimpleRegistration() ]); $this->sendRequestAndAssertCustomer( - self::TEST_MAIL, [ 'firstname' => 'first name', 'lastname' => 'last name', @@ -93,7 +96,7 @@ public function testSimpleRegistration() ); } - public function testDoubleOptInRegistration() + public function testDoubleOptInRegistration(): void { $this->Request()->setMethod('POST'); $this->Request()->setPost([ @@ -103,10 +106,10 @@ public function testDoubleOptInRegistration() ], ]); - $this->sendRequestAndAssertCustomerWithDoubleOptIn(self::TEST_MAIL); + $this->sendRequestAndAssertCustomerWithDoubleOptIn(); } - public function testRegistrationWithShipping() + public function testRegistrationWithShipping(): void { $this->Request()->setMethod('POST'); $this->Request()->setPost([ @@ -120,7 +123,6 @@ public function testRegistrationWithShipping() ]); $this->sendRequestAndAssertCustomer( - self::TEST_MAIL, ['firstname' => 'first name'], ['street' => 'street'], [ @@ -137,7 +139,7 @@ public function testRegistrationWithShipping() ); } - public function testCompanyRegistration() + public function testCompanyRegistration(): void { $this->Request()->setMethod('POST'); $this->Request()->setPost([ @@ -154,7 +156,6 @@ public function testCompanyRegistration() ]); $this->sendRequestAndAssertCustomer( - self::TEST_MAIL, [ 'firstname' => 'first name', ], @@ -167,7 +168,7 @@ public function testCompanyRegistration() ); } - public function testFastRegistration() + public function testFastRegistration(): void { $this->Request()->setMethod('POST'); $this->Request()->setPost([ @@ -181,7 +182,6 @@ public function testFastRegistration() ]); $this->sendRequestAndAssertCustomer( - self::TEST_MAIL, [ 'firstname' => 'first name', 'lastname' => 'last name', @@ -198,9 +198,9 @@ public function testFastRegistration() ); } - public function testDefaultPayment() + public function testDefaultPayment(): void { - Shopware()->Session()->offsetSet('sPaymentID', 6); + $this->getContainer()->get('session')->offsetSet('sPaymentID', 6); $this->Request()->setMethod('POST'); $this->Request()->setPost([ @@ -211,7 +211,6 @@ public function testDefaultPayment() ]); $this->sendRequestAndAssertCustomer( - self::TEST_MAIL, [ 'firstname' => 'first name', 'paymentID' => 6, @@ -228,26 +227,31 @@ public function testDefaultPayment() ); } - private function sendRequestAndAssertCustomer($email, $personal, $billing = [], $shipping = []) + /** + * @param array $personal + * @param array $billing + * @param array $shipping + */ + private function sendRequestAndAssertCustomer(array $personal, array $billing = [], array $shipping = []): void { - $this->doubleOptinSet(false); + $this->doubleOptInSet(false); $response = $this->dispatch(self::SAVE_URL); static::assertEquals(302, $response->getHttpResponseCode()); static::assertStringEndsWith( '/account', - $this->getHeaderLocation($response) + $this->getHeaderLocation($response) ?? '' ); - $session = Shopware()->Container()->get('session'); - static::assertNotEmpty($session->offsetGet('sUserId')); + $session = $this->getContainer()->get('session'); + static::assertNotEmpty($session->get('sUserId')); - $customer = Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->fetchAssoc( + $customer = $this->getContainer()->get(Connection::class)->fetchAssociative( 'SELECT * FROM s_user WHERE email = :mail AND active = 1 AND doubleOptinEmailSentDate IS NULL LIMIT 1', - [':mail' => $email] + [':mail' => self::TEST_MAIL] ); - static::assertNotEmpty($customer); + static::assertIsArray($customer); if (!empty($personal)) { foreach ($personal as $key => $value) { @@ -257,99 +261,98 @@ private function sendRequestAndAssertCustomer($email, $personal, $billing = [], } if (!empty($billing)) { - $this->assertAddress($email, $billing); + $this->assertAddress(self::TEST_MAIL, $billing); } if (!empty($shipping)) { - $this->assertAddress($email, $shipping, 'shipping'); + $this->assertAddress(self::TEST_MAIL, $shipping, 'shipping'); } } - private function sendRequestAndAssertCustomerWithDoubleOptIn($email) + private function sendRequestAndAssertCustomerWithDoubleOptIn(): void { - $this->doubleOptinSet(true); + $this->doubleOptInSet(true); $this->dispatch(self::SAVE_URL); - /** @var Connection $connection */ - $connection = Shopware()->Container()->get(\Doctrine\DBAL\Connection::class); + $connection = $this->getContainer()->get(Connection::class); - $customer = $connection->fetchAssoc( + $customer = $connection->fetchAssociative( 'SELECT id, doubleOptinEmailSentDate FROM s_user WHERE email = :mail AND active = 0 AND doubleOptinEmailSentDate IS NOT NULL LIMIT 1', - [':mail' => $email] + [':mail' => self::TEST_MAIL] ); - static::assertNotEmpty($customer); + static::assertIsArray($customer); - $optin = $connection->fetchAssoc( + $optIn = $connection->fetchAssociative( 'SELECT type, data, hash FROM s_core_optin WHERE datum = :datum LIMIT 1', [':datum' => $customer['doubleOptinEmailSentDate']] ); + static::assertIsArray($optIn); - static::assertNotEmpty($optin); - static::assertEquals('swRegister', $optin['type']); - static::assertNotEmpty($optin['data']); + static::assertNotEmpty($optIn); + static::assertEquals('swRegister', $optIn['type']); + static::assertNotEmpty($optIn['data']); - $data = unserialize($optin['data']); + $data = unserialize($optIn['data']); static::assertEquals($customer['id'], $data['customerId']); - $this->sendRequestAndAssertDOIConfirmation($email, $optin['hash']); + $this->sendRequestAndAssertDOIConfirmation($optIn['hash']); } - private function sendRequestAndAssertDOIConfirmation($email, $hash) + private function sendRequestAndAssertDOIConfirmation(string $hash): void { - /** @var Connection $connection */ - $connection = Shopware()->Container()->get(\Doctrine\DBAL\Connection::class); + $connection = $this->getContainer()->get(Connection::class); // Create broken data $connection->executeQuery( 'INSERT INTO s_core_optin (type, datum, hash, data) - SELECT type, (datum - INTERVAL 1 MINUTE), CONCAT(hash,\'X\'), \'I am definitly not working\' + SELECT type, (datum - INTERVAL 1 MINUTE), CONCAT(hash,\'X\'), \'I am definitely not working\' FROM s_core_optin WHERE hash = :hash', [':hash' => $hash] ); $this->reset(); - $this->doubleOptinSet(true); + $this->doubleOptInSet(true); $this->dispatch(self::CONFIRM_URL_PREFIX . $hash); - $customer = $connection->fetchAssoc( + $customer = $connection->fetchAssociative( 'SELECT doubleOptinEmailSentDate FROM s_user WHERE email = :mail AND active = 1 AND doubleOptinEmailSentDate IS NOT NULL AND doubleOptinConfirmDate IS NOT NULL LIMIT 1', - [':mail' => $email] + [':mail' => self::TEST_MAIL] ); - static::assertNotEmpty($customer); + static::assertIsArray($customer); - $optin = $connection->fetchAssoc( + $optIn = $connection->fetchAssociative( 'SELECT * FROM s_core_optin WHERE datum = :datum LIMIT 1', [':datum' => $customer['doubleOptinEmailSentDate']] ); - static::assertEmpty($optin); + static::assertFalse($optIn); // Test broken data $this->reset(); - $this->doubleOptinSet(true); + $this->doubleOptInSet(true); $this->expectException(InvalidArgumentException::class); $this->dispatch(self::CONFIRM_URL_PREFIX . $hash . 'X'); } - private function deleteCustomer($email) + private function deleteCustomer(): void { - Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->executeQuery( + $this->getContainer()->get(Connection::class)->executeQuery( 'DELETE FROM s_user WHERE email = :mail', - [':mail' => $email] + [':mail' => self::TEST_MAIL] ); } /** - * @param array $data + * @param array $data * - * @return array + * @return array */ - private function getPersonalData($data = []) + private function getPersonalData(array $data = []): array { return array_merge([ 'salutation' => 'mr', 'customer_type' => Customer::CUSTOMER_TYPE_PRIVATE, - 'password' => 'defaultpassword', + 'password' => 'defaultPassword', 'email' => self::TEST_MAIL, 'firstname' => 'first name', 'lastname' => 'last name', @@ -357,7 +360,12 @@ private function getPersonalData($data = []) ], $data); } - private function getShippingData($data = []) + /** + * @param array $data + * + * @return array + */ + private function getShippingData(array $data = []): array { return array_merge([ 'salutation' => 'ms', @@ -372,7 +380,12 @@ private function getShippingData($data = []) ], $data); } - private function getBillingData($data = []) + /** + * @param array $data + * + * @return array + */ + private function getBillingData(array $data = []): array { return array_merge([ 'street' => 'street', @@ -384,23 +397,21 @@ private function getBillingData($data = []) } /** - * @param string $email - * @param array $data - * @param string $type + * @param array $data */ - private function assertAddress($email, $data, $type = 'billing') + private function assertAddress(string $email, array $data, string $type = 'billing'): void { $column = 'default_billing_address_id'; if ($type !== 'billing') { $column = 'default_shipping_address_id'; } - $address = Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->fetchAssoc( + $address = $this->getContainer()->get(Connection::class)->fetchAssociative( 'SELECT address.* FROM s_user_addresses address, s_user user WHERE user.' . $column . ' = address.id AND user.email = :mail', [':mail' => $email] ); - static::assertNotEmpty($address); + static::assertIsArray($address); foreach ($data as $key => $value) { static::assertArrayHasKey($key, $address); @@ -408,13 +419,9 @@ private function assertAddress($email, $data, $type = 'billing') } } - /** - * @return string|null - */ - private function getHeaderLocation(Enlight_Controller_Response_Response $response) + private function getHeaderLocation(Enlight_Controller_Response_Response $response): ?string { - $headers = $response->getHeaders(); - foreach ($headers as $header) { + foreach ($response->getHeaders() as $header) { if ($header['name'] === 'Location') { return $header['value']; } @@ -423,13 +430,8 @@ private function getHeaderLocation(Enlight_Controller_Response_Response $respons return null; } - /** - * @param bool $switch - */ - private function doubleOptinSet($switch) + private function doubleOptInSet(bool $switch): void { - Shopware()->Container()->get(\Shopware\Components\ConfigWriter::class)->save('optinregister', $switch, null, Shopware()->Shop()->getId()); - Shopware()->Container()->get(Shopware_Components_Config::class)->setShop(Shopware()->Shop()); - Shopware()->Container()->get(Zend_Cache_Core::class)->clean(); + $this->setConfig('optinregister', $switch); } } diff --git a/tests/Functional/Controllers/Backend/NewsletterTest.php b/tests/Functional/Controllers/Backend/NewsletterTest.php index 20c6af1688e..bf896108615 100644 --- a/tests/Functional/Controllers/Backend/NewsletterTest.php +++ b/tests/Functional/Controllers/Backend/NewsletterTest.php @@ -1,4 +1,6 @@ Plugins()->Backend()->Auth()->setNoAuth(); Shopware()->Plugins()->Backend()->Auth()->setNoAcl(); - /** @var string $sql */ $sql = file_get_contents(__DIR__ . '/_fixtures/newsletter/mail.sql'); static::assertIsString($sql); - Shopware()->Models()->getConnection()->exec($sql); + $this->getContainer()->get(Connection::class)->executeStatement($sql); } /** @@ -51,14 +53,18 @@ public function setUp(): void public function testNewsletterLock(): void { $this->Front()->setParam('noViewRenderer', false); - Shopware()->Config()->offsetSet('MailCampaignsPerCall', 1); + $this->setConfig('MailCampaignsPerCall', 1); $this->dispatch('/backend/newsletter/cron'); - static::assertMatchesRegularExpression('#[0-9]+ Recipients fetched#', $this->Response()->getBody()); + $responseBody = $this->Response()->getBody(); + static::assertIsString($responseBody); + static::assertMatchesRegularExpression('#\d+ Recipients fetched#', $responseBody); $this->reset(); $this->dispatch('/backend/newsletter/cron'); - static::assertMatchesRegularExpression('#Wait [0-9]+ seconds ...#', $this->Response()->getBody()); + $responseBody = $this->Response()->getBody(); + static::assertIsString($responseBody); + static::assertMatchesRegularExpression('#Wait \d+ seconds ...#', $responseBody); $this->reset(); } diff --git a/tests/Functional/Controllers/Frontend/ListingTest.php b/tests/Functional/Controllers/Frontend/ListingTest.php index df961aaf014..dc1d1bdac67 100644 --- a/tests/Functional/Controllers/Frontend/ListingTest.php +++ b/tests/Functional/Controllers/Frontend/ListingTest.php @@ -1,7 +1,6 @@ modelManager = $this->getContainer()->get(ModelManager::class); + } + /** * Test that requesting an existing category-id is successful */ public function testDispatchExistingCategory(): void { - $this->dispatch('/cat/?sCategory=14'); - static::assertEquals(200, $this->Response()->getHttpResponseCode()); + $this->dispatch(sprintf(self::CATEGORY_LINK, 14)); + static::assertSame(Response::HTTP_OK, $this->Response()->getHttpResponseCode()); } public function testDispatchExistingCategoryWithPageNotAvailable(): void { $this->expectException(Enlight_Controller_Exception::class); - $this->dispatch('/cat/?sCategory=14&sPage=2'); - static::assertEquals(200, $this->Response()->getHttpResponseCode()); + $this->dispatch(sprintf(self::CATEGORY_LINK . '&sPage=2', 14)); + static::assertSame(Response::HTTP_OK, $this->Response()->getHttpResponseCode()); } /** @@ -61,8 +73,8 @@ public function testDispatchExistingCategoryWithPageNotAvailable(): void public function testDispatchNonExistingCategory(): void { $this->expectException('Enlight_Exception'); - $this->dispatch('/cat/?sCategory=4711'); - static::assertEquals(404, $this->Response()->getHttpResponseCode()); + $this->dispatch(sprintf(self::CATEGORY_LINK, 4711)); + static::assertSame(Response::HTTP_NOT_FOUND, $this->Response()->getHttpResponseCode()); static::assertTrue($this->Response()->isRedirect()); } @@ -72,8 +84,8 @@ public function testDispatchNonExistingCategory(): void public function testDispatchEmptyCategoryId(): void { $this->expectException('Enlight_Exception'); - $this->dispatch('/cat/?sCategory='); - static::assertEquals(404, $this->Response()->getHttpResponseCode()); + $this->dispatch(sprintf(self::CATEGORY_LINK, '')); + static::assertSame(Response::HTTP_NOT_FOUND, $this->Response()->getHttpResponseCode()); static::assertTrue($this->Response()->isRedirect()); } @@ -83,8 +95,8 @@ public function testDispatchEmptyCategoryId(): void public function testDispatchSubshopCategoryId(): void { $this->expectException('Enlight_Exception'); - $this->dispatch('/cat/?sCategory=43'); - static::assertEquals(404, $this->Response()->getHttpResponseCode()); + $this->dispatch(sprintf(self::CATEGORY_LINK, 43)); + static::assertSame(Response::HTTP_NOT_FOUND, $this->Response()->getHttpResponseCode()); static::assertTrue($this->Response()->isRedirect()); } @@ -94,9 +106,56 @@ public function testDispatchSubshopCategoryId(): void public function testDispatchBlogCategory(): void { $this->expectException('Enlight_Exception'); - $this->dispatch('/cat/?sCategory=17'); - static::assertEquals(404, $this->Response()->getHttpResponseCode()); + $this->dispatch(sprintf(self::CATEGORY_LINK, 17)); + static::assertSame(Response::HTTP_NOT_FOUND, $this->Response()->getHttpResponseCode()); + static::assertTrue($this->Response()->isRedirect()); + } + + public function testExternalLink(): void + { + $externalLink = 'https://www.google.com'; + + $category = $this->createNewCategory(); + $category->setExternal($externalLink); + $this->modelManager->persist($category); + $this->modelManager->flush($category); + + $this->dispatch(sprintf(self::CATEGORY_LINK, $category->getId())); + + static::assertSame(Response::HTTP_MOVED_PERMANENTLY, $this->Response()->getHttpResponseCode()); static::assertTrue($this->Response()->isRedirect()); + + static::assertStringContainsString($externalLink, $this->Response()->getHeader('location')); + } + + public function testCategoryRedirectToProductDetailPageDirectly(): void + { + $this->setConfig('categoryDetailLink', true); + + $category = $this->createNewCategory(); + $this->modelManager->persist($category); + $this->modelManager->flush($category); + + $product = $this->modelManager->getRepository(Product::class)->findOneBy(['active' => true]); + static::assertInstanceOf(Product::class, $product); + + $productCategories = $product->getCategories(); + $productCategories->add($category); + $product->setCategories($productCategories); + + $this->modelManager->persist($product); + $this->modelManager->flush($product); + $this->modelManager->clear(); + + $this->dispatch(sprintf(self::CATEGORY_LINK, $category->getId())); + + static::assertSame(Response::HTTP_MOVED_PERMANENTLY, $this->Response()->getHttpResponseCode()); + static::assertTrue($this->Response()->isRedirect()); + + $firstSpace = strpos($product->getName(), ' '); + static::assertIsInt($firstSpace); + $firstPartOfProductName = strtolower(substr($product->getName(), 0, $firstSpace)); + static::assertStringContainsString($firstPartOfProductName, $this->Response()->getHeader('location')); } /** @@ -111,9 +170,9 @@ public function testHomeRedirect(): void static::assertInstanceOf(Category::class, $mainCategory); $mainCategoryId = $mainCategory->getId(); - $this->dispatch(sprintf('/cat/index/sCategory/%s', $mainCategoryId)); + $this->dispatch(sprintf(self::CATEGORY_LINK, $mainCategoryId)); - static::assertEquals(301, $this->Response()->getHttpResponseCode()); + static::assertSame(Response::HTTP_MOVED_PERMANENTLY, $this->Response()->getHttpResponseCode()); } public function testManufacturerPage(): void @@ -158,11 +217,24 @@ public function testCategoryWithProductStream(): void $connection->executeStatement($createCategoryWithStreamSQL, ['streamId' => $streamId]); $categoryId = (int) $connection->lastInsertId(); - $this->dispatch(sprintf('/cat/?sCategory=%d', $categoryId)); + $this->dispatch(sprintf(self::CATEGORY_LINK, $categoryId)); - static::assertEquals(200, $this->Response()->getHttpResponseCode()); + static::assertSame(Response::HTTP_OK, $this->Response()->getHttpResponseCode()); $responseBody = $this->Response()->getBody(); static::assertIsString($responseBody); static::assertStringContainsString('filter-panel--content', $responseBody, 'No filters available in the HTML'); } + + private function createNewCategory(): Category + { + $mainCategory = $this->modelManager->find(Category::class, 3); + static::assertInstanceOf(Category::class, $mainCategory); + + $category = new Category(); + $category->setName('Test'); + $category->setParent($mainCategory); + $category->setActive(true); + + return $category; + } } From 4b3a5c5aa56a486112d9773fbed089710eefd709 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 8 Jun 2022 10:20:21 +0200 Subject: [PATCH 037/730] SW-26685 - Fix HasPseudoPriceConditionHandler to consider customer group specific prices correctly --- .../HasPseudoPriceConditionHandler.php | 31 ++++- .../DependencyInjection/services.xml | 1 + ...sPseudoPriceConditionCustomerGroupTest.php | 126 ++++++++++++++++++ .../Bundle/StoreFrontBundle/TestContext.php | 6 +- 4 files changed, 157 insertions(+), 7 deletions(-) create mode 100644 tests/Functional/Bundle/SearchBundle/Condition/HasPseudoPriceConditionCustomerGroupTest.php diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/HasPseudoPriceConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/HasPseudoPriceConditionHandler.php index 2fe33bd677e..9dd05bce2f0 100644 --- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/HasPseudoPriceConditionHandler.php +++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/HasPseudoPriceConditionHandler.php @@ -1,4 +1,6 @@ listingPriceSwitcher = $listingPriceSwitcher; $this->variantHelper = $variantHelper; + $this->listingPriceHelper = $listingPriceHelper; } /** @@ -75,7 +84,7 @@ public function generateCondition( if (!$query->hasState(self::STATE_INCLUDES_PSEUDO_PRICE_VARIANTS)) { if (empty($conditions)) { $this->variantHelper->joinVariants($query); - $query->leftJoin('allVariants', 's_articles_prices', 'variantPrices', 'variantPrices.articledetailsID = allVariants.id'); + $this->joinPrices($query, $context); $query->andWhere('variantPrices.pseudoprice > 0'); } else { $this->listingPriceSwitcher->joinPrice($query, $this->criteria, $context); @@ -89,4 +98,20 @@ public function setCriteria(Criteria $criteria) { $this->criteria = $criteria; } + + private function joinPrices(QueryBuilder $query, ShopContextInterface $context): void + { + $priceTable = $this->listingPriceHelper->getPriceTable($context); + $query->innerJoin( + 'allVariants', + '(' . $priceTable->getSQL() . ')', + 'variantPrices', + 'variantPrices.articledetailsID = allVariants.id' + ); + + $query->setParameter(':fallbackCustomerGroup', $context->getFallbackCustomerGroup()->getKey()); + if ($context->getCurrentCustomerGroup()->getId() !== $context->getFallbackCustomerGroup()->getId()) { + $query->setParameter(':currentCustomerGroup', $context->getCurrentCustomerGroup()->getKey()); + } + } } diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/DependencyInjection/services.xml b/engine/Shopware/Bundle/SearchBundleDBAL/DependencyInjection/services.xml index 35de7204506..eed4e1b2165 100644 --- a/engine/Shopware/Bundle/SearchBundleDBAL/DependencyInjection/services.xml +++ b/engine/Shopware/Bundle/SearchBundleDBAL/DependencyInjection/services.xml @@ -147,6 +147,7 @@ + diff --git a/tests/Functional/Bundle/SearchBundle/Condition/HasPseudoPriceConditionCustomerGroupTest.php b/tests/Functional/Bundle/SearchBundle/Condition/HasPseudoPriceConditionCustomerGroupTest.php new file mode 100644 index 00000000000..1c41d1206e7 --- /dev/null +++ b/tests/Functional/Bundle/SearchBundle/Condition/HasPseudoPriceConditionCustomerGroupTest.php @@ -0,0 +1,126 @@ + $expectedNumber + */ + public function testPseudoPriceOnlyAvailableForSpecificCustomerGroup( + bool $hasCurrentCustomerGroupPseudoPrice, + bool $hasFallbackCustomerGroupPseudoPrice, + array $expectedNumber + ): void { + $context = $this->getContext(); + $fallbackCustomerGroup = $this->converter->convertCustomerGroup($this->helper->createCustomerGroup(['key' => self::FALLBACK_CUSTOMER_GROUP])); + $context->setFallbackCustomerGroup($fallbackCustomerGroup); + $this->search( + [ + self::PRODUCT_NUMBER => compact('hasCurrentCustomerGroupPseudoPrice', 'hasFallbackCustomerGroupPseudoPrice'), + ], + $expectedNumber, + null, + [new HasPseudoPriceCondition()], + [], + [], + $context + ); + } + + public function customerGroupPseudoPrices(): Generator + { + yield 'No customer group has pseudo price' => [ + false, + false, + [], + ]; + yield 'Only current customer group has pseudo price' => [ + true, + false, + [self::PRODUCT_NUMBER], + ]; + yield 'Only fallback customer group has pseudo price' => [ + false, + true, + [], + ]; + yield 'Current and fallback customer groups have pseudo price' => [ + true, + true, + [self::PRODUCT_NUMBER], + ]; + } + + protected function getProduct( + string $number, + ShopContext $context, + Category $category = null, + $additionally = [] + ): array { + static::assertIsArray($additionally); + + $product = parent::getProduct($number, $context, $category, $additionally); + + $currentCustomerGroupPrice = [ + 'from' => 1, + 'to' => 'beliebig', + 'price' => 7, + 'customerGroupKey' => self::CURRENT_CUSTOMER_GROUP, + 'pseudoPrice' => $additionally['hasCurrentCustomerGroupPseudoPrice'] ? 10 : 0, + ]; + $fallbackCustomerGroupPrice = [ + 'from' => 1, + 'to' => 'beliebig', + 'price' => 8, + 'customerGroupKey' => self::FALLBACK_CUSTOMER_GROUP, + 'pseudoPrice' => $additionally['hasFallbackCustomerGroupPseudoPrice'] ? 10 : 0, + ]; + $product['mainDetail']['prices'] = [ + $currentCustomerGroupPrice, + $fallbackCustomerGroupPrice, + ]; + + return $product; + } +} diff --git a/tests/Functional/Bundle/StoreFrontBundle/TestContext.php b/tests/Functional/Bundle/StoreFrontBundle/TestContext.php index 6b024de611d..b4cf38ad210 100644 --- a/tests/Functional/Bundle/StoreFrontBundle/TestContext.php +++ b/tests/Functional/Bundle/StoreFrontBundle/TestContext.php @@ -58,14 +58,12 @@ public function setCurrency(Currency $currency): void $this->currency = $currency; } - public function setCurrentCustomerGroup( - Group $currentCustomerGroup): void + public function setCurrentCustomerGroup(Group $currentCustomerGroup): void { $this->currentCustomerGroup = $currentCustomerGroup; } - public function setFallbackCustomerGroup( - Group $fallbackCustomerGroup): void + public function setFallbackCustomerGroup(Group $fallbackCustomerGroup): void { $this->fallbackCustomerGroup = $fallbackCustomerGroup; } From a14921a6340ece4b9abe0bccb46ba6594beff3ac Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Tue, 7 Jun 2022 10:06:49 +0200 Subject: [PATCH 038/730] SW-26637 - Fix using of the voucher module if PHP8.1 is used --- tests/phpunit.xml.dist | 3 +- tests/phpunit_unit.xml.dist | 28 +++++++++---------- .../backend/voucher/view/voucher/list.js | 1 + 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml.dist index 7c7b852de8b..752c7e0f2a6 100644 --- a/tests/phpunit.xml.dist +++ b/tests/phpunit.xml.dist @@ -11,10 +11,11 @@ ../engine/Shopware/ + ../engine/Library/Enlight/ ../engine/Shopware/Plugins/Community - ../engine/Shopware/Components/Xml + ../engine/Shopware/Plugins/Local diff --git a/tests/phpunit_unit.xml.dist b/tests/phpunit_unit.xml.dist index 298738258c6..de26d28aa43 100644 --- a/tests/phpunit_unit.xml.dist +++ b/tests/phpunit_unit.xml.dist @@ -9,18 +9,18 @@ beStrictAboutOutputDuringTests="true" beStrictAboutTodoAnnotatedTests="true" verbose="true"> - - - ../engine/Shopware/ - ../engine/Library/Enlight/ - - - - - - - - ./Unit - - + + + ../engine/Shopware/ + ../engine/Library/Enlight/ + + + + + + + + ./Unit + + diff --git a/themes/Backend/ExtJs/backend/voucher/view/voucher/list.js b/themes/Backend/ExtJs/backend/voucher/view/voucher/list.js index 0e61cf9bb57..a675584bf21 100644 --- a/themes/Backend/ExtJs/backend/voucher/view/voucher/list.js +++ b/themes/Backend/ExtJs/backend/voucher/view/voucher/list.js @@ -327,6 +327,7 @@ Ext.define('Shopware.apps.Voucher.view.voucher.List', { * @param value */ valueRenderer: function (value, p, r) { + value = String(value); if (r.data.percental == 1){ return value.replace(/[.,]/, Ext.util.Format.decimalSeparator) + " %"; } From 543a4b0be5799b0db825ac3350f6253172553944 Mon Sep 17 00:00:00 2001 From: Elias Lackner Date: Thu, 9 Jun 2022 09:25:54 +0200 Subject: [PATCH 039/730] SW-26453 - Fix translation update API fixes https://github.com/shopware/shopware/pull/2500 --- engine/Shopware/Components/Api/Resource/Translation.php | 1 - 1 file changed, 1 deletion(-) diff --git a/engine/Shopware/Components/Api/Resource/Translation.php b/engine/Shopware/Components/Api/Resource/Translation.php index 3aa651450dc..00a614040b0 100644 --- a/engine/Shopware/Components/Api/Resource/Translation.php +++ b/engine/Shopware/Components/Api/Resource/Translation.php @@ -432,7 +432,6 @@ protected function saveTranslation(array $data) $existing = []; } else { $existing['data'] = unserialize($existing['data'], ['allowed_classes' => false]); - $this->delete($data['key'], $data); } $data = array_replace_recursive( From b74eedc355f35c4a4cce40da24ad42ce493d4830 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Fri, 10 Jun 2022 10:35:02 +0200 Subject: [PATCH 040/730] SW-26736 - Update guzzle dependencies --- UPGRADE-5.7.md | 3 ++- composer.json | 4 ++-- composer.lock | 28 ++++++++++++++-------------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 0fb61a17120..8237f678fbb 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -25,7 +25,8 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `elasticsearch/elasticsearch` to version 7.17.0 * Updated `friendsofphp/proxy-manager-lts` to version 1.0.12 * Updated `google/cloud-storage` to version 1.27.1 -* Updated `guzzlehttp/guzzle` to version 7.4.2 +* Updated `guzzlehttp/guzzle` to version 7.4.4 +* Updated `guzzlehttp/psr7` to version 2.3.0 * Updated `laminas/laminas-escaper` to version 2.10.0 * Updated `monolog/monolog` to version 2.6.0 * Updated `mpdf/mpdf` to version 8.1.1 diff --git a/composer.json b/composer.json index 401c1f8436f..2ab564bfa67 100644 --- a/composer.json +++ b/composer.json @@ -52,8 +52,8 @@ "fig/link-util": "1.1.2", "friendsofphp/proxy-manager-lts": "1.0.12", "google/cloud-storage": "1.27.1", - "guzzlehttp/guzzle": "7.4.3", - "guzzlehttp/psr7": "2.2.1", + "guzzlehttp/guzzle": "~7.4.4", + "guzzlehttp/psr7": "2.3.0", "laminas/laminas-code": "4.5.1", "laminas/laminas-escaper": "2.10.0", "league/flysystem": "~1.1.4", diff --git a/composer.lock b/composer.lock index 34b945a6cdd..82508481626 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": "6ba0011c11fa8435a00814e37c91dc78", + "content-hash": "41e35b633a6658b1eaf0dc5b8809ab3d", "packages": [ { "name": "aws/aws-crt-php", @@ -2071,16 +2071,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.4.3", + "version": "7.4.4", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab" + "reference": "e3ff079b22820c2029d4c2a87796b6a0b8716ad8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/74a8602c6faec9ef74b7a9391ac82c5e65b1cdab", - "reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/e3ff079b22820c2029d4c2a87796b6a0b8716ad8", + "reference": "e3ff079b22820c2029d4c2a87796b6a0b8716ad8", "shasum": "" }, "require": { @@ -2175,7 +2175,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.4.3" + "source": "https://github.com/guzzle/guzzle/tree/7.4.4" }, "funding": [ { @@ -2191,7 +2191,7 @@ "type": "tidelift" } ], - "time": "2022-05-25T13:24:33+00:00" + "time": "2022-06-09T21:39:15+00:00" }, { "name": "guzzlehttp/promises", @@ -2279,16 +2279,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "2.2.1", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "c94a94f120803a18554c1805ef2e539f8285f9a2" + "reference": "83260bb50b8fc753c72d14dc1621a2dac31877ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/c94a94f120803a18554c1805ef2e539f8285f9a2", - "reference": "c94a94f120803a18554c1805ef2e539f8285f9a2", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/83260bb50b8fc753c72d14dc1621a2dac31877ee", + "reference": "83260bb50b8fc753c72d14dc1621a2dac31877ee", "shasum": "" }, "require": { @@ -2312,7 +2312,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.3-dev" } }, "autoload": { @@ -2374,7 +2374,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.2.1" + "source": "https://github.com/guzzle/psr7/tree/2.3.0" }, "funding": [ { @@ -2390,7 +2390,7 @@ "type": "tidelift" } ], - "time": "2022-03-20T21:55:58+00:00" + "time": "2022-06-09T08:26:02+00:00" }, { "name": "laminas/laminas-code", From b0f132a771845823f14023e38822a8c96a380df3 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Fri, 10 Jun 2022 10:49:41 +0200 Subject: [PATCH 041/730] SW-26736 - Update monolog dependency and third party dependencies --- UPGRADE-5.7.md | 3 +- composer.json | 2 +- composer.lock | 59 ++++++++++++++------------- engine/Shopware/Components/Logger.php | 5 ++- 4 files changed, 36 insertions(+), 33 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 8237f678fbb..3f184806709 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -11,6 +11,7 @@ This changelog references changes done in Shopware 5.7 patch versions. ### Additions * Added missing dependency `doctrine/annotations`, which was an indirect dependency before +* Added new optional parameter `dateTime` to `\Shopware\Components\Logger::addRecord` method to be compatible with parent `\Monolog\Logger::addRecord` method ### Changes @@ -28,7 +29,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `guzzlehttp/guzzle` to version 7.4.4 * Updated `guzzlehttp/psr7` to version 2.3.0 * Updated `laminas/laminas-escaper` to version 2.10.0 -* Updated `monolog/monolog` to version 2.6.0 +* Updated `monolog/monolog` to version 2.7.0 * Updated `mpdf/mpdf` to version 8.1.1 * Updated `phpunit/phpunit` to version 9.5.20 * Updated `symfony/browser-kit` to version 4.4.37 diff --git a/composer.json b/composer.json index 2ab564bfa67..111400e8561 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,7 @@ "laminas/laminas-escaper": "2.10.0", "league/flysystem": "~1.1.4", "league/flysystem-aws-s3-v3": "1.0.29", - "monolog/monolog": "2.6.0", + "monolog/monolog": "2.7.0", "mpdf/mpdf": "8.1.1", "ongr/elasticsearch-dsl": "7.2.2", "psr/link": "1.0.0", diff --git a/composer.lock b/composer.lock index 82508481626..c91936db8ab 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": "41e35b633a6658b1eaf0dc5b8809ab3d", + "content-hash": "04af69417e3a2d261d9f0c8ea6c5854c", "packages": [ { "name": "aws/aws-crt-php", @@ -58,16 +58,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.224.2", + "version": "3.225.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "a2e6461261a92570128e6c2b6fb1896f3d16b424" + "reference": "b795c9c14997dac771f66d1f6cbadb62c742373a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a2e6461261a92570128e6c2b6fb1896f3d16b424", - "reference": "a2e6461261a92570128e6c2b6fb1896f3d16b424", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/b795c9c14997dac771f66d1f6cbadb62c742373a", + "reference": "b795c9c14997dac771f66d1f6cbadb62c742373a", "shasum": "" }, "require": { @@ -143,9 +143,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.224.2" + "source": "https://github.com/aws/aws-sdk-php/tree/3.225.1" }, - "time": "2022-06-01T18:17:06+00:00" + "time": "2022-06-09T18:19:43+00:00" }, { "name": "bcremer/line-reader", @@ -1905,21 +1905,21 @@ }, { "name": "google/cloud-core", - "version": "v1.45.0", + "version": "v1.46.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-cloud-php-core.git", - "reference": "28181b5ec2d40e9c9cdf2085096b33bac1f237fd" + "reference": "784a1d361c7dbc5de133feac590f549798c80f5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/28181b5ec2d40e9c9cdf2085096b33bac1f237fd", - "reference": "28181b5ec2d40e9c9cdf2085096b33bac1f237fd", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/784a1d361c7dbc5de133feac590f549798c80f5e", + "reference": "784a1d361c7dbc5de133feac590f549798c80f5e", "shasum": "" }, "require": { "google/auth": "^1.18", - "guzzlehttp/guzzle": "^5.3|^6.0|^7.0", + "guzzlehttp/guzzle": "^5.3|^6.5.6|^7.4.3", "guzzlehttp/promises": "^1.3", "guzzlehttp/psr7": "^1.7|^2.0", "monolog/monolog": "^1.1|^2.0", @@ -1932,7 +1932,7 @@ "google/common-protos": "^1.0||^2.0", "google/gax": "^1.9", "opis/closure": "^3", - "phpdocumentor/reflection": "^3.0", + "phpdocumentor/reflection": "^3.0||^4.0", "phpunit/phpunit": "^4.8|^5.0|^8.0", "squizlabs/php_codesniffer": "2.*", "yoast/phpunit-polyfills": "^1.0" @@ -1964,9 +1964,9 @@ ], "description": "Google Cloud PHP shared dependency, providing functionality useful to all components.", "support": { - "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.45.0" + "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.46.0" }, - "time": "2022-05-13T22:51:50+00:00" + "time": "2022-06-02T21:53:43+00:00" }, { "name": "google/cloud-storage", @@ -2723,16 +2723,16 @@ }, { "name": "monolog/monolog", - "version": "2.6.0", + "version": "2.7.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "247918972acd74356b0a91dfaa5adcaec069b6c0" + "reference": "5579edf28aee1190a798bfa5be8bc16c563bd524" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/247918972acd74356b0a91dfaa5adcaec069b6c0", - "reference": "247918972acd74356b0a91dfaa5adcaec069b6c0", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5579edf28aee1190a798bfa5be8bc16c563bd524", + "reference": "5579edf28aee1190a798bfa5be8bc16c563bd524", "shasum": "" }, "require": { @@ -2811,7 +2811,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.6.0" + "source": "https://github.com/Seldaek/monolog/tree/2.7.0" }, "funding": [ { @@ -2823,7 +2823,7 @@ "type": "tidelift" } ], - "time": "2022-05-10T09:36:00+00:00" + "time": "2022-06-09T08:59:12+00:00" }, { "name": "mpdf/mpdf", @@ -4470,6 +4470,7 @@ "type": "tidelift" } ], + "abandoned": "symfony/error-handler", "time": "2022-04-12T15:19:55+00:00" }, { @@ -10331,21 +10332,21 @@ }, { "name": "webmozart/assert", - "version": "1.10.0", + "version": "1.11.0", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25" + "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991", + "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", - "symfony/polyfill-ctype": "^1.8" + "ext-ctype": "*", + "php": "^7.2 || ^8.0" }, "conflict": { "phpstan/phpstan": "<0.12.20", @@ -10383,9 +10384,9 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.10.0" + "source": "https://github.com/webmozarts/assert/tree/1.11.0" }, - "time": "2021-03-09T10:59:23+00:00" + "time": "2022-06-03T18:03:27+00:00" } ], "aliases": [], diff --git a/engine/Shopware/Components/Logger.php b/engine/Shopware/Components/Logger.php index 0523d5f6931..410c7ffb370 100644 --- a/engine/Shopware/Components/Logger.php +++ b/engine/Shopware/Components/Logger.php @@ -24,6 +24,7 @@ namespace Shopware\Components; +use Monolog\DateTimeImmutable; use Monolog\Logger as BaseLogger; class Logger extends BaseLogger @@ -49,10 +50,10 @@ public function trace($label) $this->log(BaseLogger::DEBUG, $label, ['trace' => true]); } - public function addRecord(int $level, string $message, array $context = []): bool + public function addRecord(int $level, string $message, array $context = [], DateTimeImmutable $datetime = null): bool { $message = str_replace(['[', ']'], ['(', ')'], $message); - return parent::addRecord($level, $message, $context); + return parent::addRecord($level, $message, $context, $datetime); } } From 437c021cbdd17036aef184fd25da2b622e648df7 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 9 Jun 2022 15:53:29 +0200 Subject: [PATCH 042/730] SW-26453 - Improve code quality, refactor and fix translation API resource test --- .phpstan-baseline.neon | 60 -- .../Components/Api/BatchInterface.php | 6 +- .../Components/Api/Resource/Article.php | 5 - .../Components/Api/Resource/Cache.php | 3 - .../Components/Api/Resource/Translation.php | 53 +- .../Components/Api/Resource/Variant.php | 5 - .../Components/Model/ModelRepository.php | 4 +- .../Components/Model/QueryBuilder.php | 2 +- .../Components/Api/TranslationTest.php | 550 ++++++++++-------- 9 files changed, 337 insertions(+), 351 deletions(-) diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index c583c197533..d9426cf3d0c 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -13905,11 +13905,6 @@ parameters: count: 1 path: engine/Shopware/Components/AddLinkHeaderSubscriber.php - - - message: "#^Method Shopware\\\\Components\\\\Api\\\\BatchInterface\\:\\:getIdByData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Components/Api/BatchInterface.php - - message: "#^Cannot call method setAcl\\(\\) on object\\|null\\.$#" count: 1 @@ -14080,11 +14075,6 @@ parameters: count: 1 path: engine/Shopware/Components/Api/Resource/Article.php - - - message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:getIdByData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Components/Api/Resource/Article.php - - message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:getList\\(\\) has parameter \\$criteria with no value type specified in iterable type array\\.$#" count: 1 @@ -14420,11 +14410,6 @@ parameters: count: 1 path: engine/Shopware/Components/Api/Resource/Cache.php - - - message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Cache\\:\\:getIdByData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Components/Api/Resource/Cache.php - - message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Cache\\:\\:getList\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -15125,21 +15110,6 @@ parameters: count: 1 path: engine/Shopware/Components/Api/Resource/Shop.php - - - message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Translation\\:\\:checkRequirements\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Components/Api/Resource/Translation.php - - - - message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Translation\\:\\:checkRequirements\\(\\) has parameter \\$checkData with no type specified\\.$#" - count: 1 - path: engine/Shopware/Components/Api/Resource/Translation.php - - - - message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Translation\\:\\:checkRequirements\\(\\) has parameter \\$data with no type specified\\.$#" - count: 1 - path: engine/Shopware/Components/Api/Resource/Translation.php - - message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Translation\\:\\:create\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 @@ -15160,31 +15130,16 @@ parameters: count: 1 path: engine/Shopware/Components/Api/Resource/Translation.php - - - message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Translation\\:\\:getIdByData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Components/Api/Resource/Translation.php - - message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Translation\\:\\:getObjectTranslation\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 path: engine/Shopware/Components/Api/Resource/Translation.php - - - message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Translation\\:\\:getRepository\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Components/Api/Resource/Translation.php - - message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Translation\\:\\:saveTranslation\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 path: engine/Shopware/Components/Api/Resource/Translation.php - - - message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Translation\\:\\:setTranslationComponent\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Components/Api/Resource/Translation.php - - message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Translation\\:\\:update\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 @@ -15195,11 +15150,6 @@ parameters: count: 1 path: engine/Shopware/Components/Api/Resource/Translation.php - - - message: "#^Property Shopware\\\\Components\\\\Api\\\\Resource\\\\Translation\\:\\:\\$repository with generic class Doctrine\\\\ORM\\\\EntityRepository does not specify its types\\: TEntityClass$#" - count: 1 - path: engine/Shopware/Components/Api/Resource/Translation.php - - message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\User\\:\\:create\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#" count: 1 @@ -15325,11 +15275,6 @@ parameters: count: 1 path: engine/Shopware/Components/Api/Resource/Variant.php - - - message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:getIdByData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Components/Api/Resource/Variant.php - - message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:getList\\(\\) has parameter \\$criteria with no value type specified in iterable type array\\.$#" count: 1 @@ -42230,11 +42175,6 @@ parameters: count: 1 path: tests/Functional/Components/Api/PropertyGroupTest.php - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\TranslationTest\\:\\:getDummyData\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: tests/Functional/Components/Api/TranslationTest.php - - message: "#^Cannot access offset 'configuratorOptions' on array\\|Shopware\\\\Models\\\\Article\\\\Detail\\.$#" count: 2 diff --git a/engine/Shopware/Components/Api/BatchInterface.php b/engine/Shopware/Components/Api/BatchInterface.php index a507cad75df..8bd48b55c2d 100644 --- a/engine/Shopware/Components/Api/BatchInterface.php +++ b/engine/Shopware/Components/Api/BatchInterface.php @@ -38,10 +38,10 @@ interface BatchInterface * If your resource supports other kinds of IDs, too, you should identify * your entity by these IDs and return the primary ID of that entity. * - * @param array $data + * @param array $data * - * @return int|bool Return the primary ID of the entity, if it exists - * Return false, if no existing entity matches $data + * @return int|false Return the primary ID of the entity, if it exists + * Return false, if no existing entity matches $data */ public function getIdByData($data); } diff --git a/engine/Shopware/Components/Api/Resource/Article.php b/engine/Shopware/Components/Api/Resource/Article.php index 98138e00dd1..faebde22838 100644 --- a/engine/Shopware/Components/Api/Resource/Article.php +++ b/engine/Shopware/Components/Api/Resource/Article.php @@ -657,11 +657,6 @@ public function writeTranslations($articleId, $translations) } } - /** - * Returns the primary ID of any data set. - * - * {@inheritdoc} - */ public function getIdByData($data) { $id = null; diff --git a/engine/Shopware/Components/Api/Resource/Cache.php b/engine/Shopware/Components/Api/Resource/Cache.php index 697c75f592f..e3cbe177c97 100644 --- a/engine/Shopware/Components/Api/Resource/Cache.php +++ b/engine/Shopware/Components/Api/Resource/Cache.php @@ -130,9 +130,6 @@ public function delete($id) return true; } - /** - * {@inheritdoc} - */ public function getIdByData($data) { return $data['id'] ?? false; diff --git a/engine/Shopware/Components/Api/Resource/Translation.php b/engine/Shopware/Components/Api/Resource/Translation.php index 00a614040b0..f126120f20c 100644 --- a/engine/Shopware/Components/Api/Resource/Translation.php +++ b/engine/Shopware/Components/Api/Resource/Translation.php @@ -25,13 +25,14 @@ namespace Shopware\Components\Api\Resource; use Doctrine\ORM\AbstractQuery; -use Doctrine\ORM\EntityRepository; +use Doctrine\ORM\Query; use Exception; use Shopware\Components\Api\BatchInterface; use Shopware\Components\Api\Exception\CustomValidationException; use Shopware\Components\Api\Exception\NotFoundException; use Shopware\Components\Api\Exception\ParameterMissingException; use Shopware\Components\Model\Exception\ModelNotFoundException; +use Shopware\Components\Model\ModelRepository; use Shopware\Components\Model\QueryBuilder; use Shopware\Models\Article\Configurator\Group as ConfiguratorGroup; use Shopware\Models\Article\Configurator\Option as ConfiguratorOption; @@ -73,7 +74,7 @@ class Translation extends Resource implements BatchInterface protected $translationWriter; /** - * @var EntityRepository|null + * @var ModelRepository|null */ protected $repository; @@ -87,17 +88,6 @@ public function __construct(Shopware_Components_Translation $translationComponen $this->translationComponent = $translationComponent ?: Shopware()->Container()->get(Shopware_Components_Translation::class); } - /** - * This methods needs to return an ID for the current resource. - * The ID needs to be the primary ID of the resource (in most cases `id`). - * If your resource supports other kinds of IDs, too, you should identify - * your entity by these IDs and return the primary ID of that entity. - * - * @param array $data - * - * @return int|bool Return the primary ID of the entity, if it exists - * Return false, if no existing entity matches $data - */ public function getIdByData($data) { if ($data['useNumberAsId']) { @@ -120,6 +110,8 @@ public function getTranslationComponent() /** * @param Shopware_Components_Translation $translationWriter + * + * @return void */ public function setTranslationComponent($translationWriter) { @@ -184,12 +176,12 @@ public function create(array $data) { $this->checkPrivilege('create'); - $this->checkRequirements($data); - - if (!isset($data['key']) || empty($data['key'])) { - throw new ParameterMissingException('The parameter key is required for a object translation.'); + if (empty($data['key'])) { + throw new ParameterMissingException('The parameter key is required for an object translation.'); } + $this->checkRequirements($data); + return $this->saveTranslation($data); } @@ -375,6 +367,9 @@ public function deleteByNumber($number, $data) return $this->delete($id, $data); } + /** + * @return ModelRepository + */ protected function getRepository() { if ($this->repository === null) { @@ -455,6 +450,8 @@ protected function saveTranslation(array $data) if (!$translation instanceof TranslationModel) { throw new ModelNotFoundException(TranslationModel::class, $data['key'], 'key'); } + // The model needs to be refreshed after reading, otherwise it will not load the updated translation correctly + $this->getManager()->refresh($translation); return $translation; } @@ -462,10 +459,10 @@ protected function saveTranslation(array $data) /** * Helper function which returns a language translation for a single object type. * - * @param string $type - Type of the translatable object, see class constants - * @param int $key - Identifier of the translatable object. (s_articles.id) - * @param int $shopId - Identifier of the shop object. (s_core_shops.id) - * @param int $resultMode - Flag which handles the return value between array and \Shopware\Models\Translation\Translation + * @param string $type - Type of the translatable object, see class constants + * @param int $key - Identifier of the translatable object. (s_articles.id) + * @param int $shopId - Identifier of the shop object. (s_core_shops.id) + * @param AbstractQuery::HYDRATE_* $resultMode - Flag which handles the return value between array and \Shopware\Models\Translation\Translation * * @return array|TranslationModel|null */ @@ -908,7 +905,7 @@ protected function getConfiguratorOptionIdByNumber($number) { $numbers = explode('|', $number); - if (\count($numbers) < 2) { + if (!\is_array($numbers) || \count($numbers) < 2) { throw new CustomValidationException(sprintf('Passed configurator option name %s contains not the full path: group|option', $number)); } @@ -933,9 +930,15 @@ protected function getConfiguratorOptionIdByNumber($number) return $option->getId(); } + /** + * @param array $data + * @param bool $checkData + * + * @return void + */ protected function checkRequirements($data, $checkData = true) { - if (!isset($data['type']) || empty($data['type'])) { + if (empty($data['type'])) { throw new ParameterMissingException('Passed translation contains no object type'); } @@ -944,8 +947,8 @@ protected function checkRequirements($data, $checkData = true) } if ($checkData) { - if (!isset($data['data']) || empty($data['data'])) { - throw new ParameterMissingException('The parameter data is required for a object translation'); + if (empty($data['data'])) { + throw new ParameterMissingException('The parameter data is required for an object translation'); } if (!\is_array($data['data'])) { diff --git a/engine/Shopware/Components/Api/Resource/Variant.php b/engine/Shopware/Components/Api/Resource/Variant.php index 12a821aa575..e01aca7012a 100644 --- a/engine/Shopware/Components/Api/Resource/Variant.php +++ b/engine/Shopware/Components/Api/Resource/Variant.php @@ -428,11 +428,6 @@ public function createImageMappingForOptions($options, Image $image) return $mapping; } - /** - * Returns the primary ID of any data set. - * - * {@inheritdoc} - */ public function getIdByData($data) { $id = null; diff --git a/engine/Shopware/Components/Model/ModelRepository.php b/engine/Shopware/Components/Model/ModelRepository.php index f46aba30aaf..031f1893571 100644 --- a/engine/Shopware/Components/Model/ModelRepository.php +++ b/engine/Shopware/Components/Model/ModelRepository.php @@ -34,11 +34,11 @@ * These standard function must later be implemented in the various models. * * - * $modelRepository = new Shopware\Components\Models\ModelRepository; + * $modelRepository = new \Shopware\Components\Models\ModelRepository(); * $modelRepository->createQueryBuilder(); * * - * @template TEntityClass of object + * @template TEntityClass of ModelEntity * @extends EntityRepository */ class ModelRepository extends EntityRepository implements Enlight_Hook diff --git a/engine/Shopware/Components/Model/QueryBuilder.php b/engine/Shopware/Components/Model/QueryBuilder.php index f990c002363..bb2585749e1 100644 --- a/engine/Shopware/Components/Model/QueryBuilder.php +++ b/engine/Shopware/Components/Model/QueryBuilder.php @@ -164,7 +164,7 @@ public function addParameters(array $parameters) * ))); * * - * @param array|array $filter + * @param array|array $filter * * @return QueryBuilder */ diff --git a/tests/Functional/Components/Api/TranslationTest.php b/tests/Functional/Components/Api/TranslationTest.php index 2d17107419b..d4452da8884 100644 --- a/tests/Functional/Components/Api/TranslationTest.php +++ b/tests/Functional/Components/Api/TranslationTest.php @@ -26,24 +26,37 @@ namespace Shopware\Tests\Functional\Components\Api; +use Doctrine\DBAL\Connection; use Shopware\Components\Api\Exception\CustomValidationException; use Shopware\Components\Api\Exception\NotFoundException; use Shopware\Components\Api\Exception\ParameterMissingException; use Shopware\Components\Api\Resource\Translation as TranslationResource; -use Shopware\Models\Article\Article; +use Shopware\Models\Article\Article as ProductModel; use Shopware\Models\Translation\Translation; +use Shopware\Tests\Functional\Traits\ContainerTrait; +use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour; class TranslationTest extends TestCase { + use ContainerTrait; + use DatabaseTransactionBehaviour; + + private const PRODUCT_TYPE = 'article'; + /** * @var TranslationResource */ protected $resource; - /** - * @return TranslationResource - */ - public function createResource() + private Connection $connection; + + protected function setUp(): void + { + parent::setUp(); + $this->connection = $this->getContainer()->get(Connection::class); + } + + public function createResource(): TranslationResource { return new TranslationResource(); } @@ -58,7 +71,7 @@ public function testList(): void } } - public function testArticleTranslationList(): void + public function testProductTranslationList(): void { $list = $this->resource->getList(0, 5, [ [ @@ -68,18 +81,13 @@ public function testArticleTranslationList(): void ]); foreach ($list['data'] as $item) { - $article = Shopware()->Models()->find(Article::class, $item['key']); - - static::assertInstanceOf(Article::class, $article); - - static::assertEquals( - TranslationResource::TYPE_PRODUCT, - $item['type'] - ); + $product = $this->getContainer()->get('models')->find(ProductModel::class, $item['key']); + static::assertInstanceOf(ProductModel::class, $product); + static::assertSame(TranslationResource::TYPE_PRODUCT, $item['type']); } } - public function testSingleArticleTranslation(): void + public function testSingleProductTranslation(): void { $list = $this->resource->getList(0, 1, [ [ @@ -88,7 +96,10 @@ public function testSingleArticleTranslation(): void ], [ 'property' => 'translation.key', - 'value' => Shopware()->Db()->fetchOne("SELECT objectkey FROM s_core_translations WHERE objecttype='article' LIMIT 1"), + 'value' => $this->connection->fetchOne( + 'SELECT objectkey FROM s_core_translations WHERE objecttype=:type LIMIT 1', + ['type' => self::PRODUCT_TYPE] + ), ], [ 'property' => 'translation.shopId', @@ -99,77 +110,11 @@ public function testSingleArticleTranslation(): void static::assertCount(1, $list['data']); $data = $list['data'][0]; - static::assertEquals( - TranslationResource::TYPE_PRODUCT, - $data['type'] - ); - + static::assertSame(TranslationResource::TYPE_PRODUCT, $data['type']); static::assertArrayHasKey('name', $data['data']); static::assertArrayHasKey('descriptionLong', $data['data']); } - public function testCreateArticle(): int - { - $data = $this->getDummyData('article'); - - $translation = $this->resource->create($data); - - static::assertInstanceOf(Translation::class, $translation); - static::assertEquals( - $data['key'], - $translation->getKey(), - 'Translation key do not match' - ); - static::assertEquals( - $data['type'], - $translation->getType(), - 'Translation type do not match' - ); - static::assertEquals( - $data['data'], - $this->resource->getTranslationComponent()->unFilterData( - 'article', - $translation->getData() - ), - 'Translation data do not match' - ); - - return $translation->getKey(); - } - - public function testCreateArticleByNumber(): int - { - $data = $this->getDummyData('article'); - $article = Shopware()->Db()->fetchRow('SELECT ordernumber, articleID FROM s_articles_details LIMIT 1'); - $data['key'] = $article['ordernumber']; - - $translation = $this->resource->createByNumber($data); - - static::assertInstanceOf(Translation::class, $translation); - - static::assertEquals( - $article['articleID'], - $translation->getKey(), - 'Translation key do not match' - ); - - static::assertEquals( - $data['type'], - $translation->getType(), - 'Translation type do not match' - ); - static::assertEquals( - $data['data'], - $this->resource->getTranslationComponent()->unFilterData( - 'article', - $translation->getData() - ), - 'Translation data do not match' - ); - - return (int) $article['articleID']; - } - /** * Checks if variants can be translated * @@ -179,86 +124,64 @@ public function testCreateVariantTranslationByNumber(): void { $data = $this->getDummyData('variant'); // Artikel mit Standardkonfigurator rot / 39 - $article = Shopware()->Db()->fetchRow("SELECT id, ordernumber, articleID FROM s_articles_details WHERE ordernumber = 'SW10201.11'"); - $data['key'] = $article['ordernumber']; + $product = $this->connection->fetchAssociative("SELECT id, ordernumber, articleID FROM s_articles_details WHERE ordernumber = 'SW10201.11'"); + static::assertIsArray($product); + $data['key'] = $product['ordernumber']; $translation = $this->resource->createByNumber($data); static::assertInstanceOf(Translation::class, $translation); - static::assertEquals( - $article['id'], - $translation->getKey(), - 'Translation key do not match' - ); - - static::assertEquals( - $data['type'], - $translation->getType(), - 'Translation type do not match' - ); - static::assertEquals( + static::assertSame((int) $product['id'], $translation->getKey(), 'Translation key do not match'); + static::assertSame($data['type'], $translation->getType()); + static::assertSame( $data['data'], $this->resource->getTranslationComponent()->unFilterData( - 'article', + self::PRODUCT_TYPE, $translation->getData() ), 'Translation data do not match' ); } - /** - * @depends testCreateArticle - */ - public function testArticleUpdateOverride(int $key): int + public function testProductTranslationUpdateOverride(): void { + $productId = $this->createProduct(); $this->resource->setResultMode(2); $translation = $this->resource->getList(0, 1, [ - ['property' => 'translation.type', 'value' => 'article'], - ['property' => 'translation.key', 'value' => $key], + ['property' => 'translation.type', 'value' => self::PRODUCT_TYPE], + ['property' => 'translation.key', 'value' => $productId], ['property' => 'translation.shopId', 'value' => 2], ]); - $translation = $translation['data'][0]; foreach ($translation['data'] as &$fieldTranslation) { $fieldTranslation = 'UPDATE - ' . $fieldTranslation; } + unset($fieldTranslation); - $updated = $this->resource->update($key, $translation); - - static::assertEquals( - $translation['key'], - $updated->getKey(), - 'Translation key do not match' - ); - static::assertEquals( - $translation['type'], - $updated->getType(), - 'Translation type do not match' - ); + $updateResult = $this->resource->update($productId, $translation); + static::assertInstanceOf(Translation::class, $updateResult); - static::assertEquals( - $translation['data'], - $this->resource->getTranslationComponent()->unFilterData( - 'article', - $updated->getData() - ), - 'Translation data do not match' - ); + $updatedTranslation = $this->resource->getList(0, 1, [ + ['property' => 'translation.type', 'value' => self::PRODUCT_TYPE], + ['property' => 'translation.key', 'value' => $productId], + ['property' => 'translation.shopId', 'value' => 2], + ]); + $updatedTranslation = $updatedTranslation['data'][0]; - return $key; + static::assertSame($translation['key'], $updatedTranslation['key'], 'Translation key do not match'); + static::assertSame($translation['type'], $updatedTranslation['type'], 'Translation type do not match'); + static::assertSame($translation['data'], $updatedTranslation['data'], 'Translation data do not match'); } - /** - * @depends testArticleUpdateOverride - */ - public function testArticleUpdateMerge(int $key): void + public function testProductTranslationUpdateMerge(): void { + $productId = $this->createProduct(); $this->resource->setResultMode(2); $translation = $this->resource->getList(0, 1, [ - ['property' => 'translation.type', 'value' => 'article'], - ['property' => 'translation.key', 'value' => $key], + ['property' => 'translation.type', 'value' => self::PRODUCT_TYPE], + ['property' => 'translation.key', 'value' => $productId], ['property' => 'translation.shopId', 'value' => 2], ]); @@ -267,34 +190,25 @@ public function testArticleUpdateMerge(int $key): void 'txtArtikel' => 'Update-2', ]; - $updated = $this->resource->update($key, $translation); + $updateResult = $this->resource->update($productId, $translation); + static::assertInstanceOf(Translation::class, $updateResult); - static::assertEquals( - $translation['key'], - $updated->getKey(), - 'Translation key do not match' - ); - static::assertEquals( - $translation['type'], - $updated->getType(), - 'Translation type do not match' - ); + $updatedTranslation = $this->resource->getList(0, 1, [ + ['property' => 'translation.type', 'value' => self::PRODUCT_TYPE], + ['property' => 'translation.key', 'value' => $productId], + ['property' => 'translation.shopId', 'value' => 2], + ]); - $dataTranslation = unserialize($updated->getData()); - static::assertEquals( - $translation['data']['txtArtikel'], - $dataTranslation['txtArtikel'] - ); + $updatedTranslation = $updatedTranslation['data'][0]; - static::assertEquals( - 'UPDATE - Dummy Translation', - $dataTranslation['txtlangbeschreibung'] - ); + static::assertSame($translation['key'], $updatedTranslation['key'], 'Translation key do not match'); + static::assertSame($translation['type'], $updatedTranslation['type'], 'Translation type do not match'); + static::assertSame($translation['data']['txtArtikel'], $updatedTranslation['data']['name']); } public function testRecursiveMerge(): void { - $create = $this->getDummyData('article'); + $create = $this->getDummyData(self::PRODUCT_TYPE); $create['type'] = 'recursive'; $create['data'] = [ @@ -323,84 +237,136 @@ public function testRecursiveMerge(): void ], ]; - $updated = $this->resource->update($created->getKey(), $update); + $updateResult = $this->resource->update($created->getKey(), $update); + static::assertInstanceOf(Translation::class, $updateResult); - $updateData = $update['data']; - $updatedData = unserialize($updated->getData()); - - static::assertEquals( - $updateData['a1'], - $updatedData['a1'], - 'First level not updated' - ); - - static::assertEquals( - $updateData['b1']['a2'], - $updatedData['b1']['a2'], - 'Second level not updated' - ); + $updatedTranslation = $this->resource->getList(0, 1, [ + ['property' => 'translation.key', 'value' => $created->getKey()], + ]); + $updatedTranslation = $updatedTranslation['data'][0]; - static::assertEquals( - $updateData['b1']['b2']['a3'], - $updatedData['b1']['b2']['a3'], - 'Third level not updated' - ); + $updateData = $update['data']; + $updatedData = $updatedTranslation['data']; - static::assertEquals( - $create['data']['b1']['b2']['b3']['a4'], - $updatedData['b1']['b2']['b3']['a4'], - 'Fourth level not updated' - ); + static::assertSame($updateData['a1'], $updatedData['a1'], 'First level not updated'); + static::assertSame($updateData['b1']['a2'], $updatedData['b1']['a2'], 'Second level not updated'); + static::assertSame($updateData['b1']['b2']['a3'], $updatedData['b1']['b2']['a3'], 'Third level not updated'); + static::assertSame($create['data']['b1']['b2']['b3']['a4'], $updatedData['b1']['b2']['b3']['a4'], 'Fourth level not updated'); } public function testBatch(): void { $translations = []; for ($i = 0; $i < 4; ++$i) { - $translations[] = $this->getDummyData('article'); + $translations[] = $this->getDummyData(self::PRODUCT_TYPE); } - $article = Shopware()->Db()->fetchRow( + $product = $this->connection->fetchAssociative( 'SELECT ordernumber, articleID FROM s_articles_details LIMIT 1' ); - $translations[0]['key'] = $article['ordernumber']; + static::assertIsArray($product); + $translations[0]['key'] = $product['ordernumber']; $translations[0]['useNumberAsId'] = true; - $results = $this->resource->batch($translations); - - foreach ($results as $result) { + foreach ($this->resource->batch($translations) as $result) { static::assertTrue($result['success']); - static::assertEquals('update', $result['operation']); + static::assertSame('update', $result['operation']); static::assertNotEmpty($result['data']); - static::assertEquals(2, $result['data']['shopId']); + static::assertSame(2, $result['data']['shopId']); } } - /** - * @depends testCreateArticleByNumber - */ - public function testUpdateByNumber(int $productId): void + public function testBatchUpdate(): void + { + $productId1 = $this->createProduct(); + $productId2 = $this->createProduct(); + + $this->resource->setResultMode(2); + $translations = $this->resource->getList( + 0, + 2, + [ + ['property' => 'translation.type', 'value' => self::PRODUCT_TYPE], + ['property' => 'translation.shopId', 'value' => 2], + ], + [ + ['property' => 'translation.id', 'direction' => 'DESC'], + ] + ); + $translations = $translations['data']; + + foreach ($translations as &$translation) { + static::assertContains($translation['key'], [$productId1, $productId2]); + foreach ($translation['data'] as &$fieldTranslation) { + $fieldTranslation = 'UPDATE - ' . $fieldTranslation; + } + unset($fieldTranslation); + } + unset($translation); + + foreach ($this->resource->batch($translations) as $operation) { + static::assertTrue($operation['success']); + static::assertSame('update', $operation['operation']); + } + + $updatedTranslations = $this->resource->getList( + 0, + 2, + [ + ['property' => 'translation.type', 'value' => self::PRODUCT_TYPE], + ['property' => 'translation.shopId', 'value' => 2], + ], + [ + ['property' => 'translation.id', 'direction' => 'DESC'], + ] + ); + $updatedTranslations = $updatedTranslations['data']; + + foreach ($updatedTranslations as $key => $updatedTranslation) { + static::assertSame( + $translations[$key]['key'], + $updatedTranslation['key'], + 'Translation key do not match' + ); + static::assertSame( + $translations[$key]['type'], + $updatedTranslation['type'], + 'Translation type do not match' + ); + + $dataTranslation = $updatedTranslation['data']; + static::assertSame( + $translations[$key]['data']['name'], + $dataTranslation['name'] + ); + } + } + + public function testUpdateByNumber(): void { - $translation = $this->getDummyData('article'); - $product = Shopware()->Db()->fetchRow( + $productId = $this->createProductByNumber(); + $translation = $this->getDummyData(self::PRODUCT_TYPE); + $product = $this->connection->fetchAssociative( 'SELECT ordernumber, articleID FROM s_articles_details - WHERE articleID = :articleId + WHERE articleID = :productId LIMIT 1', - [':articleId' => $productId] + ['productId' => $productId] ); + static::assertIsArray($product); $translation['key'] = $product['ordernumber']; foreach ($translation['data'] as &$data) { $data .= '-UpdateByNumber'; } + unset($data); $result = $this->resource->updateByNumber($product['ordernumber'], $translation); static::assertInstanceOf(Translation::class, $result); - static::assertEquals($result->getKey(), $product['articleID']); + static::assertSame($result->getKey(), (int) $product['articleID']); $data = unserialize($result->getData()); foreach ($data as $item) { @@ -411,7 +377,7 @@ public function testUpdateByNumber(int $productId): void public function testDelete(): void { - $data = $this->getDummyData('article'); + $data = $this->getDummyData(self::PRODUCT_TYPE); $translation = $this->resource->create($data); static::assertInstanceOf(Translation::class, $translation); @@ -419,20 +385,26 @@ public function testDelete(): void unset($data['data']); $result = $this->resource->delete($data['key'], $data); - static::assertTrue($result); + + $translation = $this->resource->getList(0, 1, [ + ['property' => 'translation.key', 'value' => $data['key']], + ['property' => 'translation.type', 'value' => self::PRODUCT_TYPE], + ]); + static::assertCount(0, $translation['data']); } public function testDeleteByNumber(): void { - $data = $this->getDummyData('article'); + $data = $this->getDummyData(self::PRODUCT_TYPE); - $article = Shopware()->Db()->fetchRow( + $product = $this->connection->fetchAssociative( 'SELECT ordernumber, articleID FROM s_articles_details LIMIT 1' ); - $data['key'] = $article['articleID']; + static::assertIsArray($product); + $data['key'] = $product['articleID']; $translation = $this->resource->create($data); @@ -440,9 +412,14 @@ public function testDeleteByNumber(): void unset($data['data']); - $result = $this->resource->deleteByNumber($article['ordernumber'], $data); - + $result = $this->resource->deleteByNumber($product['ordernumber'], $data); static::assertTrue($result); + + $translation = $this->resource->getList(0, 1, [ + ['property' => 'translation.key', 'value' => $data['key']], + ['property' => 'translation.type', 'value' => self::PRODUCT_TYPE], + ]); + static::assertCount(0, $translation['data']); } public function testLinkNumber(): void @@ -461,7 +438,8 @@ public function testDownloadNumber(): void public function testManufacturerNumber(): void { - $entity = Shopware()->Db()->fetchRow('SELECT * FROM s_articles_supplier LIMIT 1'); + $entity = $this->connection->fetchAssociative('SELECT * FROM s_articles_supplier LIMIT 1'); + static::assertIsArray($entity); $this->numberCreate('supplier', (int) $entity['id'], $entity['name']); $this->numberUpdate('supplier', (int) $entity['id'], $entity['name']); $this->numberDelete('supplier', $entity['name']); @@ -469,7 +447,8 @@ public function testManufacturerNumber(): void public function testCountryName(): void { - $entity = Shopware()->Db()->fetchRow('SELECT * FROM s_core_countries LIMIT 1'); + $entity = $this->connection->fetchAssociative('SELECT * FROM s_core_countries LIMIT 1'); + static::assertIsArray($entity); $this->numberCreate('config_countries', (int) $entity['id'], $entity['countryname']); $this->numberUpdate('config_countries', (int) $entity['id'], $entity['countryname']); $this->numberDelete('config_countries', $entity['countryname']); @@ -477,7 +456,8 @@ public function testCountryName(): void public function testCountryIso(): void { - $entity = Shopware()->Db()->fetchRow('SELECT * FROM s_core_countries LIMIT 1'); + $entity = $this->connection->fetchAssociative('SELECT * FROM s_core_countries LIMIT 1'); + static::assertIsArray($entity); $this->numberCreate('config_countries', (int) $entity['id'], $entity['countryiso']); $this->numberUpdate('config_countries', (int) $entity['id'], $entity['countryiso']); $this->numberDelete('config_countries', $entity['countryiso']); @@ -485,7 +465,8 @@ public function testCountryIso(): void public function testCountryStateName(): void { - $entity = Shopware()->Db()->fetchRow('SELECT * FROM s_core_countries_states LIMIT 1'); + $entity = $this->connection->fetchAssociative('SELECT * FROM s_core_countries_states LIMIT 1'); + static::assertIsArray($entity); $this->numberCreate('config_country_states', (int) $entity['id'], $entity['name']); $this->numberUpdate('config_country_states', (int) $entity['id'], $entity['name']); $this->numberDelete('config_country_states', $entity['name']); @@ -493,7 +474,8 @@ public function testCountryStateName(): void public function testCountryStateCode(): void { - $entity = Shopware()->Db()->fetchRow('SELECT * FROM s_core_countries_states LIMIT 1'); + $entity = $this->connection->fetchAssociative('SELECT * FROM s_core_countries_states LIMIT 1'); + static::assertIsArray($entity); $this->numberCreate('config_country_states', (int) $entity['id'], $entity['shortcode']); $this->numberUpdate('config_country_states', (int) $entity['id'], $entity['shortcode']); $this->numberDelete('config_country_states', $entity['shortcode']); @@ -501,7 +483,8 @@ public function testCountryStateCode(): void public function testDispatchName(): void { - $entity = Shopware()->Db()->fetchRow('SELECT * FROM s_premium_dispatch LIMIT 1'); + $entity = $this->connection->fetchAssociative('SELECT * FROM s_premium_dispatch LIMIT 1'); + static::assertIsArray($entity); $this->numberCreate('config_dispatch', (int) $entity['id'], $entity['name']); $this->numberUpdate('config_dispatch', (int) $entity['id'], $entity['name']); $this->numberDelete('config_dispatch', $entity['name']); @@ -509,7 +492,8 @@ public function testDispatchName(): void public function testPaymentName(): void { - $entity = Shopware()->Db()->fetchRow('SELECT * FROM s_core_paymentmeans LIMIT 1'); + $entity = $this->connection->fetchAssociative('SELECT * FROM s_core_paymentmeans LIMIT 1'); + static::assertIsArray($entity); $this->numberCreate('config_payment', (int) $entity['id'], $entity['name']); $this->numberUpdate('config_payment', (int) $entity['id'], $entity['name']); $this->numberDelete('config_payment', $entity['name']); @@ -517,7 +501,8 @@ public function testPaymentName(): void public function testPaymentDescription(): void { - $entity = Shopware()->Db()->fetchRow('SELECT * FROM s_core_paymentmeans LIMIT 1'); + $entity = $this->connection->fetchAssociative('SELECT * FROM s_core_paymentmeans LIMIT 1'); + static::assertIsArray($entity); $this->numberCreate('config_payment', (int) $entity['id'], $entity['description']); $this->numberUpdate('config_payment', (int) $entity['id'], $entity['description']); $this->numberDelete('config_payment', $entity['description']); @@ -525,8 +510,8 @@ public function testPaymentDescription(): void public function testFilterSetNumber(): void { - $entity = Shopware()->Db()->fetchRow('SELECT * FROM s_filter LIMIT 1'); - + $entity = $this->connection->fetchAssociative('SELECT * FROM s_filter LIMIT 1'); + static::assertIsArray($entity); $this->numberCreate('propertygroup', (int) $entity['id'], $entity['name']); $this->numberUpdate('propertygroup', (int) $entity['id'], $entity['name']); $this->numberDelete('propertygroup', $entity['name']); @@ -535,7 +520,7 @@ public function testFilterSetNumber(): void public function testFilterGroupNumber(): void { $entity = $this->getFilterGroupName(); - + static::assertIsArray($entity); $this->numberCreate('propertyoption', (int) $entity['id'], $entity['name']); $this->numberUpdate('propertyoption', (int) $entity['id'], $entity['name']); $this->numberDelete('propertyoption', $entity['name']); @@ -544,7 +529,7 @@ public function testFilterGroupNumber(): void public function testFilterOptionNumber(): void { $entity = $this->getFilterOptionName(); - + static::assertIsArray($entity); $this->numberCreate('propertyvalue', (int) $entity['id'], $entity['name']); $this->numberUpdate('propertyvalue', (int) $entity['id'], $entity['name']); $this->numberDelete('propertyvalue', $entity['name']); @@ -552,10 +537,8 @@ public function testFilterOptionNumber(): void public function testConfiguratorGroupNumber(): void { - $entity = Shopware()->Db()->fetchRow(' - SELECT * FROM s_article_configurator_groups - '); - + $entity = $this->connection->fetchAssociative('SELECT * FROM s_article_configurator_groups'); + static::assertIsArray($entity); $this->numberCreate('configuratorgroup', (int) $entity['id'], $entity['name']); $this->numberUpdate('configuratorgroup', (int) $entity['id'], $entity['name']); $this->numberDelete('configuratorgroup', $entity['name']); @@ -564,7 +547,7 @@ public function testConfiguratorGroupNumber(): void public function testConfiguratorOptionNumber(): void { $entity = $this->getConfiguratorOptionName(); - + static::assertIsArray($entity); $this->numberCreate('configuratoroption', (int) $entity['id'], $entity['name']); $this->numberUpdate('configuratoroption', (int) $entity['id'], $entity['name']); $this->numberDelete('configuratoroption', $entity['name']); @@ -573,7 +556,7 @@ public function testConfiguratorOptionNumber(): void public function testCreateMissingKey(): void { $this->expectException(ParameterMissingException::class); - $data = $this->getDummyData('article'); + $data = $this->getDummyData(self::PRODUCT_TYPE); unset($data['key']); $this->resource->create($data); } @@ -581,7 +564,7 @@ public function testCreateMissingKey(): void public function testCreateByNumberMissingKey(): void { $this->expectException(ParameterMissingException::class); - $data = $this->getDummyData('article'); + $data = $this->getDummyData(self::PRODUCT_TYPE); unset($data['key']); $this->resource->createByNumber($data); } @@ -589,65 +572,66 @@ public function testCreateByNumberMissingKey(): void public function testUpdateMissingId(): void { $this->expectException(ParameterMissingException::class); - $data = $this->getDummyData('article'); + $data = $this->getDummyData(self::PRODUCT_TYPE); $this->resource->update(0, $data); } public function testUpdateByNumberMissingId(): void { $this->expectException(ParameterMissingException::class); - $data = $this->getDummyData('article'); + $data = $this->getDummyData(self::PRODUCT_TYPE); $this->resource->updateByNumber('', $data); } public function testDeleteMissingId(): void { $this->expectException(ParameterMissingException::class); - $data = $this->getDummyData('article'); + $data = $this->getDummyData(self::PRODUCT_TYPE); $this->resource->delete(0, $data); } public function testDeleteByNumberMissingId(): void { $this->expectException(ParameterMissingException::class); - $data = $this->getDummyData('article'); + $data = $this->getDummyData(self::PRODUCT_TYPE); $this->resource->deleteByNumber('', $data); } public function testDeleteInvalidTranslation(): void { $this->expectException(NotFoundException::class); - $data = $this->getDummyData('article'); + $data = $this->getDummyData(self::PRODUCT_TYPE); $this->resource->delete(-200, $data); } public function testDeleteByNumberInvalidTranslation(): void { $this->expectException(NotFoundException::class); - $data = $this->getDummyData('article'); + $data = $this->getDummyData(self::PRODUCT_TYPE); - $article = Shopware()->Db()->fetchRow('SELECT ordernumber, articleID FROM s_articles_details LIMIT 1'); - $data['key'] = $article['articleID']; + $product = $this->connection->fetchAssociative('SELECT ordernumber, articleID FROM s_articles_details LIMIT 1'); + static::assertIsArray($product); + $data['key'] = $product['articleID']; $this->resource->create($data); $this->resource->delete($data['key'], $data); - $this->resource->deleteByNumber($article['ordernumber'], $data); + $this->resource->deleteByNumber($product['ordernumber'], $data); } public function testInvalidTypeByNumber(): void { $this->expectException(CustomValidationException::class); - $data = $this->getDummyData('article'); + $data = $this->getDummyData(self::PRODUCT_TYPE); $data['type'] = 'Invalid'; $this->resource->createByNumber($data); } - public function testInvalidArticleNumber(): void + public function testInvalidProductNumber(): void { $this->expectException(NotFoundException::class); - $data = $this->getDummyData('article'); + $data = $this->getDummyData(self::PRODUCT_TYPE); $data['key'] = 'Invalid-Order-Number'; $this->resource->createByNumber($data); } @@ -837,15 +821,15 @@ public function testInvalidConfiguratorOptionWithOptionName(): void public function testMissingTypeException(): void { $this->expectException(ParameterMissingException::class); - $data = $this->getDummyData('article'); + $data = $this->getDummyData(self::PRODUCT_TYPE); unset($data['type']); $this->resource->create($data); } - public function testMissingshopIdException(): void + public function testMissingShopIdException(): void { $this->expectException(ParameterMissingException::class); - $data = $this->getDummyData('article'); + $data = $this->getDummyData(self::PRODUCT_TYPE); unset($data['shopId']); $this->resource->create($data); } @@ -853,7 +837,7 @@ public function testMissingshopIdException(): void public function testMissingDataException(): void { $this->expectException(ParameterMissingException::class); - $data = $this->getDummyData('article'); + $data = $this->getDummyData(self::PRODUCT_TYPE); unset($data['data']); $this->resource->create($data); } @@ -861,35 +845,97 @@ public function testMissingDataException(): void public function testMissingDataIsArrayException(): void { $this->expectException(CustomValidationException::class); - $data = $this->getDummyData('article'); + $data = $this->getDummyData(self::PRODUCT_TYPE); $data['data'] = 1; $this->resource->create($data); } /** + * Override test method of parent class because the translation resource has no "getOne" method + * * @group disable */ public function testGetOneWithMissingPrivilegeShouldThrowPrivilegeException(): void { + // Do not remove static::assertTrue(true); } /** + * Override test method of parent class because the translation resource has no "getOne" method + * * @group disable */ public function testGetOneWithInvalidIdShouldThrowNotFoundException(): void { + // Do not remove static::assertTrue(true); } /** + * Override test method of parent class because the translation resource has no "getOne" method + * * @group disable */ public function testGetOneWithMissingIdShouldThrowParameterMissingException(): void { + // Do not remove static::assertTrue(true); } + private function createProduct(): int + { + $data = $this->getDummyData(self::PRODUCT_TYPE); + + $translation = $this->resource->create($data); + + static::assertInstanceOf(Translation::class, $translation); + static::assertSame( + $data['key'], + $translation->getKey(), + 'Translation key do not match' + ); + static::assertSame( + $data['type'], + $translation->getType(), + 'Translation type do not match' + ); + static::assertSame( + $data['data'], + $this->resource->getTranslationComponent()->unFilterData( + self::PRODUCT_TYPE, + $translation->getData() + ), + 'Translation data do not match' + ); + + return $translation->getKey(); + } + + private function createProductByNumber(): int + { + $data = $this->getDummyData(self::PRODUCT_TYPE); + $product = $this->connection->fetchAssociative('SELECT ordernumber, articleID FROM s_articles_details LIMIT 1'); + static::assertIsArray($product); + $data['key'] = $product['ordernumber']; + + $translation = $this->resource->createByNumber($data); + + static::assertInstanceOf(Translation::class, $translation); + static::assertSame((int) $product['articleID'], $translation->getKey(), 'Translation key do not match'); + static::assertSame($data['type'], $translation->getType(), 'Translation type do not match'); + static::assertSame( + $data['data'], + $this->resource->getTranslationComponent()->unFilterData( + self::PRODUCT_TYPE, + $translation->getData() + ), + 'Translation data do not match' + ); + + return (int) $product['articleID']; + } + private function numberCreate(string $type, int $id, string $number): void { $data = $this->getDummyData($type); @@ -899,7 +945,7 @@ private function numberCreate(string $type, int $id, string $number): void static::assertInstanceOf(Translation::class, $translation); - static::assertEquals($id, $translation->getKey()); + static::assertSame($id, $translation->getKey()); $translated = $this->resource->getTranslationComponent()->unFilterData( $type, @@ -907,7 +953,7 @@ private function numberCreate(string $type, int $id, string $number): void ); foreach ($data['data'] as $key => $value) { - static::assertEquals($value, $translated[$key]); + static::assertSame($value, $translated[$key]); } } @@ -917,12 +963,13 @@ private function numberUpdate(string $type, int $id, string $number): void foreach ($data['data'] as &$item) { $item .= '-UPDATED'; } + unset($item); $translation = $this->resource->updateByNumber($number, $data); static::assertInstanceOf(Translation::class, $translation); - static::assertEquals($id, $translation->getKey()); + static::assertSame($id, $translation->getKey()); $translated = $this->resource->getTranslationComponent()->unFilterData( $type, @@ -930,7 +977,7 @@ private function numberUpdate(string $type, int $id, string $number): void ); foreach ($data['data'] as $key => $value) { - static::assertEquals($value, $translated[$key]); + static::assertSame($value, $translated[$key]); } } @@ -942,7 +989,7 @@ private function numberDelete(string $type, string $number): void } /** - * @return array{type: string, key: int, data: array, shopId: int} + * @return array{type: string, key: int, data: array, shopId: int} */ private function getDummyData(string $type, int $shopId = 2): array { @@ -960,7 +1007,7 @@ private function getDummyData(string $type, int $shopId = 2): array private function getTypeFields(string $type): array { switch (strtolower($type)) { - case 'article': + case self::PRODUCT_TYPE: return [ 'name' => 'Dummy Translation', 'description' => 'Dummy Translation', @@ -1010,7 +1057,7 @@ private function getTypeFields(string $type): array */ private function getFilterGroupName(): array { - return Shopware()->Db()->fetchRow( + $filterOptions = $this->connection->fetchAssociative( "SELECT fo.id, CONCAT(f.name, '|', fo.name) as name FROM s_filter_options as fo INNER JOIN s_filter_relations as fr @@ -1019,6 +1066,9 @@ private function getFilterGroupName(): array ON f.id = fr.groupID LIMIT 1" ); + static::assertIsArray($filterOptions); + + return $filterOptions; } /** @@ -1026,7 +1076,7 @@ private function getFilterGroupName(): array */ private function getFilterOptionName(): array { - return Shopware()->Db()->fetchRow( + $filterValues = $this->connection->fetchAssociative( "SELECT fv.id, CONCAT(f.name, '|', fo.name, '|', fv.value) as name FROM s_filter_values as fv INNER JOIN s_filter_options as fo @@ -1037,6 +1087,9 @@ private function getFilterOptionName(): array ON f.id = fr.groupID LIMIT 1" ); + static::assertIsArray($filterValues); + + return $filterValues; } /** @@ -1044,12 +1097,15 @@ private function getFilterOptionName(): array */ private function getConfiguratorOptionName(): array { - return Shopware()->Db()->fetchRow( + $configuratorGroups = $this->connection->fetchAssociative( "SELECT co.id, CONCAT(cg.name, '|', co.name) as name FROM s_article_configurator_groups as cg INNER JOIN s_article_configurator_options as co ON co.group_id = cg.id LIMIT 1" ); + static::assertIsArray($configuratorGroups); + + return $configuratorGroups; } } From 99e3f4743b694f842da0cc3b287f2c4a291064af Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Fri, 10 Jun 2022 15:23:49 +0200 Subject: [PATCH 043/730] SW-26756 - Fix issue with MySQL version 8.0.29 --- .gitlab-ci.yml | 6 +- .phpstan-baseline.neon | 80 -------------- .../Controllers/Backend/Systeminfo.php | 101 +++++++++++------- ...{SysteminfoTest.php => SystemInfoTest.php} | 36 +++++-- 4 files changed, 90 insertions(+), 133 deletions(-) rename tests/Functional/Controllers/Backend/{SysteminfoTest.php => SystemInfoTest.php} (74%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1051fbf7c99..ebe5f7ba803 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -183,7 +183,7 @@ PHP 8.1: MySQL 8.0: extends: .phpunit_base services: - - name: mysql:8.0.19 + - name: mysql:8.0 alias: mysql command: [ "mysqld", "--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci", "--default-authentication-plugin=mysql_native_password", "--sql-require-primary-key=ON" ] @@ -203,7 +203,7 @@ Elasticsearch 7: extends: .phpunit_es_base image: gitlab.shopware.com:5005/shopware/5/product/image/continuous:7.4 services: - - name: mysql:8.0.19 + - name: mysql:8.0 alias: mysql command: [ "mysqld", "--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci", "--default-authentication-plugin=mysql_native_password" ] - name: docker.elastic.co/elasticsearch/elasticsearch:7.9.1 @@ -235,7 +235,7 @@ Elasticsearch 7: alias: selenium - name: mailhog/mailhog alias: smtp - - name: mysql:8.0.19 + - name: mysql:8.0 alias: mysql command: [ "mysqld", "--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci", "--default-authentication-plugin=mysql_native_password" ] diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index d9426cf3d0c..e381eb5f78f 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -26580,56 +26580,6 @@ parameters: count: 1 path: engine/Shopware/Controllers/Backend/Supplier.php - - - message: "#^Cannot call method getOffset\\(\\) on DateTimeZone\\|false\\.$#" - count: 2 - path: engine/Shopware/Controllers/Backend/Systeminfo.php - - - - message: "#^Method Shopware_Controllers_Backend_Systeminfo\\:\\:getConfigListAction\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/Systeminfo.php - - - - message: "#^Method Shopware_Controllers_Backend_Systeminfo\\:\\:getFileListAction\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/Systeminfo.php - - - - message: "#^Method Shopware_Controllers_Backend_Systeminfo\\:\\:getOptimizersAction\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/Systeminfo.php - - - - message: "#^Method Shopware_Controllers_Backend_Systeminfo\\:\\:getPathListAction\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/Systeminfo.php - - - - message: "#^Method Shopware_Controllers_Backend_Systeminfo\\:\\:getTimezoneAction\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/Systeminfo.php - - - - message: "#^Method Shopware_Controllers_Backend_Systeminfo\\:\\:getVersionListAction\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/Systeminfo.php - - - - message: "#^Method Shopware_Controllers_Backend_Systeminfo\\:\\:infoAction\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/Systeminfo.php - - - - message: "#^Parameter \\#1 \\$timezone of function timezone_open expects string, string\\|false given\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/Systeminfo.php - - - - message: "#^Parameter \\#2 \\$timezone of class DateTime constructor expects DateTimeZone\\|null, DateTimeZone\\|false given\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/Systeminfo.php - - message: "#^Cannot access offset 'id' on array\\\\|Shopware\\\\Models\\\\Shop\\\\Template\\.$#" count: 1 @@ -43925,36 +43875,6 @@ parameters: count: 1 path: tests/Functional/Controllers/Backend/SupplierTest.php - - - message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#" - count: 4 - path: tests/Functional/Controllers/Backend/SysteminfoTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SysteminfoTest\\:\\:testGetConfigList\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/SysteminfoTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SysteminfoTest\\:\\:testGetFileList\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/SysteminfoTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SysteminfoTest\\:\\:testGetPathList\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/SysteminfoTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SysteminfoTest\\:\\:testGetVersionList\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/SysteminfoTest.php - - - - message: "#^Parameter \\#1 \\$json of function json_decode expects string, array\\|string\\|null given\\.$#" - count: 4 - path: tests/Functional/Controllers/Backend/SysteminfoTest.php - - message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$data\\.$#" count: 3 diff --git a/engine/Shopware/Controllers/Backend/Systeminfo.php b/engine/Shopware/Controllers/Backend/Systeminfo.php index 004618bd53b..2dba7efc64b 100644 --- a/engine/Shopware/Controllers/Backend/Systeminfo.php +++ b/engine/Shopware/Controllers/Backend/Systeminfo.php @@ -1,4 +1,6 @@ Request()->getActionName(), ['index', 'load', 'info'])) { - $this->Front()->Plugins()->Json()->setRenderer(true); + $this->Front()->Plugins()->Json()->setRenderer(); } } @@ -55,14 +59,16 @@ public function preDispatch() * The array also contains a status, whether the minimum requirements are met * The encoder-configs are excluded, because they are needed in another store * getEncoderAction loads those two encoder-configs + * + * @return void */ public function getConfigListAction() { $result = $this->get('shopware.requirements')->toArray(); - foreach ($result['checks'] as $key => &$config) { + foreach ($result['checks'] as $key => $config) { // Those configs mustn't be displayed in the grid - if ($config['name'] == 'mod_rewrite') { + if ($config['name'] === 'mod_rewrite') { unset($result['checks'][$key]); } } @@ -71,6 +77,8 @@ public function getConfigListAction() /** * Function to get all necessary paths and a status, whether the paths are available + * + * @return void */ public function getPathListAction() { @@ -80,6 +88,8 @@ public function getPathListAction() /** * Function to get all necessary files and the status, whether those files match with the original Shopware-Files + * + * @return void */ public function getFileListAction() { @@ -94,71 +104,80 @@ public function getFileListAction() $skipList = [ ]; - $list = new Shopware_Components_Check_File($fileName, Shopware()->DocPath(), $skipList); + $list = new Shopware_Components_Check_File( + $fileName, + $this->container->getParameter('shopware.app.rootDir'), + $skipList + ); $this->View()->assign(['success' => true, 'data' => $list->toArray()]); } /** * Function to get all plugins and its version. + * + * @return void */ public function getVersionListAction() { - $select = Shopware()->Db()->select()->from( - 's_core_plugins', - ['version', 'name', 'namespace', 'source'] - ); - - $rows = Shopware()->Db()->fetchAll($select); + $rows = $this->get(Connection::class)->createQueryBuilder() + ->select(['version', 'name', 'namespace', 'source']) + ->from('s_core_plugins') + ->execute() + ->fetchAllAssociative(); foreach ($rows as $key => $row) { $rows[$key]['name'] = $row['namespace'] . '/' . $row['source'] . '/' . $row['name']; } - array_unshift($rows, ['name' => 'Shopware', 'version' => Shopware()->Config()->get('Version')]); + array_unshift($rows, ['name' => 'Shopware', 'version' => $this->get('config')->get('Version')]); $this->View()->assign(['success' => true, 'data' => $rows]); } /** * Function to get timezone diff + * + * @return void */ public function getTimezoneAction() { + $connection = $this->get(Connection::class); $offset = 0; + $timeZone = ''; try { - $sql = <<<'SQL' - SELECT timeZones.timeZone - FROM ( - SELECT @@SESSION.time_zone AS timeZone - UNION - SELECT @@system_time_zone AS timeZone - ) AS timeZones - WHERE timeZone != 'SYSTEM' - LIMIT 1 -SQL; - - $timezone = $this->container->get(\Doctrine\DBAL\Connection::class) - ->query($sql) - ->fetchColumn(0); - - if (\in_array($timezone[0], ['-', '+'], true)) { - $databaseZone = new DateTimeZone($timezone); + $timeZone = $connection->executeQuery('SELECT @@SESSION.time_zone')->fetchOne(); + + if ($timeZone === 'SYSTEM') { + $timeZone = $connection->executeQuery('SELECT @@system_time_zone')->fetchOne(); + } + } catch (PDOException $e) { + } + + if (!empty($timeZone)) { + $databaseZone = null; + if (\in_array($timeZone[0], ['-', '+'], true)) { + $databaseZone = new DateTimeZone($timeZone); } else { - $databaseZone = timezone_open(timezone_name_from_abbr($timezone)); + $timeZoneFromAbbr = timezone_name_from_abbr($timeZone); + if (\is_string($timeZoneFromAbbr)) { + $databaseZone = timezone_open($timeZoneFromAbbr); + if (!$databaseZone instanceof DateTimeZone) { + $databaseZone = null; + } + } } $phpZone = timezone_open(date_default_timezone_get()); - $databaseTime = new DateTime('now', $databaseZone); - - if (!empty($timezone)) { + if ($databaseZone instanceof DateTimeZone && $phpZone instanceof DateTimeZone) { + $databaseTime = new DateTime('now', $databaseZone); $offset = abs($databaseZone->getOffset(new DateTime()) - $phpZone->getOffset($databaseTime)); } - } catch (\PDOException $e) { } + if (empty($offset)) { $sql = 'SELECT UNIX_TIMESTAMP()-' . time(); - $offset = $this->container->get(\Doctrine\DBAL\Connection::class)->query($sql)->fetchColumn(0); + $offset = (int) $connection->executeQuery($sql)->fetchOne(); } $this->View()->assign(['success' => true, 'offset' => $offset < 60 ? 0 : round($offset / 60)]); @@ -166,10 +185,12 @@ public function getTimezoneAction() /** * Function to display the phpinfo + * + * @return void */ public function infoAction() { - Shopware()->Front()->Plugins()->ViewRenderer()->setNoRender(); + $this->get('front')->Plugins()->ViewRenderer()->setNoRender(); $_COOKIE = []; $_REQUEST = []; $_SERVER['HTTP_COOKIE'] = null; @@ -179,9 +200,12 @@ public function infoAction() phpinfo(); } + /** + * @return void + */ public function getOptimizersAction() { - $optimizers = $this->get(\Shopware\Bundle\MediaBundle\OptimizerService::class)->getOptimizers(); + $optimizers = $this->get(OptimizerService::class)->getOptimizers(); $optimizerResult = []; foreach ($optimizers as $optimizer) { @@ -197,11 +221,6 @@ public function getOptimizersAction() $this->View()->assign('total', \count($optimizerResult)); } - /** - * Returns a list with actions which should not be validated for CSRF protection - * - * @return string[] - */ public function getWhitelistedCSRFActions() { return [ diff --git a/tests/Functional/Controllers/Backend/SysteminfoTest.php b/tests/Functional/Controllers/Backend/SystemInfoTest.php similarity index 74% rename from tests/Functional/Controllers/Backend/SysteminfoTest.php rename to tests/Functional/Controllers/Backend/SystemInfoTest.php index e153abfc638..59172b53d88 100644 --- a/tests/Functional/Controllers/Backend/SysteminfoTest.php +++ b/tests/Functional/Controllers/Backend/SystemInfoTest.php @@ -1,4 +1,6 @@ Plugins()->Backend()->Auth()->setNoAcl(); } - public function testGetConfigList() + public function testGetConfigList(): void { $response = $this->dispatch('backend/systeminfo/getConfigList'); - static::assertTrue($this->View()->success); + static::assertTrue($this->View()->getAssign('success')); $body = $response->getBody(); + static::assertIsString($body); $jsonBody = json_decode($body, true); static::assertArrayHasKey('data', $jsonBody); @@ -58,13 +61,14 @@ public function testGetConfigList() static::assertArrayHasKey('status', $jsonBody['data'][0]); } - public function testGetPathList() + public function testGetPathList(): void { $response = $this->dispatch('backend/systeminfo/getPathList'); - static::assertTrue($this->View()->success); + static::assertTrue($this->View()->getAssign('success')); $body = $response->getBody(); + static::assertIsString($body); $jsonBody = json_decode($body, true); static::assertArrayHasKey('data', $jsonBody); @@ -74,26 +78,28 @@ public function testGetPathList() static::assertArrayHasKey('result', $jsonBody['data'][0]); } - public function testGetFileList() + public function testGetFileList(): void { $response = $this->dispatch('backend/systeminfo/getFileList'); - static::assertTrue($this->View()->success); + static::assertTrue($this->View()->getAssign('success')); $body = $response->getBody(); + static::assertIsString($body); $jsonBody = json_decode($body, true); static::assertArrayHasKey('data', $jsonBody); static::assertArrayHasKey('success', $jsonBody); } - public function testGetVersionList() + public function testGetVersionList(): void { $response = $this->dispatch('backend/systeminfo/getVersionList'); - static::assertTrue($this->View()->success); + static::assertTrue($this->View()->getAssign('success')); $body = $response->getBody(); + static::assertIsString($body); $jsonBody = json_decode($body, true); static::assertArrayHasKey('data', $jsonBody); @@ -101,4 +107,16 @@ public function testGetVersionList() static::assertArrayHasKey('name', $jsonBody['data'][0]); static::assertArrayHasKey('version', $jsonBody['data'][0]); } + + public function testGetTimezone(): void + { + $response = $this->dispatch('backend/systeminfo/getTimezone'); + + static::assertTrue($this->View()->getAssign('success')); + + $body = $response->getBody(); + static::assertIsString($body); + $jsonBody = json_decode($body, true); + static::assertIsInt($jsonBody['offset']); + } } From 63db33c29682fbc5e42fe399f28b98eb190832c3 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 13 Jun 2022 11:23:43 +0200 Subject: [PATCH 044/730] SW-26539 - Fix generating of sitemap if custom URLs are defined --- .phpstan-baseline.neon | 25 --------- .../Provider/CustomUrlProvider.php | 3 +- .../Bundle/SitemapBundle/Struct/Url.php | 36 +++---------- .../Provider/CustomUrlProviderTest.php | 53 ++++++++++++------- 4 files changed, 42 insertions(+), 75 deletions(-) diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index e381eb5f78f..d6bb24318d7 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -41090,31 +41090,6 @@ parameters: count: 1 path: tests/Functional/Bundle/SearchBundleDBAL/SearchIndexerTest.php - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SitemapBundle\\\\Provider\\\\CustomUrlProviderTest\\:\\:getCustomUrlProvider\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/SitemapBundle/Provider/CustomUrlProviderTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SitemapBundle\\\\Provider\\\\CustomUrlProviderTest\\:\\:testGetUrlsReturnsAllUrlsForShop\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/SitemapBundle/Provider/CustomUrlProviderTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SitemapBundle\\\\Provider\\\\CustomUrlProviderTest\\:\\:testGetUrlsReturnsAllUrlsForShopIdZero\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/SitemapBundle/Provider/CustomUrlProviderTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SitemapBundle\\\\Provider\\\\CustomUrlProviderTest\\:\\:testGetUrlsReturnsNoUrls\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/SitemapBundle/Provider/CustomUrlProviderTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SitemapBundle\\\\Provider\\\\CustomUrlProviderTest\\:\\:testGetUrlsReturnsNoUrlsWrongShopId\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/SitemapBundle/Provider/CustomUrlProviderTest.php - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SitemapBundle\\\\SitemapLockTest\\:\\:testLocks\\(\\) has no return type specified\\.$#" count: 1 diff --git a/engine/Shopware/Bundle/SitemapBundle/Provider/CustomUrlProvider.php b/engine/Shopware/Bundle/SitemapBundle/Provider/CustomUrlProvider.php index 7c56f72a425..e6403ee43d7 100644 --- a/engine/Shopware/Bundle/SitemapBundle/Provider/CustomUrlProvider.php +++ b/engine/Shopware/Bundle/SitemapBundle/Provider/CustomUrlProvider.php @@ -24,6 +24,7 @@ namespace Shopware\Bundle\SitemapBundle\Provider; +use DateTimeImmutable; use Shopware\Bundle\SitemapBundle\Service\ConfigHandler; use Shopware\Bundle\SitemapBundle\Struct\Url; use Shopware\Bundle\SitemapBundle\UrlProviderInterface; @@ -60,7 +61,7 @@ public function getUrls(Context $routingContext, ShopContextInterface $shopConte $urls[] = new Url( $sitemapCustomUrl['url'], - $sitemapCustomUrl['lastMod'], + new DateTimeImmutable($sitemapCustomUrl['lastMod']), $sitemapCustomUrl['changeFreq'], 'custom', null, diff --git a/engine/Shopware/Bundle/SitemapBundle/Struct/Url.php b/engine/Shopware/Bundle/SitemapBundle/Struct/Url.php index d22ddd655c0..56ecd476d1a 100644 --- a/engine/Shopware/Bundle/SitemapBundle/Struct/Url.php +++ b/engine/Shopware/Bundle/SitemapBundle/Struct/Url.php @@ -30,51 +30,29 @@ class Url { /** * The Url - * - * @var string */ - private $loc; + private string $loc; /** * Date and time of last modification - * - * @var DateTimeInterface */ - private $lastmod; + private DateTimeInterface $lastmod; /** * Frequency of changing - * - * @var string */ - private $changefreq; + private string $changefreq; /** * Relative priority for this URL - * - * @var float */ - private $priority; + private float $priority; - /** - * @var string - */ - private $resource; + private string $resource; - /** - * @var int - */ - private $identifier; + private int $identifier; - /** - * @param string $loc - * @param DateTimeInterface $lastmod - * @param string $changefreq - * @param string $resource - * @param int|null $identifier - * @param float $priority - */ - public function __construct($loc, $lastmod, $changefreq, $resource, $identifier, $priority = 0.5) + public function __construct(string $loc, DateTimeInterface $lastmod, string $changefreq, string $resource, ?int $identifier, float $priority = 0.5) { $this->loc = $loc; $this->lastmod = $lastmod; diff --git a/tests/Functional/Bundle/SitemapBundle/Provider/CustomUrlProviderTest.php b/tests/Functional/Bundle/SitemapBundle/Provider/CustomUrlProviderTest.php index 2fb653f1f9c..20ebcb663b2 100644 --- a/tests/Functional/Bundle/SitemapBundle/Provider/CustomUrlProviderTest.php +++ b/tests/Functional/Bundle/SitemapBundle/Provider/CustomUrlProviderTest.php @@ -1,4 +1,6 @@ createMock(ConfigHandler::class); $configHandlerStub->method('get') @@ -45,7 +52,7 @@ public function testGetUrlsReturnsNoUrls() static::assertSame([], $customUrlProvider->getUrls(new Context(), $shopContext)); } - public function testGetUrlsReturnsAllUrlsForShop() + public function testGetUrlsReturnsAllUrlsForShop(): void { $shopId = 1; @@ -55,13 +62,14 @@ public function testGetUrlsReturnsAllUrlsForShop() ->willReturn([ [ 'url' => 'foo', - 'lastMod' => 1546853378, + 'lastMod' => '2022-06-13 11:07:47', 'changeFreq' => 'weekly', 'priority' => 0.5, 'shopId' => 2, - ], [ + ], + [ 'url' => 'bar', - 'lastMod' => 1546853378, + 'lastMod' => '2022-06-13 11:07:47', 'changeFreq' => 'weekly', 'priority' => 0.5, 'shopId' => $shopId, @@ -72,10 +80,16 @@ public function testGetUrlsReturnsAllUrlsForShop() $shopContext = $this->getContextService()->createShopContext($shopId); - static::assertCount(1, $customUrlProvider->getUrls(new Context(), $shopContext)); + $urls = $customUrlProvider->getUrls(new Context(), $shopContext); + static::assertCount(1, $urls); + + static::assertSame( + 'bar2022-06-13weekly0.5', + (string) $urls[0] + ); } - public function testGetUrlsReturnsAllUrlsForShopIdZero() + public function testGetUrlsReturnsAllUrlsForShopIdZero(): void { $shopId = 1; @@ -85,19 +99,21 @@ public function testGetUrlsReturnsAllUrlsForShopIdZero() ->willReturn([ [ 'url' => 'foo', - 'lastMod' => 1546853378, + 'lastMod' => '2022-06-13 11:07:47', 'changeFreq' => 'weekly', 'priority' => 0.5, 'shopId' => 2, - ], [ + ], + [ 'url' => 'bar', - 'lastMod' => 1546853378, + 'lastMod' => '2022-06-13 11:07:47', 'changeFreq' => 'weekly', 'priority' => 0.5, 'shopId' => 0, - ], [ + ], + [ 'url' => 'fooBar', - 'lastMod' => 1546853378, + 'lastMod' => '2022-06-13 11:07:47', 'changeFreq' => 'weekly', 'priority' => 0.5, 'shopId' => 0, @@ -114,7 +130,7 @@ public function testGetUrlsReturnsAllUrlsForShopIdZero() static::assertSame('fooBar', $urls[1]->getLoc()); } - public function testGetUrlsReturnsNoUrlsWrongShopId() + public function testGetUrlsReturnsNoUrlsWrongShopId(): void { $shopId = 1; @@ -124,7 +140,7 @@ public function testGetUrlsReturnsNoUrlsWrongShopId() ->willReturn([ [ 'url' => 'foo', - 'lastMod' => 1546853378, + 'lastMod' => '2022-06-13 11:07:47', 'changeFreq' => 'weekly', 'priority' => 0.5, 'shopId' => 2, @@ -138,16 +154,13 @@ public function testGetUrlsReturnsNoUrlsWrongShopId() static::assertEmpty($customUrlProvider->getUrls(new Context(), $shopContext)); } - private function getCustomUrlProvider(ConfigHandler $configHandlerStub) + private function getCustomUrlProvider(ConfigHandler $configHandlerStub): CustomUrlProvider { return new CustomUrlProvider($configHandlerStub); } - /** - * @return \Shopware\Bundle\StoreFrontBundle\Service\Core\ContextService - */ - private function getContextService() + private function getContextService(): ContextService { - return Shopware()->Container()->get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class); + return $this->getContainer()->get(ContextServiceInterface::class); } } From a2bc7466715672571e9b2b5895c866e213ed7205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Schr=C3=B6der?= Date: Tue, 7 Jun 2022 19:09:17 +0200 Subject: [PATCH 045/730] SW-26753 - Add check for active dispatches in product export fixes https://github.com/shopware/shopware/pull/2499 --- engine/Shopware/Core/sExport.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/Shopware/Core/sExport.php b/engine/Shopware/Core/sExport.php index 9b19c5765c8..7a1d42ea475 100644 --- a/engine/Shopware/Core/sExport.php +++ b/engine/Shopware/Core/sExport.php @@ -1709,7 +1709,7 @@ public function sGetPremiumDispatchSurcharge($basket) return false; } - $sql = 'SELECT id, bind_sql FROM s_premium_dispatch WHERE type=2 AND bind_sql IS NOT NULL'; + $sql = 'SELECT id, bind_sql FROM s_premium_dispatch WHERE type=2 AND active=1 AND bind_sql IS NOT NULL'; $statements = $this->db->fetchPairs($sql); $sql_where = ''; From 381342d61307f66171aba0b274586c2063f37dd8 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 13 Jun 2022 13:48:47 +0200 Subject: [PATCH 046/730] SW-26753 - Add test and improve code quality --- .phpstan-baseline.neon | 5 -- .phpstan.neon | 4 ++ engine/Shopware/Core/sAdmin.php | 21 +++++---- engine/Shopware/Core/sExport.php | 48 +++++++++++--------- engine/Shopware/Models/Dispatch/Dispatch.php | 41 +++++++++++------ tests/Functional/Core/ExportTest.php | 46 +++++++++++++++++++ 6 files changed, 115 insertions(+), 50 deletions(-) diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index d6bb24318d7..d0acce098e9 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -30220,11 +30220,6 @@ parameters: count: 1 path: engine/Shopware/Core/sExport.php - - - message: "#^Method sExport\\:\\:sGetPremiumDispatchSurcharge\\(\\) has parameter \\$basket with no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Core/sExport.php - - message: "#^Parameter \\#1 \\$search of function str_replace expects array\\|string, string\\|false\\|null given\\.$#" count: 1 diff --git a/.phpstan.neon b/.phpstan.neon index 99987db73a7..b30613902b9 100644 --- a/.phpstan.neon +++ b/.phpstan.neon @@ -187,3 +187,7 @@ parameters: # This is a bleeding edge feature and not working well since now. See https://github.com/phpstan/phpstan-doctrine/issues/332 - '#Parameter .* of method Doctrine\\ORM\\.*::.*\(\) expects .*literal-string.* given#' + + - # Doctrine type is integer. PHPStan allows only specific values + message: '#Property Shopware\\Models\\Dispatch\\Dispatch::\$.* type mapping mismatch: database can contain int but property expects 0\|1\|2\|3#' + path: engine/Shopware/Models/Dispatch/Dispatch.php diff --git a/engine/Shopware/Core/sAdmin.php b/engine/Shopware/Core/sAdmin.php index e2aa363e08e..600af3b2797 100644 --- a/engine/Shopware/Core/sAdmin.php +++ b/engine/Shopware/Core/sAdmin.php @@ -49,6 +49,7 @@ use Shopware\Components\Validator\EmailValidatorInterface; use Shopware\Models\Customer\Address; use Shopware\Models\Customer\Customer; +use Shopware\Models\Dispatch\Dispatch; use Shopware\Models\Mail\Mail; use ShopwarePlugin\PaymentMethods\Components\BasePaymentMethod; @@ -3045,7 +3046,7 @@ public function sGetPremiumShippingcosts($country = null) ]); $basket = $this->sGetDispatchBasket(empty($country['id']) ? null : $country['id']); - if (empty($basket) || $basket['count_article'] == 0) { + if (empty($basket) || (int) $basket['count_article'] === 0) { return false; } $country = $this->sGetCountry($basket['countryID']); @@ -3129,11 +3130,11 @@ public function sGetPremiumShippingcosts($country = null) if (empty($dispatch['calculation'])) { $from = round($basket['weight'], 3); - } elseif ($dispatch['calculation'] == 1) { + } elseif ((int) $dispatch['calculation'] === Dispatch::CALCULATION_PRICE) { $from = round($basket['amount'], 2); - } elseif ($dispatch['calculation'] == 2) { + } elseif ((int) $dispatch['calculation'] === Dispatch::CALCULATION_NUMBER_OF_PRODUCTS) { $from = round($basket['count_article']); - } elseif ($dispatch['calculation'] == 3) { + } elseif ((int) $dispatch['calculation'] === Dispatch::CALCULATION_CUSTOM) { $from = round((float) $basket['calculation_value_' . $dispatch['id']], 2); } else { return false; @@ -3171,7 +3172,7 @@ public function sGetPremiumShippingcosts($country = null) $result['brutto'] = round($result['brutto'], 2); if ( !empty($payment['surcharge']) - && $dispatch['surcharge_calculation'] != 2 + && (int) $dispatch['surcharge_calculation'] !== Dispatch::SURCHARGE_CALCULATION_NEVER && (empty($basket['shippingfree']) || empty($dispatch['surcharge_calculation'])) ) { $result['surcharge'] = $payment['surcharge']; @@ -4008,7 +4009,7 @@ private function calculateDispatchSurcharge($basket, $dispatches) foreach ($dispatches as $dispatch) { if (empty($dispatch['calculation'])) { $from = round((float) $basket['weight'], 3); - } elseif ($dispatch['calculation'] == 1) { + } elseif ((int) $dispatch['calculation'] === Dispatch::CALCULATION_PRICE) { if ( ($this->config->get('sARTICLESOUTPUTNETTO') && !$this->sSYSTEM->sUSERGROUPDATA['tax']) || (!$this->sSYSTEM->sUSERGROUPDATA['tax'] && $this->sSYSTEM->sUSERGROUPDATA['id']) @@ -4017,9 +4018,9 @@ private function calculateDispatchSurcharge($basket, $dispatches) } else { $from = round((float) $basket['amount'], 2); } - } elseif ($dispatch['calculation'] == 2) { + } elseif ((int) $dispatch['calculation'] === Dispatch::CALCULATION_NUMBER_OF_PRODUCTS) { $from = (int) $basket['count_article']; - } elseif ($dispatch['calculation'] == 3) { + } elseif ((int) $dispatch['calculation'] === Dispatch::CALCULATION_CUSTOM) { $from = (int) $basket['calculation_value_' . $dispatch['id']]; } else { continue; @@ -4147,7 +4148,7 @@ private function handlePaymentMeanSurcharge($country, $payment, $currencyFactor, $payment['surcharge'] = round($payment['surcharge'] * $currencyFactor, 2); // Fixed surcharge - if (!empty($payment['surcharge']) && (empty($dispatch) || $dispatch['surcharge_calculation'] == 3)) { + if (!empty($payment['surcharge']) && (empty($dispatch) || (int) $dispatch['surcharge_calculation'] === Dispatch::SURCHARGE_CALCULATION_AS_CART_ITEM)) { $surcharge = round($payment['surcharge'], 2); $payment['surcharge'] = 0; @@ -4171,7 +4172,7 @@ private function handlePaymentMeanSurcharge($country, $payment, $currencyFactor, } // Percentage surcharge - if (!empty($payment['debit_percent']) && (empty($dispatch) || $dispatch['surcharge_calculation'] != 2)) { + if (!empty($payment['debit_percent']) && (empty($dispatch) || (int) $dispatch['surcharge_calculation'] !== Dispatch::SURCHARGE_CALCULATION_NEVER)) { $amount = (float) $this->db->fetchOne( 'SELECT SUM(quantity*price) AS amount FROM s_order_basket diff --git a/engine/Shopware/Core/sExport.php b/engine/Shopware/Core/sExport.php index 7a1d42ea475..91c121fb0b8 100644 --- a/engine/Shopware/Core/sExport.php +++ b/engine/Shopware/Core/sExport.php @@ -22,6 +22,7 @@ * our trademarks remain entirely with us. */ +use Doctrine\DBAL\Connection; use Doctrine\ORM\AbstractQuery; use Shopware\Bundle\AttributeBundle\Service\CrudService; use Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface; @@ -34,6 +35,7 @@ use Shopware\Components\Model\Exception\ModelNotFoundException; use Shopware\Components\ShopRegistrationServiceInterface; use Shopware\Components\Thumbnail\Manager; +use Shopware\Models\Dispatch\Dispatch; use Shopware\Models\Media\Album; use Shopware\Models\Media\Media; use Shopware\Models\Media\Repository; @@ -137,6 +139,8 @@ class sExport implements Enlight_Hook private Enlight_Components_Db_Adapter_Pdo_Mysql $db; + private Connection $connection; + private Shopware_Components_Config $config; private ConfiguratorServiceInterface $configuratorService; @@ -150,13 +154,15 @@ public function __construct( ContextServiceInterface $contextService = null, Enlight_Components_Db_Adapter_Pdo_Mysql $db = null, Shopware_Components_Config $config = null, - ConfiguratorServiceInterface $configuratorService = null + ConfiguratorServiceInterface $configuratorService = null, + Connection $connection = null ) { $container = Shopware()->Container(); $this->contextService = $contextService ?: $container->get(ContextServiceInterface::class); $this->additionalTextService = $container->get(AdditionalTextServiceInterface::class); $this->db = $db ?: $container->get('db'); + $this->connection = $connection ?: $container->get(Connection::class); $this->config = $config ?: $container->get(Shopware_Components_Config::class); $this->configuratorService = $configuratorService ?: $container->get(ConfiguratorServiceInterface::class); $this->cdnConfig = (array) $container->getParameter('shopware.cdn'); @@ -1699,7 +1705,7 @@ public function sGetPremiumDispatch($basket, $dispatch = null) } /** - * @param array $basket + * @param array $basket * * @return float|false */ @@ -1709,8 +1715,8 @@ public function sGetPremiumDispatchSurcharge($basket) return false; } - $sql = 'SELECT id, bind_sql FROM s_premium_dispatch WHERE type=2 AND active=1 AND bind_sql IS NOT NULL'; - $statements = $this->db->fetchPairs($sql); + $sql = 'SELECT id, bind_sql FROM s_premium_dispatch WHERE type=:type AND active=1 AND bind_sql IS NOT NULL'; + $statements = $this->connection->executeQuery($sql, ['type' => Dispatch::TYPE_SURCHARGE])->fetchAllKeyValue(); $sql_where = ''; foreach ($statements as $dispatchID => $statement) { @@ -1720,7 +1726,7 @@ public function sGetPremiumDispatchSurcharge($basket) } $sql_basket = []; foreach ($basket as $key => $value) { - $sql_basket[] = $this->db->quote($value) . " as `$key`"; + $sql_basket[] = $this->connection->quote($value) . " as `$key`"; } $sql_basket = implode(', ', $sql_basket); @@ -1787,30 +1793,28 @@ public function sGetPremiumDispatchSurcharge($basket) $sql_where GROUP BY d.id "; - $dispatches = $this->db->fetchAll($sql); + $dispatches = $this->connection->fetchAllAssociative($sql); $surcharge = 0; if (!empty($dispatches)) { foreach ($dispatches as $dispatch) { if (empty($dispatch['calculation'])) { $from = round($basket['weight'], 3); - } elseif ($dispatch['calculation'] == 1) { + } elseif ((int) $dispatch['calculation'] === Dispatch::CALCULATION_PRICE) { $from = round($basket['amount'], 2); - } elseif ($dispatch['calculation'] == 2) { + } elseif ((int) $dispatch['calculation'] === Dispatch::CALCULATION_NUMBER_OF_PRODUCTS) { $from = round($basket['count_article']); - } elseif ($dispatch['calculation'] == 3) { + } elseif ((int) $dispatch['calculation'] === Dispatch::CALCULATION_CUSTOM) { $from = round($basket['calculation_value_' . $dispatch['id']], 2); } else { continue; } - $sql = " - SELECT `value` , `factor` - FROM `s_premium_shippingcosts` - WHERE `from` <= $from - AND `dispatchID` = {$dispatch['id']} - ORDER BY `from` DESC - LIMIT 1 - "; - $result = $this->db->fetchRow($sql); + $sql = 'SELECT `value` , `factor` + FROM `s_premium_shippingcosts` + WHERE `from` <= $from + AND `dispatchID` = :dispatchId + ORDER BY `from` DESC + LIMIT 1'; + $result = $this->connection->fetchAssociative($sql, ['dispatchId' => $dispatch['id']]); if (!$result) { continue; } @@ -1856,11 +1860,11 @@ public function sGetArticlePremiumShippingcosts($article, $payment, $country, $d if (empty($dispatchData['calculation'])) { $from = round($basket['weight'], 3); - } elseif ($dispatchData['calculation'] == 1) { + } elseif ((int) $dispatchData['calculation'] === Dispatch::CALCULATION_PRICE) { $from = round($basket['amount'], 2); - } elseif ($dispatchData['calculation'] == 2) { + } elseif ((int) $dispatchData['calculation'] === Dispatch::CALCULATION_NUMBER_OF_PRODUCTS) { $from = round($basket['count_article']); - } elseif ($dispatchData['calculation'] == 3) { + } elseif ((int) $dispatchData['calculation'] === Dispatch::CALCULATION_CUSTOM) { $from = round($basket['calculation_value_' . $dispatchData['id']], 2); } else { return false; @@ -1893,7 +1897,7 @@ public function sGetArticlePremiumShippingcosts($article, $payment, $country, $d } $result['shippingcosts'] *= $this->sCurrency['factor']; $result['shippingcosts'] = round($result['shippingcosts'], 2); - if (!empty($payment['surcharge']) && $dispatchData['surcharge_calculation'] != 2 && (empty($article['shippingfree']) || empty($dispatchData['surcharge_calculation']))) { + if (!empty($payment['surcharge']) && (int) $dispatchData['surcharge_calculation'] !== Dispatch::SURCHARGE_CALCULATION_NEVER && (empty($article['shippingfree']) || empty($dispatchData['surcharge_calculation']))) { $result['shippingcosts'] += $payment['surcharge']; } diff --git a/engine/Shopware/Models/Dispatch/Dispatch.php b/engine/Shopware/Models/Dispatch/Dispatch.php index bb9b5575e99..f7a17a64875 100644 --- a/engine/Shopware/Models/Dispatch/Dispatch.php +++ b/engine/Shopware/Models/Dispatch/Dispatch.php @@ -56,6 +56,21 @@ */ class Dispatch extends ModelEntity { + public const TYPE_STANDARD = 0; + public const TYPE_ALTERNATIVE = 1; + public const TYPE_SURCHARGE = 2; + public const TYPE_DISCOUNT = 3; + + public const CALCULATION_WEIGHT = 0; + public const CALCULATION_PRICE = 1; + public const CALCULATION_NUMBER_OF_PRODUCTS = 2; + public const CALCULATION_CUSTOM = 3; + + public const SURCHARGE_CALCULATION_ALWAYS = 0; + public const SURCHARGE_CALCULATION_EXCLUDE_SHIPPING_FREE_PRODUCTS = 1; + public const SURCHARGE_CALCULATION_NEVER = 2; + public const SURCHARGE_CALCULATION_AS_CART_ITEM = 3; + /** * INVERSE SIDE * @@ -100,9 +115,9 @@ class Dispatch extends ModelEntity * - Standard Shipping == 0 * - Alternate Shipping == 1 * - Surcharge Shipping == 2 - * - Reduction Shipping == 3 + * - Discount Shipping == 3 * - * @var int + * @var self::TYPE_* * * @ORM\Column(name="type", type="integer", nullable=false) */ @@ -149,10 +164,10 @@ class Dispatch extends ModelEntity * Known types: * - 0 == Weight * - 1 == Price - * - 2 == Number of articles - * - 3 == Own Calculation + * - 2 == Number of products + * - 3 == Custom calculation * - * @var int + * @var self::CALCULATION_* * * @ORM\Column(name="calculation", type="integer", nullable=false) */ @@ -162,11 +177,11 @@ class Dispatch extends ModelEntity * Type of the calculation * Known Types: * - 0 == Always - * - 1 == Exclude dispatch fee free products + * - 1 == Exclude shipping free products * - 2 == Never * - 3 == Display as basket item * - * @var int + * @var self::SURCHARGE_CALCULATION_* * * @ORM\Column(name="surcharge_calculation", type="integer", nullable=false) */ @@ -445,7 +460,7 @@ public function getName() } /** - * @param int $type + * @param self::TYPE_* $type * * @return Dispatch */ @@ -457,7 +472,7 @@ public function setType($type) } /** - * @return int + * @return self::TYPE_* */ public function getType() { @@ -545,7 +560,7 @@ public function getPosition() } /** - * @param int $calculation + * @param self::CALCULATION_* $calculation * * @return Dispatch */ @@ -557,7 +572,7 @@ public function setCalculation($calculation) } /** - * @return int + * @return self::CALCULATION_* */ public function getCalculation() { @@ -565,7 +580,7 @@ public function getCalculation() } /** - * @param int $surchargeCalculation + * @param self::SURCHARGE_CALCULATION_* $surchargeCalculation * * @return Dispatch */ @@ -577,7 +592,7 @@ public function setSurchargeCalculation($surchargeCalculation) } /** - * @return int + * @return self::SURCHARGE_CALCULATION_* */ public function getSurchargeCalculation() { diff --git a/tests/Functional/Core/ExportTest.php b/tests/Functional/Core/ExportTest.php index 2006d04ca65..a43c33ff99b 100644 --- a/tests/Functional/Core/ExportTest.php +++ b/tests/Functional/Core/ExportTest.php @@ -31,7 +31,9 @@ use PHPUnit\Framework\TestCase; use RuntimeException; use sExport; +use Shopware\Components\Model\ModelManager; use Shopware\Components\Model\ModelRepository; +use Shopware\Models\Dispatch\Dispatch; use Shopware\Models\ProductFeed\ProductFeed; use Shopware\Tests\Functional\Traits\ContainerTrait; use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour; @@ -153,6 +155,50 @@ public function testMainNumbersAreIncludedInTheExport(): void static::assertArrayHasKey('mainnumber', $result); } + public function testsGetPremiumDispatchSurcharge(): void + { + $testSurcharge = new Dispatch(); + $testSurcharge->setName('Test surcharge'); + $testSurcharge->setDescription(''); + $testSurcharge->setComment(''); + $testSurcharge->setPosition(0); + $testSurcharge->setCalculation(Dispatch::CALCULATION_WEIGHT); + $testSurcharge->setSurchargeCalculation(Dispatch::SURCHARGE_CALCULATION_ALWAYS); + $testSurcharge->setTaxCalculation(0); + $testSurcharge->setBindLastStock(0); + + $testSurcharge->setType(Dispatch::TYPE_SURCHARGE); + $testSurcharge->setActive(false); + $testSurcharge->setBindSql('foo=bar'); + + $this->getContainer()->get(ModelManager::class)->persist($testSurcharge); + $this->getContainer()->get(ModelManager::class)->flush($testSurcharge); + + $cart = [ + 'instock' => '1', + 'stockmin' => '1', + 'laststock' => '0', + 'weight' => '0.000', + 'count_article' => '1', + 'shippingfree' => '0', + 'amount' => '19.99', + 'max_tax' => '19.00', + 'userID' => null, + 'has_topseller' => '0', + 'has_comment' => '', + 'has_esd' => '0', + 'articleID' => '2', + 'countryID' => '2', + 'paymentID' => '5', + 'customergroupID' => '1', + 'multishopID' => '1', + 'sessionID' => null, + ]; + $surcharge = $this->export->sGetPremiumDispatchSurcharge($cart); + + static::assertSame(0.0, $surcharge); + } + private function generateFeed(int $feedId): string { $productFeed = $this->repository->find($feedId); From 1b3896b025651e3340c58fc810a10425def592f3 Mon Sep 17 00:00:00 2001 From: Dominik Rathmer Date: Mon, 25 Apr 2022 11:30:13 +0200 Subject: [PATCH 047/730] SW-25580 - Added captcha for product email notification --- .phpstan-baseline.neon | 5 - ...-option-for-email-notification-captcha.php | 71 +++++++ .../Shopware/Controllers/Frontend/Account.php | 5 +- .../Frontend/Notification/Bootstrap.php | 33 ++- .../frontend/plugins/notification/index.ini | 4 +- .../Plugins/Frontend/NotificationTest.php | 195 ++++++++++++++++++ .../frontend/plugins/notification/index.tpl | 12 ++ .../Bare/widgets/captcha/custom_captcha.tpl | 2 +- .../frontend/_public/src/js/jquery.captcha.js | 2 + .../_public/src/less/_modules/detail.less | 5 + 10 files changed, 316 insertions(+), 18 deletions(-) create mode 100644 _sql/migrations/1714-add-option-for-email-notification-captcha.php create mode 100644 tests/Functional/Plugins/Frontend/NotificationTest.php diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index e381eb5f78f..466fd610afe 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -39905,11 +39905,6 @@ parameters: count: 1 path: engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php - - - message: "#^PHPDoc tag @return has invalid value \\(\\)\\: Unexpected token \"\\\\n \", expected type at offset 167$#" - count: 1 - path: engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php - - message: "#^Method Shopware_Plugins_Frontend_RouterRewrite_Bootstrap\\:\\:onPreDispatch\\(\\) has no return type specified\\.$#" count: 1 diff --git a/_sql/migrations/1714-add-option-for-email-notification-captcha.php b/_sql/migrations/1714-add-option-for-email-notification-captcha.php new file mode 100644 index 00000000000..95c567cfc7f --- /dev/null +++ b/_sql/migrations/1714-add-option-for-email-notification-captcha.php @@ -0,0 +1,71 @@ +addSql($sql); + + // Create Captcha Option in Password Reset + $sql = <<<'EOD' + INSERT IGNORE s_core_config_elements + (`form_id`, `name`, `value`, `label`, `description`, `type`, `required`, `position`, `scope`, `options`) + VALUE + (LAST_INSERT_ID(), 'notificationCaptchaConfig', '%s', 'Captcha für E-Mail Benachrichtigungen von Produkten', 'Wenn diese Option aktiv ist, wird das Formular zur E-Mail Benachrichtigung für die Verfügbarkeit eines Produktes mit einem Captcha geschützt.', 'combo', 1, 0, 1, 'a:5:{s:8:"editable";b:0;s:10:"valueField";s:2:"id";s:12:"displayField";s:11:"displayname";s:13:"triggerAction";s:3:"all";s:5:"store";s:12:"base.Captcha";}'); +EOD; + $this->addSql(sprintf($sql, serialize('nocaptcha'))); + + // Translation + $sql = <<<'EOD' + SET @elementId = (SELECT id FROM `s_core_config_elements` WHERE `name` LIKE 'notificationCaptchaConfig' LIMIT 1); +EOD; + $this->addSql($sql); + + $sql = <<<'EOD' + INSERT IGNORE INTO `s_core_config_element_translations` + (`element_id`, `locale_id`, `label`, `description`) + VALUES + (@elementId, '2', 'Use captcha for the e-mail notification for products', 'If this option is active, a captcha is used to protect e-mail notification form to notify about new products in stock.'); +EOD; + $this->addSql($sql); + + // Config Element Translation + $sql = <<<'EOD' + SET @form_id = (SELECT id FROM `s_core_config_forms` WHERE `name` LIKE 'notificationCaptchaConfig' LIMIT 1); +EOD; + $this->addSql($sql); + + $sql = <<<'EOD' + INSERT INTO s_core_config_form_translations(form_id, locale_id, label) + VALUES (@form_id, 2, 'Product Notification'); +EOD; + $this->addSql($sql); + } +} + diff --git a/engine/Shopware/Controllers/Frontend/Account.php b/engine/Shopware/Controllers/Frontend/Account.php index 0b373765d4c..d3cecc2ba87 100644 --- a/engine/Shopware/Controllers/Frontend/Account.php +++ b/engine/Shopware/Controllers/Frontend/Account.php @@ -37,6 +37,7 @@ use Shopware\Bundle\StoreFrontBundle\Gateway\CountryGatewayInterface; use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface; use Shopware\Components\Captcha\CaptchaValidator; +use Shopware\Components\Captcha\NoCaptcha; use Shopware\Components\Compatibility\LegacyStructConverter; use Shopware\Components\Model\ModelManager; use Shopware\Components\Random; @@ -49,8 +50,6 @@ class Shopware_Controllers_Frontend_Account extends Enlight_Controller_Action { - private const DEFAULT_CAPTCHA_SETTING = 'nocaptcha'; - private const CONFIG_PASSWORD_RESET_CAPTCHA = 'passwordResetCaptcha'; /** @@ -488,7 +487,7 @@ public function passwordAction() public function sendResetPasswordConfirmationMail($email) { $snippets = Shopware()->Snippets()->getNamespace('frontend/account/password'); - if ($this->config->get(self::CONFIG_PASSWORD_RESET_CAPTCHA) !== self::DEFAULT_CAPTCHA_SETTING) { + if ($this->config->get(self::CONFIG_PASSWORD_RESET_CAPTCHA) !== NoCaptcha::CAPTCHA_METHOD) { if (!empty($this->config->get('CaptchaColor'))) { if (!$this->captchaValidator->validateByName($this->config->get(self::CONFIG_PASSWORD_RESET_CAPTCHA), $this->Request())) { return [ diff --git a/engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php b/engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php index c1be2b8c66b..84304852872 100644 --- a/engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php @@ -22,6 +22,9 @@ * our trademarks remain entirely with us. */ +use Doctrine\DBAL\Connection; +use Shopware\Components\Captcha\CaptchaValidator; +use Shopware\Components\Captcha\NoCaptcha; use Shopware\Components\Random; use Shopware\Components\Routing\Context; use Shopware\Components\Validator\EmailValidator; @@ -35,6 +38,8 @@ */ class Shopware_Plugins_Frontend_Notification_Bootstrap extends Shopware_Components_Plugin_Bootstrap { + private const CONFIG_NOTIFY_CAPTCHA = 'notificationCaptchaConfig'; + /** * Installation of plugin * Create-Events to include custom code on product detail page @@ -95,7 +100,7 @@ public function onPostDispatch(Enlight_Event_EventArgs $args) if (!empty($notificationProducts)) { $sql = 'SELECT `ordernumber` FROM `s_articles_details` WHERE `articleID`=?'; - $ordernumbers = $this->get('dbal_connection')->fetchColumn($sql, [$id]); + $ordernumbers = $this->get(Connection::class)->fetchColumn($sql, [$id]); if (!empty($ordernumbers)) { foreach ($ordernumbers as $ordernumber) { @@ -123,7 +128,7 @@ public function onPostDispatch(Enlight_Event_EventArgs $args) * * @static * - * @return + * @throws Exception */ public function onNotifyAction(Enlight_Event_EventArgs $args) { @@ -138,8 +143,7 @@ public function onNotifyAction(Enlight_Event_EventArgs $args) $sError = false; $action->View()->assign('NotifyEmailError', false); $notifyOrderNumber = $action->Request()->getParam('notifyOrdernumber'); - /** @var \Doctrine\DBAL\Connection $connection */ - $connection = $this->get('dbal_connection'); + $connection = $this->get(Connection::class); /** @var \Symfony\Component\HttpFoundation\Session\SessionInterface $session */ $session = $this->get('session'); @@ -147,6 +151,19 @@ public function onNotifyAction(Enlight_Event_EventArgs $args) $sNotificatedArticles = $session->get('sNotificatedArticles', []); if (!empty($notifyOrderNumber)) { + $captchaValidator = $this->get(CaptchaValidator::class); + $config = $this->get(Shopware_Components_Config::class); + + if ($config->get(self::CONFIG_NOTIFY_CAPTCHA) !== NoCaptcha::CAPTCHA_METHOD) { + if (!empty($config->get('CaptchaColor'))) { + if (!$captchaValidator->validateByName($config->get(self::CONFIG_NOTIFY_CAPTCHA), $action->Request())) { + $sError = true; + $action->View()->assign('NotifyCaptchaError', true); + $action->View()->assign('ShowNotification', true); + } + } + } + $validator = $this->get(EmailValidator::class); if (empty($email) || !$validator->isValid($email)) { $sError = true; @@ -219,7 +236,7 @@ public function onNotifyAction(Enlight_Event_EventArgs $args) } } - return $action->forward('index'); + $action->forward('index'); } /** @@ -237,8 +254,8 @@ public function onNotifyConfirmAction(Enlight_Event_EventArgs $args) /** @var Enlight_Controller_Action $action */ $action = $args->getSubject(); - /** @var \Doctrine\DBAL\Connection $db */ - $db = $this->get('dbal_connection'); + /** @var Connection $db */ + $db = $this->get(Connection::class); /** @var \Symfony\Component\HttpFoundation\Session\SessionInterface $session */ $session = $this->get('session'); @@ -329,7 +346,7 @@ public function onRunCronJob(Shopware_Components_Cron_CronJob $job) { $modelManager = $this->get(\Shopware\Components\Model\ModelManager::class); - $conn = $this->get(\Doctrine\DBAL\Connection::class); + $conn = $this->get(Connection::class); $notifications = $conn->createQueryBuilder() ->select( diff --git a/snippets/frontend/plugins/notification/index.ini b/snippets/frontend/plugins/notification/index.ini index 58ff644e70e..548b3fd9466 100644 --- a/snippets/frontend/plugins/notification/index.ini +++ b/snippets/frontend/plugins/notification/index.ini @@ -6,6 +6,7 @@ DetailNotifyInfoInvalid = "An error has occurred while validating your email add DetailNotifyInfoSuccess = "Please confirm your request by clicking the link provided with the email we just sent you. Assuming successful confirmation, you will be notified as soon as the item is available again." DetailNotifyInfoValid = "Thank you! We have successfully saved your request. You will be notified as soon as the item is available again." DetailNotifyLabelMail = "Your email address" +DetailNotifyCaptchaInvalid = "Please fill in the captcha-field correctly." [de_DE] DetailNotifyAlreadyRegistered = "Sie haben sich bereits für eine Benachrichtigung für diesen Artikel eingetragen!" @@ -14,4 +15,5 @@ DetailNotifyInfoErrorMail = "Bitte geben Sie eine gültige E-Mail-Adresse ein" DetailNotifyInfoInvalid = "Bei der Validierung Ihrer E-Mail-Benachrichtigung ist ein Fehler aufgetreten. Eventuell wurde Ihre E-Mail-Adresse bereits validiert." DetailNotifyInfoSuccess = "Bestätigen Sie den Link der E-Mail, die wir Ihnen soeben geschickt haben. Wir benachrichtigen Sie dann, sobald der Artikel wieder verfügbar ist." DetailNotifyInfoValid = "Vielen Dank! Wir haben Ihre Anfrage gespeichert. Sie werden benachrichtigt sobald der Artikel wieder verfügbar ist." -DetailNotifyLabelMail = "Ihre E-Mail-Adresse" \ No newline at end of file +DetailNotifyLabelMail = "Ihre E-Mail-Adresse" +DetailNotifyCaptchaInvalid = "Bitte füllen Sie das Captcha-Feld korrekt aus." \ No newline at end of file diff --git a/tests/Functional/Plugins/Frontend/NotificationTest.php b/tests/Functional/Plugins/Frontend/NotificationTest.php new file mode 100644 index 00000000000..1aad6fbd7cc --- /dev/null +++ b/tests/Functional/Plugins/Frontend/NotificationTest.php @@ -0,0 +1,195 @@ + 'SW10239', + 'sNotificationemail' => 'test@example.de', + ]; + + public const NOTIFICATION_ACTION_URL = 'genusswelten/koestlichkeiten/272/spachtelmasse?action=notify&number=SW10239'; + + /** + * @throws \Doctrine\DBAL\Exception + */ + public function setUp(): void + { + $this->getContainer()->reset(InstallerService::class); + $this->getContainer()->reset(LegacyPluginInstaller::class); + $pluginManager = $this->getContainer()->get(InstallerService::class); + + $pluginManager->refreshPluginList(); + + $plugin = $pluginManager->getPluginByName('Notification'); + + $pluginManager->installPlugin($plugin); + $pluginManager->activatePlugin($plugin); + + $this->getContainer()->reset('plugins')->load('plugins'); + + $sql = 'UPDATE s_articles SET notification = 1 WHERE id = ' . self::PRODUCT_ID; + $this->getContainer()->get('dbal_connection')->executeQuery($sql); + parent::setUp(); + } + + public function tearDown(): void + { + $this->saveNotifyCaptcha('nocaptcha'); + parent::tearDown(); + } + + /** + * @throws Exception + */ + public function testValidateCaptchaWithInvalidName(): void + { + $this->saveNotifyCaptcha('notExistingCaptchaOption'); + $random = md5(uniqid()); + $sessionVars = ['sCaptcha' => $random]; + $this->getContainer()->get('session')->offsetSet(DefaultCaptcha::SESSION_KEY, $sessionVars); + + $postParameter = self::NOTIFY_POST_PARAMETERS; + $postParameter['sCaptcha'] = $random; + + $this->Request()->setMethod('POST'); + $this->Request()->setPost($postParameter); + $this->expectException(CaptchaNotFoundException::class); + $this->dispatch(self::NOTIFICATION_ACTION_URL); + } + + public function testNoCaptcha(): void + { + $this->saveNotifyCaptcha('nocaptcha'); + $postParameter = self::NOTIFY_POST_PARAMETERS; + + $this->Request()->setMethod('POST'); + $this->Request()->setPost($postParameter); + + $this->dispatch(self::NOTIFICATION_ACTION_URL); + + $viewVariables = $this->View()->getAssign(); + static::assertArrayNotHasKey('NotifyCaptchaError', $viewVariables); + } + + public function testHoneypot(): void + { + $this->saveNotifyCaptcha('honeypot'); + $postParameter = self::NOTIFY_POST_PARAMETERS; + + $this->Request()->setMethod('POST'); + $this->Request()->setPost($postParameter); + + $this->dispatch(self::NOTIFICATION_ACTION_URL); + + $viewVariables = $this->View()->getAssign(); + + static::assertArrayNotHasKey('NotifyCaptchaError', $viewVariables); + } + + public function testDefault(): void + { + $this->saveNotifyCaptcha('default'); + $random = md5(uniqid()); + $sessionVars = ['sCaptcha' => $random, $random => true]; + + $this->getContainer()->get('session')->offsetSet(DefaultCaptcha::SESSION_KEY, $sessionVars); + + $postParameter = self::NOTIFY_POST_PARAMETERS; + $postParameter['sCaptcha'] = $random; + $this->Request()->setMethod('POST'); + $this->Request()->setPost($postParameter); + + $this->dispatch(self::NOTIFICATION_ACTION_URL); + $viewVariables = $this->View()->getAssign(); + static::assertArrayNotHasKey('NotifyCaptchaError', $viewVariables); + } + + public function testInvalidDefault(): void + { + $this->saveNotifyCaptcha('default'); + $random = md5(uniqid()); + $sessionVars = ['sCaptcha' => $random]; + + $this->getContainer()->get('session')->offsetSet(DefaultCaptcha::SESSION_KEY, $sessionVars); + + $postParameter = self::NOTIFY_POST_PARAMETERS; + $postParameter['sCaptcha'] = $random; + + $this->Request()->setMethod('POST'); + $this->Request()->setPost($postParameter); + + $this->dispatch(self::NOTIFICATION_ACTION_URL); + + $viewVariables = $this->View()->getAssign(); + static::assertArrayHasKey('NotifyCaptchaError', $viewVariables); + } + + public function testInvalidHoneypot(): void + { + $this->saveNotifyCaptcha('honeypot'); + $postParameter = self::NOTIFY_POST_PARAMETERS; + $postParameter['first_name_confirmation'] = uniqid(); + + $this->Request()->setMethod('POST'); + $this->Request()->setPost($postParameter); + + $this->dispatch(self::NOTIFICATION_ACTION_URL); + + $viewVariables = $this->View()->getAssign(); + + static::assertArrayHasKey('NotifyCaptchaError', $viewVariables); + } + + private function saveNotifyCaptcha(string $value): void + { + $formattedValue = sprintf('s:%d:"%s";', \strlen($value), $value); + $this->getContainer()->get(Connection::class)->executeQuery( + 'UPDATE s_core_config_elements SET value = ? WHERE name = ?', + [$formattedValue, 'notificationCaptchaConfig'] + ); + + $this->getContainer()->get('cache')->clean(); + } +} diff --git a/themes/Frontend/Bare/frontend/plugins/notification/index.tpl b/themes/Frontend/Bare/frontend/plugins/notification/index.tpl index c58dc223b8f..9c95a9ecc4a 100644 --- a/themes/Frontend/Bare/frontend/plugins/notification/index.tpl +++ b/themes/Frontend/Bare/frontend/plugins/notification/index.tpl @@ -4,6 +4,9 @@ {if $NotifyValid == true} {$messageType="success"} {s name="DetailNotifyInfoValid" assign="messageContent"}{/s} + {elseif $NotifyCaptchaError == true} + {$messageType="error"} + {s name='DetailNotifyCaptchaInvalid' assign="messageContent"}{/s} {elseif $NotifyInvalid == true && $NotifyAlreadyRegistered != true} {$messageType="warning"} {s name="DetailNotifyInfoInvalid" assign="messageContent"}{/s} @@ -40,6 +43,15 @@ {/block} + {* Captcha *} + {block name='frontend_account_index_form_captcha'} +
+ {$captchaName = {config name="notificationCaptchaConfig"}} + {$captchaHasError = $NotifyCaptchaError} + {include file="widgets/captcha/custom_captcha.tpl" captchaName=$captchaName captchaHasError=$captchaHasError} +
+ {/block} + {* Data protection information *} {block name="frontend_detail_index_notification_privacy"} {if {config name="ACTDPRTEXT"} || {config name="ACTDPRCHECK"}} diff --git a/themes/Frontend/Bare/widgets/captcha/custom_captcha.tpl b/themes/Frontend/Bare/widgets/captcha/custom_captcha.tpl index dd9bfe3adca..43d495c18d6 100644 --- a/themes/Frontend/Bare/widgets/captcha/custom_captcha.tpl +++ b/themes/Frontend/Bare/widgets/captcha/custom_captcha.tpl @@ -7,7 +7,7 @@ {/block} {if !$isNoCaptcha} -
+
{block name="frontend_widgets_captcha_custom_captcha_placeholder"}
Date: Fri, 3 Jun 2022 13:09:47 +0200 Subject: [PATCH 048/730] SW-26748 - improve input filter --- composer.json | 5 +- composer.lock | 341 +++++++++++++----- .../Frontend/InputFilter/Bootstrap.php | 118 +++--- .../Frontend/InputFilter/FilterTest.php | 46 +++ 4 files changed, 381 insertions(+), 129 deletions(-) diff --git a/composer.json b/composer.json index 111400e8561..1a93dbbd3e5 100644 --- a/composer.json +++ b/composer.json @@ -84,13 +84,16 @@ "symfony/serializer": "~5.4.0", "symfony/validator": "~4.4.34", "symfony/web-link": "~4.4.27", + "voku/anti-xss": "~4.1.39", "wikimedia/less.php": "3.1.0" }, "replace": { "paragonie/random_compat": "*", "symfony/polyfill-ctype": "*", "symfony/polyfill-php72": "*", - "symfony/polyfill-php73": "*" + "symfony/polyfill-php73": "*", + "symfony/polyfill-iconv": "*", + "symfony/polyfill-mbstring": "*" }, "suggest": { "ext-apcu": "*", diff --git a/composer.lock b/composer.lock index c91936db8ab..387b1a14e23 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": "04af69417e3a2d261d9f0c8ea6c5854c", + "content-hash": "aa9e7479e5376871d41275c10dffa31c", "packages": [ { "name": "aws/aws-crt-php", @@ -5883,89 +5883,6 @@ ], "time": "2022-05-24T11:49:31+00:00" }, - { - "name": "symfony/polyfill-mbstring", - "version": "v1.26.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "provide": { - "ext-mbstring": "*" - }, - "suggest": { - "ext-mbstring": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.26-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for the Mbstring extension", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "mbstring", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-05-24T11:49:31+00:00" - }, { "name": "symfony/polyfill-php80", "version": "v1.26.0", @@ -7069,6 +6986,262 @@ ], "time": "2022-01-02T09:41:36+00:00" }, + { + "name": "voku/anti-xss", + "version": "4.1.39", + "source": { + "type": "git", + "url": "https://github.com/voku/anti-xss.git", + "reference": "64a59ba4744e6722866ff3440d93561da9e85cd0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/voku/anti-xss/zipball/64a59ba4744e6722866ff3440d93561da9e85cd0", + "reference": "64a59ba4744e6722866ff3440d93561da9e85cd0", + "shasum": "" + }, + "require": { + "php": ">=7.0.0", + "voku/portable-utf8": "~6.0.2" + }, + "require-dev": { + "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "voku\\helper\\": "src/voku/helper/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "EllisLab Dev Team", + "homepage": "http://ellislab.com/" + }, + { + "name": "Lars Moelleken", + "email": "lars@moelleken.org", + "homepage": "https://www.moelleken.org/" + } + ], + "description": "anti xss-library", + "homepage": "https://github.com/voku/anti-xss", + "keywords": [ + "anti-xss", + "clean", + "security", + "xss" + ], + "support": { + "issues": "https://github.com/voku/anti-xss/issues", + "source": "https://github.com/voku/anti-xss/tree/4.1.39" + }, + "funding": [ + { + "url": "https://www.paypal.me/moelleken", + "type": "custom" + }, + { + "url": "https://github.com/voku", + "type": "github" + }, + { + "url": "https://opencollective.com/anti-xss", + "type": "open_collective" + }, + { + "url": "https://www.patreon.com/voku", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/voku/anti-xss", + "type": "tidelift" + } + ], + "time": "2022-03-08T17:03:58+00:00" + }, + { + "name": "voku/portable-ascii", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/voku/portable-ascii.git", + "reference": "b56450eed252f6801410d810c8e1727224ae0743" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b56450eed252f6801410d810c8e1727224ae0743", + "reference": "b56450eed252f6801410d810c8e1727224ae0743", + "shasum": "" + }, + "require": { + "php": ">=7.0.0" + }, + "require-dev": { + "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0" + }, + "suggest": { + "ext-intl": "Use Intl for transliterator_transliterate() support" + }, + "type": "library", + "autoload": { + "psr-4": { + "voku\\": "src/voku/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Lars Moelleken", + "homepage": "http://www.moelleken.org/" + } + ], + "description": "Portable ASCII library - performance optimized (ascii) string functions for php.", + "homepage": "https://github.com/voku/portable-ascii", + "keywords": [ + "ascii", + "clean", + "php" + ], + "support": { + "issues": "https://github.com/voku/portable-ascii/issues", + "source": "https://github.com/voku/portable-ascii/tree/2.0.1" + }, + "funding": [ + { + "url": "https://www.paypal.me/moelleken", + "type": "custom" + }, + { + "url": "https://github.com/voku", + "type": "github" + }, + { + "url": "https://opencollective.com/portable-ascii", + "type": "open_collective" + }, + { + "url": "https://www.patreon.com/voku", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii", + "type": "tidelift" + } + ], + "time": "2022-03-08T17:03:00+00:00" + }, + { + "name": "voku/portable-utf8", + "version": "6.0.4", + "source": { + "type": "git", + "url": "https://github.com/voku/portable-utf8.git", + "reference": "f6c78e492520115bb2d947c3a0d90a2c6b7a60a8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/voku/portable-utf8/zipball/f6c78e492520115bb2d947c3a0d90a2c6b7a60a8", + "reference": "f6c78e492520115bb2d947c3a0d90a2c6b7a60a8", + "shasum": "" + }, + "require": { + "php": ">=7.0.0", + "symfony/polyfill-iconv": "~1.0", + "symfony/polyfill-intl-grapheme": "~1.0", + "symfony/polyfill-intl-normalizer": "~1.0", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php72": "~1.0", + "voku/portable-ascii": "~2.0.0" + }, + "require-dev": { + "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0" + }, + "suggest": { + "ext-ctype": "Use Ctype for e.g. hexadecimal digit detection", + "ext-fileinfo": "Use Fileinfo for better binary file detection", + "ext-iconv": "Use iconv for best performance", + "ext-intl": "Use Intl for best performance", + "ext-json": "Use JSON for string detection", + "ext-mbstring": "Use Mbstring for best performance" + }, + "type": "library", + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "voku\\": "src/voku/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "(Apache-2.0 or GPL-2.0)" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Hamid Sarfraz", + "homepage": "http://pageconfig.com/" + }, + { + "name": "Lars Moelleken", + "homepage": "http://www.moelleken.org/" + } + ], + "description": "Portable UTF-8 library - performance optimized (unicode) string functions for php.", + "homepage": "https://github.com/voku/portable-utf8", + "keywords": [ + "UTF", + "clean", + "php", + "unicode", + "utf-8", + "utf8" + ], + "support": { + "issues": "https://github.com/voku/portable-utf8/issues", + "source": "https://github.com/voku/portable-utf8/tree/6.0.4" + }, + "funding": [ + { + "url": "https://www.paypal.me/moelleken", + "type": "custom" + }, + { + "url": "https://github.com/voku", + "type": "github" + }, + { + "url": "https://opencollective.com/portable-utf8", + "type": "open_collective" + }, + { + "url": "https://www.patreon.com/voku", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/voku/portable-utf8", + "type": "tidelift" + } + ], + "time": "2022-03-08T17:04:59+00:00" + }, { "name": "wikimedia/less.php", "version": "v3.1.0", diff --git a/engine/Shopware/Plugins/Default/Frontend/InputFilter/Bootstrap.php b/engine/Shopware/Plugins/Default/Frontend/InputFilter/Bootstrap.php index 272e34aceeb..3fdebfd84fe 100644 --- a/engine/Shopware/Plugins/Default/Frontend/InputFilter/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Frontend/InputFilter/Bootstrap.php @@ -22,11 +22,16 @@ * our trademarks remain entirely with us. */ +use voku\helper\AntiXSS; + /** * Shopware InputFilter Plugin */ class Shopware_Plugins_Frontend_InputFilter_Bootstrap extends Shopware_Components_Plugin_Bootstrap { + public const ALLOWED_ATTRIBUTES_KEY = 'allowedAttributes'; + public const ALLOWED_HTML_TAGS_KEY = 'allowedHtmlTags'; + /** * @var string */ @@ -37,6 +42,50 @@ class Shopware_Plugins_Frontend_InputFilter_Bootstrap extends Shopware_Component */ public $xssRegex = 'javascript:|src\s*=|\bon[a-z]+\s*=|style\s*=|\bdata-\w+(?!\.)\b\s?=?'; + /** + * @var array> + */ + public array $stripTagsWhiteList = [ + 'frontend/account/login' => [ + 'password', + ], + 'frontend/account/savepassword' => [ + 'password', + 'passwordConfirmation', + 'currentPassword', + ], + 'frontend/register/ajax_validate_email' => [ + 'password', + ], + 'frontend/register/ajax_validate_password' => [ + 'password', + ], + 'frontend/register/saveregister' => [ + 'password', + ], + 'frontend/account/resetpassword' => [ + 'password', + 'passwordConfirmation', + ], + 'frontend/account/saveemail' => [ + 'currentPassword', + ], + ]; + + /** + * @var array>>> + * + * usage: + * + * 'frontend/account/login' => [ + * 'password' => [ + * self::ALLOWED_ATTRIBUTES_KEY => [], + * self::ALLOWED_HTML_TAGS_KEY => [] + * ] + * ] + */ + public array $allowanceList = []; + /** * @var string */ @@ -102,10 +151,6 @@ public function onRouteShutdown(Enlight_Controller_EventArgs $args) $regex[] = $config->own_filter; } - if (empty($regex)) { - return; - } - $regex = '#' . implode('|', $regex) . '#msi'; $userParams = $request->getUserParams(); @@ -113,33 +158,6 @@ public function onRouteShutdown(Enlight_Controller_EventArgs $args) &$_GET, &$_POST, &$_COOKIE, &$_REQUEST, &$_SERVER, &$userParams, ]; - $whiteList = [ - 'frontend/account/login' => [ - 'password', - ], - 'frontend/account/savepassword' => [ - 'password', - 'passwordConfirmation', - 'currentPassword', - ], - 'frontend/register/ajax_validate_email' => [ - 'password', - ], - 'frontend/register/ajax_validate_password' => [ - 'password', - ], - 'frontend/register/saveregister' => [ - 'password', - ], - 'frontend/account/resetpassword' => [ - 'password', - 'passwordConfirmation', - ], - 'frontend/account/saveemail' => [ - 'currentPassword', - ], - ]; - $route = strtolower( implode( '/', @@ -147,14 +165,17 @@ public function onRouteShutdown(Enlight_Controller_EventArgs $args) ) ); - $whiteList = \array_key_exists($route, $whiteList) ? $whiteList[$route] : []; + $stripTagsWhiteList = \array_key_exists($route, $this->stripTagsWhiteList) ? $this->stripTagsWhiteList[$route] : []; + $allowanceList = \array_key_exists($route, $this->allowanceList) ? $this->allowanceList[$route] : []; foreach ($process as $key => $val) { foreach ($val as $k => $v) { unset($process[$key][$k]); - $stripTags = \in_array($k, $whiteList) ? false : $stripTagsConf; + $stripTags = \in_array($k, $stripTagsWhiteList) ? false : $stripTagsConf; + $allowedHtmlTags = \array_key_exists($k, $allowanceList) ? $allowanceList[$k][self::ALLOWED_HTML_TAGS_KEY] : []; + $allowedAttributes = \array_key_exists($k, $allowanceList) ? $allowanceList[$k][self::ALLOWED_ATTRIBUTES_KEY] : []; if (\is_string($k)) { - $filteredKey = self::filterValue($k, $regex, $stripTags); + $filteredKey = self::filterValue($k, $regex, $stripTags, $allowedHtmlTags, $allowedAttributes); } else { $filteredKey = $k; } @@ -164,12 +185,12 @@ public function onRouteShutdown(Enlight_Controller_EventArgs $args) } if (\is_array($v)) { - $process[$key][$filteredKey] = self::filterArrayValue($v, $regex, $stripTags); + $process[$key][$filteredKey] = self::filterArrayValue($v, $regex, $stripTags, $allowedHtmlTags, $allowedAttributes); continue; } if (\is_string($v)) { - $process[$key][$filteredKey] = self::filterValue($v, $regex, $stripTags); + $process[$key][$filteredKey] = self::filterValue($v, $regex, $stripTags, $allowedHtmlTags, $allowedAttributes); continue; } @@ -188,13 +209,15 @@ public function onRouteShutdown(Enlight_Controller_EventArgs $args) /** * Filter value by regex * - * @param string $value - * @param string $regex - * @param bool $stripTags + * @param string $value + * @param string $regex + * @param bool $stripTags + * @param array $allowedHtmlTags + * @param array $allowedAttributes * * @return string|null */ - public static function filterValue($value, $regex, $stripTags = true) + public static function filterValue($value, $regex, $stripTags = true, array $allowedHtmlTags = [], array $allowedAttributes = []) { if (empty($value)) { return $value; @@ -208,22 +231,29 @@ public static function filterValue($value, $regex, $stripTags = true) return null; } - return $value; + $antiXss = new AntiXSS(); + $antiXss->removeEvilAttributes($allowedHtmlTags); + $antiXss->removeEvilHtmlTags($allowedAttributes); + $value = $antiXss->xss_clean($value); + + return \str_replace(['<', '>'], ['<', '>'], $value); } /** * @param array $value + * @param array $allowedHtmlTags + * @param array $allowedAttributes * * @return array|null */ - public static function filterArrayValue(array $value, string $regex, bool $stripTags = true): ?array + public static function filterArrayValue(array $value, string $regex, bool $stripTags = true, array $allowedHtmlTags = [], array $allowedAttributes = []): ?array { $newReturn = []; foreach ($value as $valueKey => $valueValue) { if (\is_int($valueKey)) { $filteredKey = $valueKey; } else { - $filteredKey = self::filterValue($valueKey, $regex, $stripTags); + $filteredKey = self::filterValue($valueKey, $regex, $stripTags, $allowedHtmlTags, $allowedAttributes); } if ($filteredKey === '' || $filteredKey === null) { @@ -237,7 +267,7 @@ public static function filterArrayValue(array $value, string $regex, bool $strip } if (\is_string($valueValue)) { - $filteredValue = self::filterValue($valueValue, $regex, $stripTags); + $filteredValue = self::filterValue($valueValue, $regex, $stripTags, $allowedHtmlTags, $allowedAttributes); } $newReturn[$filteredKey] = $filteredValue; diff --git a/tests/Unit/Plugin/Frontend/InputFilter/FilterTest.php b/tests/Unit/Plugin/Frontend/InputFilter/FilterTest.php index 3e833b021d3..705c17c1def 100644 --- a/tests/Unit/Plugin/Frontend/InputFilter/FilterTest.php +++ b/tests/Unit/Plugin/Frontend/InputFilter/FilterTest.php @@ -147,6 +147,21 @@ public function testXssFilter(string $input, ?string $expected): void ); } + /** + * @dataProvider stripAntiXssDataProvider + * + * @param array $additions + */ + public function testAntiXssFilter(string $input, ?string $expected, array $additions = []): void + { + $result = Shopware_Plugins_Frontend_InputFilter_Bootstrap::filterValue($input, '/(?!x)x/', ...$additions); + + static::assertEquals( + $expected, + $result + ); + } + /** * @dataProvider stripxssArrayDataProvider * @@ -233,6 +248,37 @@ public function stripxssDataProvider(): array 'input' => '', 'expected' => '', ], + [ + 'input' => '"%26%2362%26%2360img/src%26%2361x%20onerror%26%2361alert()%26%2362', + 'expected' => '">', + ], + ]; + } + + /** + * @return array> + */ + public function stripAntiXssDataProvider(): array + { + return [ + [ + 'input' => '
  • ', + 'expected' => '
  • ', + 'additions' => [ + false, + [], + ['style'], + ], + ], + [ + 'input' => '', + 'expected' => '', + 'additions' => [ + false, + ['iframe'], + [], + ], + ], ]; } From 9aa75d91f67db8906646c75997f571e80761fdd3 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 20 Jun 2022 14:47:53 +0200 Subject: [PATCH 049/730] SW-26686 - Add composer-runtime-api requirement --- UPGRADE-5.7.md | 5 +---- composer.json | 1 + composer.lock | 5 +++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 3f184806709..48d0b62127b 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -6,12 +6,11 @@ This changelog references changes done in Shopware 5.7 patch versions. [View all changes from v5.7.11...v5.7.12](https://github.com/shopware/shopware/compare/v5.7.11...v5.7.12) -### Deprecations - ### Additions * Added missing dependency `doctrine/annotations`, which was an indirect dependency before * Added new optional parameter `dateTime` to `\Shopware\Components\Logger::addRecord` method to be compatible with parent `\Monolog\Logger::addRecord` method +* Added requirement `composer-runtime-api ^2.0` which was already added indirectly in version [5.7.8](#5.7.8) ### Changes @@ -52,8 +51,6 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `symfony/web-link` to version 4.4.37 * Updated several indirect dependencies -### Removals - ## 5.7.11 [View all changes from v5.7.10...v5.7.11](https://github.com/shopware/shopware/compare/v5.7.10...v5.7.11) diff --git a/composer.json b/composer.json index 1a93dbbd3e5..cba59262183 100644 --- a/composer.json +++ b/composer.json @@ -36,6 +36,7 @@ "ext-zip": "*", "ext-zlib": "*", "lib-libxml": "*", + "composer-runtime-api": "^2.0", "bcremer/line-reader": "1.2.0", "beberlei/assert": "3.3.2", "beberlei/doctrineextensions": "1.3.0", diff --git a/composer.lock b/composer.lock index 387b1a14e23..ebc286b9b74 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": "aa9e7479e5376871d41275c10dffa31c", + "content-hash": "e59d3f398f3ff18ebe1196f21ec0d4c5", "packages": [ { "name": "aws/aws-crt-php", @@ -10587,7 +10587,8 @@ "ext-xml": "*", "ext-zip": "*", "ext-zlib": "*", - "lib-libxml": "*" + "lib-libxml": "*", + "composer-runtime-api": "^2.0" }, "platform-dev": [], "plugin-api-version": "2.3.0" From 0b379f49e8796226095ee1e5f6c5c1f2a25d4369 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 20 Jun 2022 15:19:24 +0200 Subject: [PATCH 050/730] SW-26686 - Update doctrine dependency --- UPGRADE-5.7.md | 2 +- composer.json | 2 +- composer.lock | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 48d0b62127b..769f4c29398 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -20,7 +20,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `doctrine/cache` to version 1.13.0 * Updated `doctrine/common` to version 3.3.0 * Updated `doctrine/dbal` to version 2.13.8 -* Updated `doctrine/orm` to version 2.12.2 +* Updated `doctrine/orm` to version 2.12.3 * Updated `doctrine/persistence` to version 2.5.3 * Updated `elasticsearch/elasticsearch` to version 7.17.0 * Updated `friendsofphp/proxy-manager-lts` to version 1.0.12 diff --git a/composer.json b/composer.json index cba59262183..8336f78862c 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,7 @@ "doctrine/common": "3.3.0", "doctrine/dbal": "2.13.8", "doctrine/event-manager": "1.1.1", - "doctrine/orm": "2.12.2", + "doctrine/orm": "2.12.3", "doctrine/persistence": "2.5.3", "elasticsearch/elasticsearch": "^7", "fig/link-util": "1.1.2", diff --git a/composer.lock b/composer.lock index ebc286b9b74..2071690e14d 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": "e59d3f398f3ff18ebe1196f21ec0d4c5", + "content-hash": "e570e2140d73b90be176ab8f7b3cdc35", "packages": [ { "name": "aws/aws-crt-php", @@ -1264,16 +1264,16 @@ }, { "name": "doctrine/orm", - "version": "2.12.2", + "version": "2.12.3", "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "8291a7f09b12d14783ed6537b4586583d155869e" + "reference": "c05e1709e9ffb9abe8d37260a78975cc816ee385" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/8291a7f09b12d14783ed6537b4586583d155869e", - "reference": "8291a7f09b12d14783ed6537b4586583d155869e", + "url": "https://api.github.com/repos/doctrine/orm/zipball/c05e1709e9ffb9abe8d37260a78975cc816ee385", + "reference": "c05e1709e9ffb9abe8d37260a78975cc816ee385", "shasum": "" }, "require": { @@ -1302,10 +1302,10 @@ "doctrine/annotations": "^1.13", "doctrine/coding-standard": "^9.0", "phpbench/phpbench": "^0.16.10 || ^1.0", - "phpstan/phpstan": "~1.4.10 || 1.6.3", + "phpstan/phpstan": "~1.4.10 || 1.7.13", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", "psr/log": "^1 || ^2 || ^3", - "squizlabs/php_codesniffer": "3.6.2", + "squizlabs/php_codesniffer": "3.7.0", "symfony/cache": "^4.4 || ^5.4 || ^6.0", "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0", "vimeo/psalm": "4.23.0" @@ -1357,9 +1357,9 @@ ], "support": { "issues": "https://github.com/doctrine/orm/issues", - "source": "https://github.com/doctrine/orm/tree/2.12.2" + "source": "https://github.com/doctrine/orm/tree/2.12.3" }, - "time": "2022-05-02T19:10:07+00:00" + "time": "2022-06-16T13:42:23+00:00" }, { "name": "doctrine/persistence", From 5cebdc552e268d672150c1edb884a7af3a12dc61 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 20 Jun 2022 16:36:36 +0200 Subject: [PATCH 051/730] SW-26768 - Fix return type error while saving shopping worlds --- .phpstan-baseline.neon | 20 ------------------- .../EmotionBundle/Struct/ElementConfig.php | 3 ++- .../Emotion/Preset/PresetLoader.php | 3 ++- .../Shopware/Controllers/Backend/Emotion.php | 16 +++++++++------ .../Shopware/Models/Emotion/Library/Field.php | 3 +++ .../Unit/Controllers/Backend/EmotionTest.php | 19 +++++++++++++++++- 6 files changed, 35 insertions(+), 29 deletions(-) diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index 9f48d38444f..795b9735f9f 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -24835,16 +24835,6 @@ parameters: count: 1 path: engine/Shopware/Controllers/Backend/Emotion.php - - - message: "#^Method Shopware_Controllers_Backend_Emotion\\:\\:processDataFieldValue\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/Emotion.php - - - - message: "#^Method Shopware_Controllers_Backend_Emotion\\:\\:processDataFieldValue\\(\\) should return string but returns array\\|string\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/Emotion.php - - message: "#^Method Shopware_Controllers_Backend_Emotion\\:\\:saveEmotion\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 @@ -24860,16 +24850,6 @@ parameters: count: 1 path: engine/Shopware/Controllers/Backend/Emotion.php - - - message: "#^Parameter \\#1 \\$path of method Shopware\\\\Bundle\\\\MediaBundle\\\\MediaServiceInterface\\:\\:isEncoded\\(\\) expects string, array\\|string given\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/Emotion.php - - - - message: "#^Parameter \\#1 \\$path of method Shopware\\\\Bundle\\\\MediaBundle\\\\MediaServiceInterface\\:\\:normalize\\(\\) expects string, array\\|string given\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/Emotion.php - - message: "#^Method Shopware_Controllers_Backend_EmotionPreset\\:\\:enrichPlugins\\(\\) has parameter \\$presets with no value type specified in iterable type array\\.$#" count: 1 diff --git a/engine/Shopware/Bundle/EmotionBundle/Struct/ElementConfig.php b/engine/Shopware/Bundle/EmotionBundle/Struct/ElementConfig.php index f8be48e4456..449e27b797e 100644 --- a/engine/Shopware/Bundle/EmotionBundle/Struct/ElementConfig.php +++ b/engine/Shopware/Bundle/EmotionBundle/Struct/ElementConfig.php @@ -26,6 +26,7 @@ use JsonSerializable; use ReturnTypeWillChange; +use Shopware\Models\Emotion\Library\Field; class ElementConfig implements JsonSerializable { @@ -40,7 +41,7 @@ public function __construct(array $data = []) { $storage = []; foreach ($data as $configElement) { - if ($configElement['__emotionLibraryComponentField_value_type'] === 'json') { + if ($configElement['__emotionLibraryComponentField_value_type'] === Field::VALUE_TYPE_JSON) { $configElement['__emotionElementValue_value'] = json_decode($configElement['__emotionElementValue_value'], true); } diff --git a/engine/Shopware/Components/Emotion/Preset/PresetLoader.php b/engine/Shopware/Components/Emotion/Preset/PresetLoader.php index 60e50a53963..60539d54c66 100644 --- a/engine/Shopware/Components/Emotion/Preset/PresetLoader.php +++ b/engine/Shopware/Components/Emotion/Preset/PresetLoader.php @@ -29,6 +29,7 @@ use Shopware\Bundle\MediaBundle\MediaServiceInterface; use Shopware\Components\Model\ModelManager; use Shopware\Models\Emotion\Library\Component; +use Shopware\Models\Emotion\Library\Field; use Shopware\Models\Emotion\Preset; class PresetLoader implements PresetLoaderInterface @@ -134,7 +135,7 @@ private function preparePresetData(array $presetData) $data['value'] = $this->mediaService->getUrl($data['value']); } - if (!empty($data['value']) && strtolower($field['valueType']) === 'json') { + if (!empty($data['value']) && strtolower($field['valueType']) === Field::VALUE_TYPE_JSON) { $data['value'] = json_decode($data['value'], true); if (\is_array($data['value'])) { foreach ($data['value'] as $key => &$value) { diff --git a/engine/Shopware/Controllers/Backend/Emotion.php b/engine/Shopware/Controllers/Backend/Emotion.php index a5abcce13be..c4a47860653 100644 --- a/engine/Shopware/Controllers/Backend/Emotion.php +++ b/engine/Shopware/Controllers/Backend/Emotion.php @@ -213,14 +213,14 @@ public function detailAction() $entry = $filterResult; switch (strtolower($entry['valueType'])) { - case 'json': + case Field::VALUE_TYPE_JSON: if ($entry['value'] !== '') { $value = Zend_Json::decode($entry['value']); } else { $value = null; } break; - case 'string': + case Field::VALUE_TYPE_STRING: default: $value = $entry['value']; break; @@ -1356,16 +1356,16 @@ private function createElementData(Emotion $emotion, array $element, array $elem /** * Method for processing the different value types of the data fields. * - * @param array|string $value + * @param array>|string|null $value */ - private function processDataFieldValue(Field $field, $value): string + private function processDataFieldValue(Field $field, $value): ?string { $valueType = strtolower($field->getValueType()); $xType = $field->getXType(); $mediaFields = $this->getMediaXTypes(); - if ($valueType === 'json') { + if ($valueType === Field::VALUE_TYPE_JSON) { if (\is_array($value)) { foreach ($value as &$val) { if (!isset($val['path'])) { @@ -1379,10 +1379,14 @@ private function processDataFieldValue(Field $field, $value): string $value = Zend_Json::encode($value); } - if (\in_array($xType, $mediaFields, true) && $this->mediaService->isEncoded($value)) { + if (\is_string($value) && \in_array($xType, $mediaFields, true) && $this->mediaService->isEncoded($value)) { $value = $this->mediaService->normalize($value); } + if (\is_array($value)) { + throw new \UnexpectedValueException(sprintf('Use field value type "%s" if arrays should be saved. Got value type "%s" instead', Field::VALUE_TYPE_JSON, $valueType)); + } + return $value; } diff --git a/engine/Shopware/Models/Emotion/Library/Field.php b/engine/Shopware/Models/Emotion/Library/Field.php index eb7dfe8164f..9a8c980159e 100644 --- a/engine/Shopware/Models/Emotion/Library/Field.php +++ b/engine/Shopware/Models/Emotion/Library/Field.php @@ -33,6 +33,9 @@ */ class Field extends ModelEntity { + public const VALUE_TYPE_JSON = 'json'; + public const VALUE_TYPE_STRING = 'string'; + /** * Unique identifier field of the element model. * diff --git a/tests/Unit/Controllers/Backend/EmotionTest.php b/tests/Unit/Controllers/Backend/EmotionTest.php index e27192f80ab..939bcc8ea3f 100644 --- a/tests/Unit/Controllers/Backend/EmotionTest.php +++ b/tests/Unit/Controllers/Backend/EmotionTest.php @@ -48,7 +48,7 @@ public function testProcessDataFieldValue(): void $controller = new Shopware_Controllers_Backend_Emotion($mediaServiceMock, $eventManagerMock); $field = new Field(); - $field->setValueType('json'); + $field->setValueType(Field::VALUE_TYPE_JSON); $initialValue = [ [ 'position' => 1, @@ -73,4 +73,21 @@ public function testProcessDataFieldValue(): void static::assertSame('[{"position":1,"path":"path\/to\/media.jpg","mediaId":1,"link":""},{"position":2,"mediaId":2,"link":""},{"position":3,"path":"path\/to\/media.jpg","mediaId":3,"link":""}]', $processedValue); } + + public function testProcessDataFieldValueWithNullValue(): void + { + $processDataFieldValueMethod = TestReflectionHelper::getMethod(Shopware_Controllers_Backend_Emotion::class, 'processDataFieldValue'); + + $mediaServiceMock = $this->createMock(MediaServiceInterface::class); + $eventManagerMock = $this->createMock(ContainerAwareEventManager::class); + $eventManagerMock->expects(static::once())->method('collect')->willReturn(new ArrayCollection()); + $controller = new Shopware_Controllers_Backend_Emotion($mediaServiceMock, $eventManagerMock); + + $field = new Field(); + $initialValue = null; + + $processedValue = $processDataFieldValueMethod->invoke($controller, $field, $initialValue); + + static::assertNull($processedValue); + } } From 6f24d5a619ee7697ea786d13ddd656bd8d3a387b Mon Sep 17 00:00:00 2001 From: Philip Gatzka Date: Mon, 20 Jun 2022 16:54:01 +0200 Subject: [PATCH 052/730] SW-26770 - Extend version compatibility of updater command --- recovery/update/src/Command/UpdateCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recovery/update/src/Command/UpdateCommand.php b/recovery/update/src/Command/UpdateCommand.php index 60ac3786286..08ca86225e0 100644 --- a/recovery/update/src/Command/UpdateCommand.php +++ b/recovery/update/src/Command/UpdateCommand.php @@ -80,7 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $this->getHelper('question') ); - if (!is_dir(UPDATE_FILES_PATH) && !is_dir(UPDATE_ASSET_PATH)) { + if (!is_dir(UPDATE_FILES_PATH ?? '') && !is_dir(UPDATE_ASSET_PATH ?? '')) { $ioService->writeln('No update files found.'); return 1; From 57adb83f4d65fc34bf938562bbc3806befa4b57b Mon Sep 17 00:00:00 2001 From: Philip Gatzka Date: Tue, 21 Jun 2022 10:01:18 +0200 Subject: [PATCH 053/730] SW-26770 - Revert "SW-26770 - Extend version compatibility of updater command" This reverts commit 6f24d5a619ee7697ea786d13ddd656bd8d3a387b. --- recovery/update/src/Command/UpdateCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recovery/update/src/Command/UpdateCommand.php b/recovery/update/src/Command/UpdateCommand.php index 08ca86225e0..60ac3786286 100644 --- a/recovery/update/src/Command/UpdateCommand.php +++ b/recovery/update/src/Command/UpdateCommand.php @@ -80,7 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $this->getHelper('question') ); - if (!is_dir(UPDATE_FILES_PATH ?? '') && !is_dir(UPDATE_ASSET_PATH ?? '')) { + if (!is_dir(UPDATE_FILES_PATH) && !is_dir(UPDATE_ASSET_PATH)) { $ioService->writeln('No update files found.'); return 1; From d7fa75a269c6a20a9d88d89213a00c2338154619 Mon Sep 17 00:00:00 2001 From: Philip Gatzka Date: Tue, 21 Jun 2022 11:23:00 +0200 Subject: [PATCH 054/730] SW-26770 - Suppress deprecation warnings in installer/updater --- recovery/install/check.php | 2 +- recovery/install/index.php | 2 +- recovery/update/index.php | 3 ++- recovery/update/src/Console/Application.php | 4 ++-- recovery/update/src/app.php | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/recovery/install/check.php b/recovery/install/check.php index 2bbef0b5e0f..0db11b30a0f 100644 --- a/recovery/install/check.php +++ b/recovery/install/check.php @@ -22,7 +22,7 @@ * our trademarks remain entirely with us. */ -error_reporting(-1); +error_reporting(E_ALL ^ E_DEPRECATED); ini_set('display_errors', true); $tokenFile = __DIR__ . '/tmp/token'; diff --git a/recovery/install/index.php b/recovery/install/index.php index d725cffd68f..5e9d30cbdbe 100644 --- a/recovery/install/index.php +++ b/recovery/install/index.php @@ -42,7 +42,7 @@ require_once __DIR__ . '/../common/autoload.php'; -error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE); +error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE ^ E_DEPRECATED); ini_set('display_errors', 1); date_default_timezone_set('UTC'); set_time_limit(0); diff --git a/recovery/update/index.php b/recovery/update/index.php index 959bf821015..65c7d8c5845 100644 --- a/recovery/update/index.php +++ b/recovery/update/index.php @@ -41,8 +41,9 @@ use Shopware\Recovery\Update\Console\Application; use Symfony\Component\Console\Input\ArgvInput; +error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE ^ E_DEPRECATED); + if (PHP_SAPI === 'cli') { - error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE); ini_set('display_errors', 1); $input = new ArgvInput(); diff --git a/recovery/update/src/Console/Application.php b/recovery/update/src/Console/Application.php index c36280ddc57..c5f5d2f175a 100644 --- a/recovery/update/src/Console/Application.php +++ b/recovery/update/src/Console/Application.php @@ -108,11 +108,11 @@ private function registerErrorHandler() { set_error_handler(function ($errno, $errstr, $errfile, $errline) { // error was suppressed with the @-operator - if (error_reporting() === 0 || $errno === E_USER_DEPRECATED) { + if (error_reporting() === 0) { return false; } throw new ErrorException($errstr, 0, $errno, $errfile, $errline); - }); + }, E_ALL ^ E_DEPRECATED ^ E_USER_DEPRECATED); } } diff --git a/recovery/update/src/app.php b/recovery/update/src/app.php index 9e4fe1e4d2a..44424a5f451 100644 --- a/recovery/update/src/app.php +++ b/recovery/update/src/app.php @@ -33,7 +33,7 @@ date_default_timezone_set('Europe/Berlin'); ini_set('display_errors', 1); -error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE); +error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE ^ E_DEPRECATED); $config = require __DIR__ . '/../config/config.php'; $container = new Container(new PimpleContainer(), $config); From f6962a8241280c1c4d985e39050bfae5064f2776 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 22 Jun 2022 08:42:52 +0200 Subject: [PATCH 055/730] SW-26736 - Upgrade guzzlehttp/guzzle to v7.4.5 --- UPGRADE-5.7.md | 4 ++-- composer.json | 4 ++-- composer.lock | 30 +++++++++++++++--------------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 769f4c29398..15211a7de0c 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -25,8 +25,8 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `elasticsearch/elasticsearch` to version 7.17.0 * Updated `friendsofphp/proxy-manager-lts` to version 1.0.12 * Updated `google/cloud-storage` to version 1.27.1 -* Updated `guzzlehttp/guzzle` to version 7.4.4 -* Updated `guzzlehttp/psr7` to version 2.3.0 +* Updated `guzzlehttp/guzzle` to version 7.4.5 +* Updated `guzzlehttp/psr7` to version 2.4.0 * Updated `laminas/laminas-escaper` to version 2.10.0 * Updated `monolog/monolog` to version 2.7.0 * Updated `mpdf/mpdf` to version 8.1.1 diff --git a/composer.json b/composer.json index 8336f78862c..bd3256865fd 100644 --- a/composer.json +++ b/composer.json @@ -53,8 +53,8 @@ "fig/link-util": "1.1.2", "friendsofphp/proxy-manager-lts": "1.0.12", "google/cloud-storage": "1.27.1", - "guzzlehttp/guzzle": "~7.4.4", - "guzzlehttp/psr7": "2.3.0", + "guzzlehttp/guzzle": "~7.4.5", + "guzzlehttp/psr7": "2.4.0", "laminas/laminas-code": "4.5.1", "laminas/laminas-escaper": "2.10.0", "league/flysystem": "~1.1.4", diff --git a/composer.lock b/composer.lock index 2071690e14d..3a6ec3c3255 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": "e570e2140d73b90be176ab8f7b3cdc35", + "content-hash": "5c91af0db0e1f45a7cc813c2f6755cba", "packages": [ { "name": "aws/aws-crt-php", @@ -2071,22 +2071,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.4.4", + "version": "7.4.5", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "e3ff079b22820c2029d4c2a87796b6a0b8716ad8" + "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/e3ff079b22820c2029d4c2a87796b6a0b8716ad8", - "reference": "e3ff079b22820c2029d4c2a87796b6a0b8716ad8", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82", + "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82", "shasum": "" }, "require": { "ext-json": "*", "guzzlehttp/promises": "^1.5", - "guzzlehttp/psr7": "^1.8.3 || ^2.1", + "guzzlehttp/psr7": "^1.9 || ^2.4", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -2175,7 +2175,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.4.4" + "source": "https://github.com/guzzle/guzzle/tree/7.4.5" }, "funding": [ { @@ -2191,7 +2191,7 @@ "type": "tidelift" } ], - "time": "2022-06-09T21:39:15+00:00" + "time": "2022-06-20T22:16:13+00:00" }, { "name": "guzzlehttp/promises", @@ -2279,16 +2279,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "2.3.0", + "version": "2.4.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "83260bb50b8fc753c72d14dc1621a2dac31877ee" + "reference": "13388f00956b1503577598873fffb5ae994b5737" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/83260bb50b8fc753c72d14dc1621a2dac31877ee", - "reference": "83260bb50b8fc753c72d14dc1621a2dac31877ee", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737", + "reference": "13388f00956b1503577598873fffb5ae994b5737", "shasum": "" }, "require": { @@ -2312,7 +2312,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.4-dev" } }, "autoload": { @@ -2374,7 +2374,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.3.0" + "source": "https://github.com/guzzle/psr7/tree/2.4.0" }, "funding": [ { @@ -2390,7 +2390,7 @@ "type": "tidelift" } ], - "time": "2022-06-09T08:26:02+00:00" + "time": "2022-06-20T21:43:11+00:00" }, { "name": "laminas/laminas-code", From ce0e187843852110ed84878b8eb372b437273e2e Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 22 Jun 2022 08:44:11 +0200 Subject: [PATCH 056/730] SW-26736 - Update PHPUnit dependency --- UPGRADE-5.7.md | 2 +- composer.lock | 55 +++++++++++++++++++++++++------------------------- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 15211a7de0c..ad7834c7a4c 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -30,7 +30,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `laminas/laminas-escaper` to version 2.10.0 * Updated `monolog/monolog` to version 2.7.0 * Updated `mpdf/mpdf` to version 8.1.1 -* Updated `phpunit/phpunit` to version 9.5.20 +* Updated `phpunit/phpunit` to version 9.5.21 * Updated `symfony/browser-kit` to version 4.4.37 * Updated `symfony/config` to version 4.4.42 * Updated `symfony/console` to version 4.4.42 diff --git a/composer.lock b/composer.lock index 3a6ec3c3255..c6f68bd94e7 100644 --- a/composer.lock +++ b/composer.lock @@ -58,16 +58,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.225.1", + "version": "3.228.0", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "b795c9c14997dac771f66d1f6cbadb62c742373a" + "reference": "4ff51d01da43aa3bd36eef921a9cd4e0ff843fab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/b795c9c14997dac771f66d1f6cbadb62c742373a", - "reference": "b795c9c14997dac771f66d1f6cbadb62c742373a", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/4ff51d01da43aa3bd36eef921a9cd4e0ff843fab", + "reference": "4ff51d01da43aa3bd36eef921a9cd4e0ff843fab", "shasum": "" }, "require": { @@ -75,9 +75,9 @@ "ext-json": "*", "ext-pcre": "*", "ext-simplexml": "*", - "guzzlehttp/guzzle": "^5.3.3 || ^6.2.1 || ^7.0", + "guzzlehttp/guzzle": "^6.5.7 || ^7.4.4", "guzzlehttp/promises": "^1.4.0", - "guzzlehttp/psr7": "^1.7.0 || ^2.1.1", + "guzzlehttp/psr7": "^1.8.5 || ^2.3", "mtdowling/jmespath.php": "^2.6", "php": ">=5.5" }, @@ -143,9 +143,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.225.1" + "source": "https://github.com/aws/aws-sdk-php/tree/3.228.0" }, - "time": "2022-06-09T18:19:43+00:00" + "time": "2022-06-21T18:13:25+00:00" }, { "name": "bcremer/line-reader", @@ -1847,16 +1847,16 @@ }, { "name": "google/auth", - "version": "v1.21.0", + "version": "v1.21.1", "source": { "type": "git", "url": "https://github.com/googleapis/google-auth-library-php.git", - "reference": "73392bad2eb6852eea9084b6bbdec752515cb849" + "reference": "aa3b9ca29258ac6347ce3c8937a2418c5d78f840" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/73392bad2eb6852eea9084b6bbdec752515cb849", - "reference": "73392bad2eb6852eea9084b6bbdec752515cb849", + "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/aa3b9ca29258ac6347ce3c8937a2418c5d78f840", + "reference": "aa3b9ca29258ac6347ce3c8937a2418c5d78f840", "shasum": "" }, "require": { @@ -1899,27 +1899,27 @@ "support": { "docs": "https://googleapis.github.io/google-auth-library-php/main/", "issues": "https://github.com/googleapis/google-auth-library-php/issues", - "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.21.0" + "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.21.1" }, - "time": "2022-04-13T20:35:52+00:00" + "time": "2022-05-16T19:34:15+00:00" }, { "name": "google/cloud-core", - "version": "v1.46.0", + "version": "v1.46.1", "source": { "type": "git", "url": "https://github.com/googleapis/google-cloud-php-core.git", - "reference": "784a1d361c7dbc5de133feac590f549798c80f5e" + "reference": "ee8ad36aa59773669ca0cd5e1ffeccac7a78d083" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/784a1d361c7dbc5de133feac590f549798c80f5e", - "reference": "784a1d361c7dbc5de133feac590f549798c80f5e", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/ee8ad36aa59773669ca0cd5e1ffeccac7a78d083", + "reference": "ee8ad36aa59773669ca0cd5e1ffeccac7a78d083", "shasum": "" }, "require": { "google/auth": "^1.18", - "guzzlehttp/guzzle": "^5.3|^6.5.6|^7.4.3", + "guzzlehttp/guzzle": "^5.3|^6.5.7|^7.4.4", "guzzlehttp/promises": "^1.3", "guzzlehttp/psr7": "^1.7|^2.0", "monolog/monolog": "^1.1|^2.0", @@ -1964,9 +1964,9 @@ ], "description": "Google Cloud PHP shared dependency, providing functionality useful to all components.", "support": { - "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.46.0" + "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.46.1" }, - "time": "2022-06-02T21:53:43+00:00" + "time": "2022-06-15T21:38:50+00:00" }, { "name": "google/cloud-storage", @@ -8936,16 +8936,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.20", + "version": "9.5.21", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba" + "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba", - "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0e32b76be457de00e83213528f6bb37e2a38fcb1", + "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1", "shasum": "" }, "require": { @@ -8979,7 +8979,6 @@ "sebastian/version": "^3.0.2" }, "require-dev": { - "ext-pdo": "*", "phpspec/prophecy-phpunit": "^2.0.1" }, "suggest": { @@ -9023,7 +9022,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.21" }, "funding": [ { @@ -9035,7 +9034,7 @@ "type": "github" } ], - "time": "2022-04-01T12:37:26+00:00" + "time": "2022-06-19T12:14:25+00:00" }, { "name": "sebastian/cli-parser", From 470da1c6f64f2c990023630e549de3c0b95ed9b6 Mon Sep 17 00:00:00 2001 From: Philip Gatzka Date: Wed, 22 Jun 2022 10:59:31 +0200 Subject: [PATCH 057/730] SW-26772 - Revert "SW-26770 - Suppress deprecation warnings in installer/updater" This reverts commit d7fa75a269c6a20a9d88d89213a00c2338154619. --- recovery/install/check.php | 2 +- recovery/install/index.php | 2 +- recovery/update/index.php | 3 +-- recovery/update/src/Console/Application.php | 4 ++-- recovery/update/src/app.php | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/recovery/install/check.php b/recovery/install/check.php index 0db11b30a0f..2bbef0b5e0f 100644 --- a/recovery/install/check.php +++ b/recovery/install/check.php @@ -22,7 +22,7 @@ * our trademarks remain entirely with us. */ -error_reporting(E_ALL ^ E_DEPRECATED); +error_reporting(-1); ini_set('display_errors', true); $tokenFile = __DIR__ . '/tmp/token'; diff --git a/recovery/install/index.php b/recovery/install/index.php index 5e9d30cbdbe..d725cffd68f 100644 --- a/recovery/install/index.php +++ b/recovery/install/index.php @@ -42,7 +42,7 @@ require_once __DIR__ . '/../common/autoload.php'; -error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE ^ E_DEPRECATED); +error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE); ini_set('display_errors', 1); date_default_timezone_set('UTC'); set_time_limit(0); diff --git a/recovery/update/index.php b/recovery/update/index.php index 65c7d8c5845..959bf821015 100644 --- a/recovery/update/index.php +++ b/recovery/update/index.php @@ -41,9 +41,8 @@ use Shopware\Recovery\Update\Console\Application; use Symfony\Component\Console\Input\ArgvInput; -error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE ^ E_DEPRECATED); - if (PHP_SAPI === 'cli') { + error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE); ini_set('display_errors', 1); $input = new ArgvInput(); diff --git a/recovery/update/src/Console/Application.php b/recovery/update/src/Console/Application.php index c5f5d2f175a..c36280ddc57 100644 --- a/recovery/update/src/Console/Application.php +++ b/recovery/update/src/Console/Application.php @@ -108,11 +108,11 @@ private function registerErrorHandler() { set_error_handler(function ($errno, $errstr, $errfile, $errline) { // error was suppressed with the @-operator - if (error_reporting() === 0) { + if (error_reporting() === 0 || $errno === E_USER_DEPRECATED) { return false; } throw new ErrorException($errstr, 0, $errno, $errfile, $errline); - }, E_ALL ^ E_DEPRECATED ^ E_USER_DEPRECATED); + }); } } diff --git a/recovery/update/src/app.php b/recovery/update/src/app.php index 44424a5f451..9e4fe1e4d2a 100644 --- a/recovery/update/src/app.php +++ b/recovery/update/src/app.php @@ -33,7 +33,7 @@ date_default_timezone_set('Europe/Berlin'); ini_set('display_errors', 1); -error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE ^ E_DEPRECATED); +error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE); $config = require __DIR__ . '/../config/config.php'; $container = new Container(new PimpleContainer(), $config); From c7c6e202033e874c0240a07205aac5d6179eff0c Mon Sep 17 00:00:00 2001 From: Philip Gatzka Date: Wed, 22 Jun 2022 11:23:33 +0200 Subject: [PATCH 058/730] SW-26772 - Resolve deprecations for PHPv8.1 compatibility --- recovery/common/src/DumpIterator.php | 4 ++++ recovery/update/index.php | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/recovery/common/src/DumpIterator.php b/recovery/common/src/DumpIterator.php index 30a7d773549..fd5f798cf97 100644 --- a/recovery/common/src/DumpIterator.php +++ b/recovery/common/src/DumpIterator.php @@ -102,6 +102,7 @@ public function seek($position) /** * @return int */ + #[\ReturnTypeWillChange] public function count() { return $this->count; @@ -115,6 +116,7 @@ public function rewind() $this->position = 0; } + #[\ReturnTypeWillChange] public function current() { return $this->current; @@ -123,6 +125,7 @@ public function current() /** * @return int */ + #[\ReturnTypeWillChange] public function key() { return $this->position; @@ -139,6 +142,7 @@ public function next() /** * @return bool */ + #[\ReturnTypeWillChange] public function valid() { return !feof($this->stream); diff --git a/recovery/update/index.php b/recovery/update/index.php index 959bf821015..83780084aa5 100644 --- a/recovery/update/index.php +++ b/recovery/update/index.php @@ -28,9 +28,9 @@ $isManual = is_dir(SW_PATH . '/update-assets'); if ($isManual) { \define('UPDATE_IS_MANUAL', true); - \define('UPDATE_FILES_PATH', null); + \define('UPDATE_FILES_PATH', ''); \define('UPDATE_ASSET_PATH', SW_PATH . '/update-assets'); - \define('UPDATE_META_FILE', null); + \define('UPDATE_META_FILE', ''); } else { \define('UPDATE_IS_MANUAL', false); \define('UPDATE_FILES_PATH', SW_PATH . '/files/update/files'); From 9f71a02dbcc1ea58b648e6e45e206edf54d9c314 Mon Sep 17 00:00:00 2001 From: Philip Gatzka Date: Wed, 22 Jun 2022 14:20:03 +0200 Subject: [PATCH 059/730] SW-26772 - Resolve deprecations for PHPv8.1 compatibility --- recovery/common/src/DumpIterator.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recovery/common/src/DumpIterator.php b/recovery/common/src/DumpIterator.php index fd5f798cf97..fd63ea1f54b 100644 --- a/recovery/common/src/DumpIterator.php +++ b/recovery/common/src/DumpIterator.php @@ -86,6 +86,7 @@ public function __destruct() * * @throws OutOfBoundsException */ + #[\ReturnTypeWillChange] public function seek($position) { $this->rewind(); @@ -108,6 +109,7 @@ public function count() return $this->count; } + #[\ReturnTypeWillChange] public function rewind() { rewind($this->stream); @@ -131,6 +133,7 @@ public function key() return $this->position; } + #[\ReturnTypeWillChange] public function next() { ++$this->position; From 0576cd8151f0d77376e491ddb3b9c2ce5595146c Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 27 Jun 2022 12:55:28 +0200 Subject: [PATCH 060/730] SW-26848 - Fix shipping cost export --- engine/Shopware/Core/sExport.php | 8 +++---- tests/Functional/Core/ExportTest.php | 32 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/engine/Shopware/Core/sExport.php b/engine/Shopware/Core/sExport.php index 91c121fb0b8..d10c236d1ce 100644 --- a/engine/Shopware/Core/sExport.php +++ b/engine/Shopware/Core/sExport.php @@ -1716,10 +1716,10 @@ public function sGetPremiumDispatchSurcharge($basket) } $sql = 'SELECT id, bind_sql FROM s_premium_dispatch WHERE type=:type AND active=1 AND bind_sql IS NOT NULL'; - $statements = $this->connection->executeQuery($sql, ['type' => Dispatch::TYPE_SURCHARGE])->fetchAllKeyValue(); + $activeSurcharges = $this->connection->executeQuery($sql, ['type' => Dispatch::TYPE_SURCHARGE])->fetchAllKeyValue(); $sql_where = ''; - foreach ($statements as $dispatchID => $statement) { + foreach ($activeSurcharges as $dispatchID => $statement) { $sql_where .= " AND ( d.id!=$dispatchID OR ($statement)) "; @@ -1810,11 +1810,11 @@ public function sGetPremiumDispatchSurcharge($basket) } $sql = 'SELECT `value` , `factor` FROM `s_premium_shippingcosts` - WHERE `from` <= $from + WHERE `from` <= :from AND `dispatchID` = :dispatchId ORDER BY `from` DESC LIMIT 1'; - $result = $this->connection->fetchAssociative($sql, ['dispatchId' => $dispatch['id']]); + $result = $this->connection->fetchAssociative($sql, ['from' => $from, 'dispatchId' => $dispatch['id']]); if (!$result) { continue; } diff --git a/tests/Functional/Core/ExportTest.php b/tests/Functional/Core/ExportTest.php index a43c33ff99b..27c09257e78 100644 --- a/tests/Functional/Core/ExportTest.php +++ b/tests/Functional/Core/ExportTest.php @@ -155,7 +155,7 @@ public function testMainNumbersAreIncludedInTheExport(): void static::assertArrayHasKey('mainnumber', $result); } - public function testsGetPremiumDispatchSurcharge(): void + public function testsGetPremiumDispatchSurchargeInactiveSurcharge(): void { $testSurcharge = new Dispatch(); $testSurcharge->setName('Test surcharge'); @@ -199,6 +199,36 @@ public function testsGetPremiumDispatchSurcharge(): void static::assertSame(0.0, $surcharge); } + public function testsGetPremiumDispatchSurchargeActiveSurcharge(): void + { + $this->connection->executeStatement( + "INSERT INTO `s_premium_dispatch` (`name`, `type`, `description`, `comment`, `active`, `position`, `calculation`, `surcharge_calculation`, `tax_calculation`, `bind_shippingfree`, `bind_laststock`) + VALUES ('Test', :type, '', '', 1, 0, 1, 0, 0, 0, 0);", + ['type' => Dispatch::TYPE_SURCHARGE] + ); + + $cart = [ + 'instock' => '1', + 'stockmin' => '1', + 'laststock' => '0', + 'weight' => '0.000', + 'count_article' => '1', + 'shippingfree' => '0', + 'amount' => '19.99', + 'max_tax' => '19.00', + 'userID' => null, + 'has_topseller' => '0', + 'has_comment' => '', + 'has_esd' => '0', + 'articleID' => '2', + 'customergroupID' => '1', + 'multishopID' => '1', + ]; + $surcharge = $this->export->sGetPremiumDispatchSurcharge($cart); + + static::assertSame(0.0, $surcharge); + } + private function generateFeed(int $feedId): string { $productFeed = $this->repository->find($feedId); From 9f184a49da39e20a1411d987e0d223f116f37313 Mon Sep 17 00:00:00 2001 From: Philip Gatzka Date: Thu, 23 Jun 2022 12:14:23 +0000 Subject: [PATCH 061/730] SW-26847 - Resolve coverage report deprecation --- .gitlab-ci.yml | 5 +++-- Makefile | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ebe5f7ba803..db0714884fb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -158,8 +158,9 @@ Code Coverage: - ${ARTIFACTS_ROOT}/* expire_in: 1 week reports: - junit: ${ARTIFACTS_ROOT}/phpunit.junit.xml - cobertura: ${ARTIFACTS_ROOT}/*.cobertura.xml + coverage_report: + coverage_format: cobertura + path: ${ARTIFACTS_ROOT}/*.cobertura.xml parallel: matrix: - TESTSUITE: ['unit', 'functional'] diff --git a/Makefile b/Makefile index 56973e9bb56..a4bf16e5fce 100644 --- a/Makefile +++ b/Makefile @@ -69,10 +69,10 @@ test-phpunit: init ./vendor/bin/phpunit --config recovery/common/phpunit.xml.dist --log-junit build/artifacts/test-log.xml test-phpunit-coverage-cobertura: init - php -d pcov.enabled=1 -d pcov.directory="$(CURDIR)" vendor/bin/phpunit --configuration="tests/phpunit.xml.dist" --log-junit="build/artifacts/phpunit.junit.xml" --colors="never" --exclude-group="elasticSearch,pcovAdapterBrokenTest" --testsuite="$(TESTSUITE)" --coverage-cobertura="build/artifacts/phpunit-coverage-$(TESTSUITE).cobertura.xml" + php -d pcov.enabled=1 -d pcov.directory="$(CURDIR)" vendor/bin/phpunit --configuration="tests/phpunit.xml.dist" --colors="never" --exclude-group="elasticSearch,pcovAdapterBrokenTest" --testsuite="$(TESTSUITE)" --coverage-cobertura="build/artifacts/phpunit-coverage-$(TESTSUITE).cobertura.xml" test-phpunit-coverage-statistic: init tests/phpunit-full-coverage.xml - php -d pcov.enabled=1 -d pcov.directory="$(CURDIR)" vendor/bin/phpunit --configuration="tests/phpunit-full-coverage.xml" --log-junit="build/artifacts/phpunit.junit.xml" --colors="never" --exclude-group="elasticSearch,pcovAdapterBrokenTest" --testsuite="$(TESTSUITE)" --coverage-text + php -d pcov.enabled=1 -d pcov.directory="$(CURDIR)" vendor/bin/phpunit --configuration="tests/phpunit-full-coverage.xml" --colors="never" --exclude-group="elasticSearch,pcovAdapterBrokenTest" --testsuite="$(TESTSUITE)" --coverage-text test-phpunit-elasticsearch: elasticsearch-populate ./vendor/bin/phpunit --config tests/phpunit.xml.dist --log-junit build/artifacts/test-log.xml --exclude-group=skipElasticSearch --group=elasticSearch From 76413c76310bd9b866f29c4859491d83ffbf44c5 Mon Sep 17 00:00:00 2001 From: Philip Gatzka Date: Thu, 23 Jun 2022 08:31:49 +0200 Subject: [PATCH 062/730] SW-26843 - Adjust pipeline trigger rules --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index db0714884fb..a7bc9517f9e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,12 +18,12 @@ variables: SW_BASE_PATH: "" ELASTICSEARCH_HOST: elasticsearch -workflow: - rules: - - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - - if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS' - when: never - - if: '$CI_COMMIT_BRANCH' +# Include the default gitlab rules template for "MergeRequest-Pipelines". +# This makes pipelines run for the default branch, tags, and all types of merge +# request pipelines. +# @see https://docs.gitlab.com/ee/ci/yaml/workflow.html#workflowrules-templates +include: + - template: 'Workflows/MergeRequest-Pipelines.gitlab-ci.yml' .composer-cache: &composer-cache key: From 4d87b3baaf8ffd618f7aafb2c58259ac69fe04f1 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Tue, 21 Jun 2022 13:48:57 +0200 Subject: [PATCH 063/730] SW-26746 - Implement pipeline for PHP 8.2 --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a7bc9517f9e..24caf95fa76 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,7 +55,6 @@ stages: - Static analysis - PHPUnit - End-to-end testing - - Security - Build Image default: @@ -181,6 +180,11 @@ PHP 8.1: extends: .phpunit_base image: gitlab.shopware.com:5005/shopware/5/product/image/continuous:8.1 +PHP 8.2: + allow_failure: true + extends: .phpunit_base + image: gitlab.shopware.com:5005/shopware/5/product/image/continuous:8.2.0alpha1 + MySQL 8.0: extends: .phpunit_base services: From 13fc0bf36d9e98942a3abdd295f73c747b25cc2c Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 22 Jun 2022 17:08:57 +0200 Subject: [PATCH 064/730] SW-26840 - Fix cart handling for products with purchase steps --- .phpstan-baseline.neon | 5 -- engine/Shopware/Core/sBasket.php | 6 +- tests/Functional/Core/BasketTest.php | 121 ++++++++++++--------------- 3 files changed, 56 insertions(+), 76 deletions(-) diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index 795b9735f9f..7b7c224d569 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -29805,11 +29805,6 @@ parameters: count: 1 path: engine/Shopware/Core/sBasket.php - - - message: "#^Method sBasket\\:\\:getAdditionalInfoForUpdateProduct\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Core/sBasket.php - - message: "#^Method sBasket\\:\\:getBasketImage\\(\\) has parameter \\$image with no value type specified in iterable type array\\.$#" count: 1 diff --git a/engine/Shopware/Core/sBasket.php b/engine/Shopware/Core/sBasket.php index d9055603a58..34f81885ea7 100644 --- a/engine/Shopware/Core/sBasket.php +++ b/engine/Shopware/Core/sBasket.php @@ -2886,9 +2886,9 @@ private function loadBasketProducts(): array /** * Gets additional product info for sUpdateArticle * - * @param CartItemStruct[] $cartItems + * @param array $cartItems */ - private function getAdditionalInfoForUpdateProduct(array $cartItems) + private function getAdditionalInfoForUpdateProduct(array $cartItems): void { $ids = []; foreach ($cartItems as $cartItem) { @@ -2967,7 +2967,7 @@ private function getAdditionalInfoForUpdateProduct(array $cartItems) } if (($quantity / $additionalInfo['purchasesteps']) != (int) ($quantity / $additionalInfo['purchasesteps'])) { - $quantity = (int) ($quantity / $additionalInfo['purchasesteps']) * $additionalInfo['purchasesteps']; + $quantity = (int) (($quantity / $additionalInfo['purchasesteps']) * $additionalInfo['purchasesteps']); } $maxPurchase = $this->config->get('sMAXPURCHASE'); diff --git a/tests/Functional/Core/BasketTest.php b/tests/Functional/Core/BasketTest.php index f86f8d1b89c..ae4128ada42 100644 --- a/tests/Functional/Core/BasketTest.php +++ b/tests/Functional/Core/BasketTest.php @@ -85,8 +85,7 @@ public function testsGetAmount(): void { // Test with empty session, expect empty array static::assertEquals([], $this->module->sGetAmount()); - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); $this->connection->insert( 's_order_basket', @@ -404,8 +403,7 @@ public function testsInsertPremium(): void static::assertTrue($this->module->sInsertPremium()); // Create session id - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); // Test with session, expect true static::assertTrue($this->module->sInsertPremium()); @@ -465,7 +463,7 @@ public function testsInsertPremium(): void 1, $this->connection->fetchOne( 'SELECT count(*) FROM s_order_basket WHERE sessionID = ?', - [$this->module->sSYSTEM->sSESSION_ID] + [$this->session->get('sessionId')] ) ); @@ -498,7 +496,7 @@ public function testsInsertPremium(): void 1, $this->connection->fetchOne( 'SELECT count(*) FROM s_order_basket WHERE sessionID = ?', - [$this->module->sSYSTEM->sSESSION_ID] + [$this->session->get('sessionId')] ) ); @@ -531,7 +529,7 @@ public function testsInsertPremium(): void 2, $this->connection->fetchOne( 'SELECT count(*) FROM s_order_basket WHERE sessionID = ?', - [$this->module->sSYSTEM->sSESSION_ID] + [$this->session->get('sessionId')] ) ); @@ -542,7 +540,7 @@ public function testsInsertPremium(): void 3, $this->connection->fetchOne( 'SELECT count(*) FROM s_order_basket WHERE sessionID = ?', - [$this->module->sSYSTEM->sSESSION_ID] + [$this->session->get('sessionId')] ) ); @@ -558,8 +556,7 @@ public function testPremiumOrderNumberExport(): void $this->connection->beginTransaction(); // Create session id - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); // Test with session, expect true static::assertTrue($this->module->sInsertPremium()); @@ -582,7 +579,7 @@ public function testPremiumOrderNumberExport(): void $ordernumberExport, $this->connection->fetchOne( 'SELECT ordernumber FROM s_order_basket WHERE sessionID = ? AND modus = 1', - [$this->module->sSYSTEM->sSESSION_ID] + [$this->session->get('sessionId')] ) ); @@ -596,8 +593,7 @@ public function testGetMaxTax(): void static::assertFalse($this->module->getMaxTax()); // Create session id - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); // Test with session and empty basket, expect false static::assertFalse($this->module->getMaxTax()); @@ -668,8 +664,7 @@ public function testsAddVoucherWithAbsoluteVoucher(): void ); // Create session id and try again, same results - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); $result = $this->module->sAddVoucher(''); static::assertIsArray($result); static::assertArrayHasKey('sErrorFlag', $result); @@ -692,8 +687,7 @@ public function testsAddVoucherWithAbsoluteVoucher(): void 'modus' => 0, ]; $this->connection->insert('s_emarketing_vouchers', $voucherData); - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); $result = $this->module->sAddVoucher('testOne'); static::assertIsArray($result); @@ -706,8 +700,7 @@ public function testsAddVoucherWithAbsoluteVoucher(): void $currencyDe = $this->getContainer()->get(Zend_Currency::class); $this->getContainer()->set('currency', new Zend_Currency('GBP', new Zend_Locale('en_GB'))); - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); $result = $this->module->sAddVoucher('testOne'); static::assertIsArray($result); static::assertArrayHasKey('sErrorFlag', $result); @@ -766,7 +759,7 @@ public function testsAddVoucherWithAbsoluteVoucher(): void // Test the voucher values with tax from user group $discount = $this->connection->fetchAssociative( 'SELECT * FROM s_order_basket WHERE modus = 2 and sessionID = ?', - [$this->module->sSYSTEM->sSESSION_ID] + [$this->session->get('sessionId')] ); static::assertIsArray($discount); static::assertEquals($voucherData['value'] * -1, $discount['price']); @@ -829,8 +822,7 @@ public function testsAddVoucherWithLimitedVoucher(): void $customer = $this->createDummyCustomer(); $this->session['sUserId'] = $customer->getId(); - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); // Test with one-time code, fail due to minimum amount (cart is empty) $result = $this->module->sAddVoucher($voucherCodeData['code']); @@ -861,7 +853,7 @@ public function testsAddVoucherWithLimitedVoucher(): void // Test the voucher values. This voucher has no taxes $discount = $this->connection->fetchAssociative( 'SELECT * FROM s_order_basket WHERE modus = 2 and sessionID = ?', - [$this->module->sSYSTEM->sSESSION_ID] + [$this->session->get('sessionId')] ); static::assertIsArray($discount); static::assertEquals($voucherData['value'] * -1, $discount['price']); @@ -925,8 +917,7 @@ public function testsAddVoucherWithSubShopVoucher(): void $customer = $this->createDummyCustomer(); $this->session['sUserId'] = $customer->getId(); - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) random_int(PHP_INT_MIN, PHP_INT_MAX), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); // Add one product to the basket with enough value to use discount $randomProduct = $this->getRandomProduct(); @@ -952,7 +943,7 @@ public function testsAddVoucherWithSubShopVoucher(): void // Test the voucher values with custom tax from voucher $discount = $this->connection->fetchAssociative( 'SELECT * FROM s_order_basket WHERE modus = 2 and sessionID = ?', - [$this->module->sSYSTEM->sSESSION_ID] + [$this->session->get('sessionId')] ); static::assertIsArray($discount); static::assertEquals($voucherData['value'] * -1, $discount['price']); @@ -1023,8 +1014,7 @@ public function testsAddVoucherWithMultipleVouchers(): void $customer = $this->createDummyCustomer(); $this->session['sUserId'] = $customer->getId(); - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); // Add one product to the basket with enough value to use discount $randomProduct = $this->getRandomProduct(); @@ -1110,8 +1100,7 @@ public function testsAddVoucherWithCustomerGroup(): void ); $this->module->sSYSTEM->sUSERGROUPDATA['id'] = $randomCustomerGroup[1]['id']; $this->session['sUserId'] = $customer->getId(); - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); // Add one product to the basket with enough value to use discount $randomProduct = $this->getRandomProduct(); @@ -1193,8 +1182,7 @@ public function testsAddVoucherWithArticle(): void $customer = $this->createDummyCustomer(); $this->session['sUserId'] = $customer->getId(); - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); // Add one product to the basket with enough value to use discount $this->connection->insert( @@ -1273,8 +1261,7 @@ public function testsAddVoucherWithCurrencyFactor(): void $randomProduct = $this->getRandomProduct(); // Generate session id - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); // Define different currency factors to test foreach ([0, .5, 1, 1.5, 2] as $currencyFactor) { @@ -1410,8 +1397,7 @@ public function testsGetBasketIds(): void $this->getRandomProduct($randomProductOne['id']), ]; - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); // Test with empty basket, empty static::assertNull($this->module->sGetBasketIds()); @@ -1493,8 +1479,7 @@ public function testsCheckMinimumCharge(): void // Test with empty cart, expect 10 static::assertEquals(10, $this->module->sCheckMinimumCharge()); - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); // Add one product to the basket with enough value to use discount $randomArticle = $this->getRandomProduct(); @@ -1548,8 +1533,7 @@ public function testsInsertSurcharge(): void ) ); - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); // Add one product to the basket with value lower that minimumordersurcharge $randomProduct = $this->getRandomProduct(); @@ -1571,7 +1555,7 @@ public function testsInsertSurcharge(): void static::assertEmpty( $this->connection->fetchAssociative( 'SELECT * FROM s_order_basket WHERE sessionID = ? AND modus=4', - [$this->module->sSYSTEM->sSESSION_ID] + [$this->session->get('sessionId')] ) ); @@ -1586,7 +1570,7 @@ public function testsInsertSurcharge(): void // Fetch the surcharge row, should have price 5 $surchargeRow = $this->connection->fetchAssociative( 'SELECT * FROM s_order_basket WHERE sessionID = ? AND modus=4', - [$this->module->sSYSTEM->sSESSION_ID] + [$this->session->get('sessionId')] ); static::assertIsArray($surchargeRow); static::assertEquals(5, $surchargeRow['price']); @@ -1626,8 +1610,7 @@ public function testsInsertSurchargePercent(): void ['id' => $customer->getId()] ); $this->session['sUserId'] = $customer->getId(); - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); // Empty basket, expect false static::assertFalse( @@ -1654,7 +1637,7 @@ public function testsInsertSurchargePercent(): void static::assertEmpty( $this->connection->fetchAssociative( 'SELECT * FROM s_order_basket WHERE sessionID = ? AND modus=4', - [$this->module->sSYSTEM->sSESSION_ID] + [$this->session->get('sessionId')] ) ); @@ -1669,7 +1652,7 @@ public function testsInsertSurchargePercent(): void // Fetch the surcharge row, should have price 5 $surchargeRow = $this->connection->fetchAssociative( 'SELECT * FROM s_order_basket WHERE sessionID = ? AND modus = 4', - [$this->module->sSYSTEM->sSESSION_ID] + [$this->session->get('sessionId')] ); static::assertIsArray($surchargeRow); static::assertEquals(2 / 100 * 5, $surchargeRow['price']); @@ -1691,8 +1674,7 @@ public function testsGetBasket(): void // Test with empty basket static::assertEquals([], $this->module->sGetBasket()); - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); // Add one product to the basket with low amount $randomProduct = $this->getRandomProduct(); @@ -1814,8 +1796,7 @@ public function testsGetBasketDataHasNumericCartItemAmounts(): void ]); $customerGroup = $resourceHelper->createCustomerGroup(); $this->session['sUserId'] = $this->createDummyCustomer()->getId(); - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); $this->module->sSYSTEM->sUSERGROUPDATA['id'] = $customerGroup->getId(); // Add the product to the basket @@ -1912,8 +1893,7 @@ public function testsGetBasketDataNegativeCloseToZeroTotal(): void ['id' => $customer->getId()] ); $this->session['sUserId'] = $customer->getId(); - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); $this->module->sSYSTEM->sUSERGROUPDATA['id'] = $customerGroup->getId(); // Actually add the product to the basket @@ -1945,8 +1925,7 @@ public function testsGetBasketWithInvalidProduct(): void { static::assertEquals([], $this->module->sGetBasket()); - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); // Setup product for the first basket position - a product that costs EUR 29.97 $product = (new Helper($this->getContainer()))->createProduct([ @@ -2000,7 +1979,6 @@ public function testsGetBasketWithInvalidProduct(): void public function testsAddNote(): void { - $front = $this->getContainer()->get('front'); $_COOKIE['sUniqueID'] = Random::getAlphanumericString(32); // Add one product to the basket with low amount @@ -2180,8 +2158,7 @@ public function testsCheckForESD(): void // No session, expect false static::assertFalse($this->module->sCheckForESD()); - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); // Get random non-esd product and add it to the basket $randomNoESDProduct = $this->connection->fetchAssociative( @@ -2248,8 +2225,7 @@ public function testsDeleteBasket(): void // No session, expect false static::assertFalse($this->module->sDeleteBasket()); - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); static::assertNull($this->module->sDeleteBasket()); @@ -2289,8 +2265,7 @@ public function testsDeleteArticle(): void // Random id, expect null static::assertNull($this->module->sDeleteArticle(9999999)); - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); // Get random product and add it to the basket $randomProduct = $this->connection->fetchAssociative( @@ -2323,8 +2298,7 @@ public function testsAddArticle(): void // No id, expect false static::assertFalse($this->module->sAddArticle('')); - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); // Get random product with stock control and add it to the basket $randomProductOne = $this->connection->fetchAssociative( @@ -2459,8 +2433,7 @@ public function testsPriceCalculationTaxfreeWithPriceGroupDiscount(): void $this->session->set('sUserGroupData', $customerGroupData); // Setup session - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); static::assertInstanceOf(Detail::class, $product->getMainDetail()); static::assertIsString($product->getMainDetail()->getNumber()); @@ -2489,8 +2462,7 @@ public function testsPriceCalculationTaxfreeWithPriceGroupDiscount(): void public function testMinPurchaseMultipleTimesAdded(): void { - $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true); - $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID); + $this->generateBasketSession(); $this->connection->executeStatement('UPDATE s_articles_details SET minpurchase = 2 WHERE ordernumber = "SW10239"'); @@ -2504,11 +2476,24 @@ public function testMinPurchaseMultipleTimesAdded(): void static::assertSame(4, (int) $cart[CartKey::POSITIONS][0]['quantity']); } + public function testUpdateCartItemsWithPurchaseSteps(): void + { + $this->generateBasketSession(); + + $this->connection->executeStatement('UPDATE s_articles_details SET purchasesteps = 4 WHERE ordernumber = "SW10239"'); + + $this->module->sAddArticle('SW10239'); + + $cart = $this->module->sGetBasketData(); + + static::assertArrayHasKey(CartKey::POSITIONS, $cart); + static::assertSame(1, (int) $cart[CartKey::POSITIONS][0]['quantity']); + } + private function generateBasketSession(): string { // Create session id $sessionId = Random::getAlphanumericString(32); - $this->module->sSYSTEM->sSESSION_ID = $sessionId; $this->session->offsetSet('sessionId', $sessionId); return $sessionId; From 6f65dc4b8a0fbb2b962b633ea9d4c01947779972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Schr=C3=B6der?= Date: Wed, 22 Jun 2022 10:25:22 +0200 Subject: [PATCH 065/730] SW-26842 - Change mPdf default fontDir to array fixes https://github.com/shopware/shopware/pull/2501 --- engine/Shopware/Configs/Default.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/Shopware/Configs/Default.php b/engine/Shopware/Configs/Default.php index ffe0fecc967..de85cb72800 100644 --- a/engine/Shopware/Configs/Default.php +++ b/engine/Shopware/Configs/Default.php @@ -375,7 +375,7 @@ // Passed to \Mpdf\Mpdf::__construct: 'defaultConfig' => [ 'tempDir' => $this->getCacheDir() . '/mpdf/', - 'fontDir' => $this->DocPath('engine_Library_Mpdf_ttfonts_'), + 'fontDir' => [$this->DocPath('engine_Library_Mpdf_ttfonts_')], 'fonttrans' => [ 'helvetica' => 'arial', 'verdana' => 'arial', From 9b9d2203bf898029d405254fb3d1f56f3bedac8a Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 23 Jun 2022 13:50:00 +0200 Subject: [PATCH 066/730] SW-22895 - Ensure property filter options are sorted correctly while using sort by position mode --- .phpstan-baseline.neon | 40 ------ .../FacetHandler/PropertyFacetHandler.php | 10 +- .../Bundle/SearchBundleES/StructHydrator.php | 2 +- .../DBAL/Hydrator/PropertyHydrator.php | 71 ++++------ .../Struct/Property/Option.php | 4 +- .../FacetHandler/PropertyFacetHandlerTest.php | 132 ++++++++++++++++++ 6 files changed, 171 insertions(+), 88 deletions(-) create mode 100644 tests/Functional/Bundle/SearchBundleDBAL/FacetHandler/PropertyFacetHandlerTest.php diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index 7b7c224d569..3f47a3a659d 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -10780,46 +10780,6 @@ parameters: count: 1 path: engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ProductStreamHydrator.php - - - message: "#^Method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Gateway\\\\DBAL\\\\Hydrator\\\\PropertyHydrator\\:\\:hydrateGroup\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php - - - - message: "#^Method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Gateway\\\\DBAL\\\\Hydrator\\\\PropertyHydrator\\:\\:hydrateOption\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php - - - - message: "#^Method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Gateway\\\\DBAL\\\\Hydrator\\\\PropertyHydrator\\:\\:hydrateSet\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php - - - - message: "#^Method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Gateway\\\\DBAL\\\\Hydrator\\\\PropertyHydrator\\:\\:hydrateValues\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php - - - - message: "#^Method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Gateway\\\\DBAL\\\\Hydrator\\\\PropertyHydrator\\:\\:sortGroups\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php - - - - message: "#^Method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Gateway\\\\DBAL\\\\Hydrator\\\\PropertyHydrator\\:\\:sortOptions\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php - - - - message: "#^Method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Gateway\\\\DBAL\\\\Hydrator\\\\PropertyHydrator\\:\\:sortOptionsByPosition\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php - - - - message: "#^Method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Gateway\\\\DBAL\\\\Hydrator\\\\PropertyHydrator\\:\\:sortOptionsNumercialValue\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php - - message: "#^Method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Gateway\\\\DBAL\\\\Hydrator\\\\ShopHydrator\\:\\:hydrate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/PropertyFacetHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/PropertyFacetHandler.php index 495f825c6b7..99077a39e0a 100644 --- a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/PropertyFacetHandler.php +++ b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/PropertyFacetHandler.php @@ -1,4 +1,6 @@ |null */ protected function getProperties(ShopContextInterface $context, Criteria $queryCriteria) { $query = $this->queryBuilderFactory->createQuery($queryCriteria, $context); $this->rebuildQuery($query); - $propertyData = $query->execute()->fetchAll(); + $propertyData = $query->execute()->fetchAllAssociative(); $valueIds = array_column($propertyData, 'id'); $filterGroupIds = array_keys(array_flip(array_column($propertyData, 'filterGroupId'))); @@ -138,8 +140,8 @@ private function getFilteredValues(Criteria $criteria): array } /** - * @param Set[] $sets - * @param int[] $actives + * @param array $sets + * @param array $actives */ private function createCollectionResult( PropertyFacet $facet, diff --git a/engine/Shopware/Bundle/SearchBundleES/StructHydrator.php b/engine/Shopware/Bundle/SearchBundleES/StructHydrator.php index 3245c5a4524..f50f9420e68 100644 --- a/engine/Shopware/Bundle/SearchBundleES/StructHydrator.php +++ b/engine/Shopware/Bundle/SearchBundleES/StructHydrator.php @@ -65,7 +65,7 @@ public function createPropertyOption($data) $option = new PropertyOption(); $option->setId($data['id']); $option->setName($data['name']); - $option->setPosition($data['position']); + $option->setPosition((int) $data['position']); if ($data['media']) { $option->setMedia($this->createMedia($data['media'])); diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php index 15c2890de5c..b2bb2239c13 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php @@ -34,15 +34,15 @@ class PropertyHydrator extends Hydrator private MediaHydrator $mediaHydrator; - public function __construct( - AttributeHydrator $attributeHydrator, - MediaHydrator $mediaHydrator - ) { + public function __construct(AttributeHydrator $attributeHydrator, MediaHydrator $mediaHydrator) + { $this->attributeHydrator = $attributeHydrator; $this->mediaHydrator = $mediaHydrator; } /** + * @param array> $data + * * @return Set[] */ public function hydrateValues(array $data) @@ -56,18 +56,10 @@ public function hydrateValues(array $data) $groupId = $row['__propertyGroup_id']; $optionId = $row['__propertyOption_id']; - if (isset($sets[$setId])) { - $set = $sets[$setId]; - } else { - $set = $this->hydrateSet($row); - } + $set = $sets[$setId] ?? $this->hydrateSet($row); $groups = $set->getGroups(); - if (isset($groups[$groupId])) { - $group = $groups[$groupId]; - } else { - $group = $this->hydrateGroup($row); - } + $group = $groups[$groupId] ?? $this->hydrateGroup($row); $options = $group->getOptions(); $options[$optionId] = $this->hydrateOption($row); @@ -90,6 +82,8 @@ public function hydrateValues(array $data) } /** + * @param array $data + * * @return Group */ public function hydrateGroup(array $data) @@ -110,6 +104,8 @@ public function hydrateGroup(array $data) } /** + * @param array $data + * * @return Option */ public function hydrateOption(array $data) @@ -135,6 +131,9 @@ public function hydrateOption(array $data) return $option; } + /** + * @param array $data + */ private function hydrateSet(array $data): Set { $set = new Set(); @@ -155,22 +154,20 @@ private function hydrateSet(array $data): Set /** * Sort groups by position in set + * + * @param array> $data */ private function sortGroups(array &$data): void { - usort($data, function ($a, $b) { - if ($a['__relations_position'] == $b['__relations_position']) { - return 0; - } - - return ($a['__relations_position'] < $b['__relations_position']) ? -1 : 1; + usort($data, function (array $a, array $b): int { + return $a['__relations_position'] <=> $b['__relations_position']; }); } /** - * @param Option[] $options + * @param array
    • @@ -112,7 +112,7 @@ type="text" placeholder="{s name='RegisterPlaceholderTitle' namespace="frontend/register/personal_fieldset"}{/s}" id="title" - value="{$formData.title|escape}" + value="{$formData.title|escapeHtml}" class="address--field{if $error_flags.title} has--error{/if}" />
    {/if} @@ -128,7 +128,7 @@ aria-required="true" placeholder="{s name='RegisterShippingPlaceholderFirstname' namespace="frontend/register/shipping_fieldset"}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}" id="firstname2" - value="{$formData.firstname|escape}" + value="{$formData.firstname|escapeHtml}" class="address--field is--required{if $error_flags.firstname} has--error{/if}"/>
    {/block} @@ -143,7 +143,7 @@ aria-required="true" placeholder="{s name='RegisterShippingPlaceholderLastname' namespace="frontend/register/shipping_fieldset"}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}" id="lastname2" - value="{$formData.lastname|escape}" + value="{$formData.lastname|escapeHtml}" class="address--field is--required{if $error_flags.lastname} has--error{/if}"/> {/block} @@ -158,7 +158,7 @@ aria-required="true" placeholder="{s name='RegisterBillingPlaceholderStreet' namespace="frontend/register/billing_fieldset"}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}" id="street" - value="{$formData.street|escape}" + value="{$formData.street|escapeHtml}" class="address--field address--field-street is--required{if $error_flags.street} has--error{/if}"/> {/block} @@ -173,7 +173,7 @@ {if {config name="requireAdditionAddressLine1"}} required="required" aria-required="true"{/if} placeholder="{s name='RegisterLabelAdditionalAddressLine1' namespace="frontend/register/shipping_fieldset"}{/s}{if {config name="requireAdditionAddressLine1"}}{s name="RequiredField" namespace="frontend/register/index"}{/s}{/if}" id="additionalAddressLine1" - value="{$formData.additionalAddressLine1|escape}" + value="{$formData.additionalAddressLine1|escapeHtml}" class="address--field{if {config name="requireAdditionAddressLine1"}} is--required{/if}{if $error_flags.additionalAddressLine1 && {config name="requireAdditionAddressLine1"}} has--error{/if}"/> {/if} @@ -189,7 +189,7 @@ {if {config name="requireAdditionAddressLine2"}} required="required" aria-required="true"{/if} placeholder="{s name='RegisterLabelAdditionalAddressLine2' namespace="frontend/register/shipping_fieldset"}{/s}{if {config name="requireAdditionAddressLine2"}}{s name="RequiredField" namespace="frontend/register/index"}{/s}{/if}" id="additionalAddressLine2" - value="{$formData.additionalAddressLine2|escape}" + value="{$formData.additionalAddressLine2|escapeHtml}" class="address--field{if {config name="requireAdditionAddressLine2"}} is--required{/if}{if $error_flags.additionalAddressLine2 && {config name="requireAdditionAddressLine2"}} has--error{/if}"/> {/if} @@ -206,7 +206,7 @@ aria-required="true" placeholder="{s name='RegisterBillingPlaceholderZipcode' namespace="frontend/register/billing_fieldset"}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}" id="zipcode" - value="{$formData.zipcode|escape}" + value="{$formData.zipcode|escapeHtml}" class="address--field address--spacer address--field-zipcode is--required{if $error_flags.zipcode} has--error{/if}"/> {else} @@ -226,7 +226,7 @@ aria-required="true" placeholder="{s name='RegisterBillingPlaceholderCity' namespace="frontend/register/billing_fieldset"}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}" id="city" - value="{$formData.city|escape}" + value="{$formData.city|escapeHtml}" size="25" class="address--field address--spacer address--field-city is--required{if $error_flags.city} has--error{/if}"/> {/if} @@ -305,7 +305,7 @@ {if {config name="requirePhoneField"}} required="required" aria-required="true"{/if} placeholder="{s name='RegisterPlaceholderPhone' namespace="frontend/register/personal_fieldset"}{/s}{if {config name="requirePhoneField"}}{s name="RequiredField" namespace="frontend/register/index"}{/s}{/if}" id="phone" - value="{$formData.phone|escape}" + value="{$formData.phone|escapeHtml}" class="address--field{if {config name="requirePhoneField"}} is--required{/if}{if $error_flags.phone && {config name="requirePhoneField"}} has--error{/if}"/> {/if} diff --git a/themes/Frontend/Bare/frontend/checkout/confirm.tpl b/themes/Frontend/Bare/frontend/checkout/confirm.tpl index 62900a8ce25..8e3e8b6b8f7 100644 --- a/themes/Frontend/Bare/frontend/checkout/confirm.tpl +++ b/themes/Frontend/Bare/frontend/checkout/confirm.tpl @@ -92,7 +92,7 @@ {/block} {* Hidden field for the user comment *} - +
      diff --git a/themes/Frontend/Bare/frontend/detail/comment/form.tpl b/themes/Frontend/Bare/frontend/detail/comment/form.tpl index f6621516a92..ba1970f05b8 100644 --- a/themes/Frontend/Bare/frontend/detail/comment/form.tpl +++ b/themes/Frontend/Bare/frontend/detail/comment/form.tpl @@ -21,19 +21,19 @@ {* Review author name *} {block name='frontend_detail_comment_input_name'} - + {/block} {* Reviewer email address *} {block name='frontend_detail_comment_input_mail'} {if {config name="OptinVote"} == true} - + {/if} {/block} {* Review summary *} {block name='frontend_detail_comment_input_summary'} - + {/block} {* Review Rating *} @@ -56,7 +56,7 @@ {* Review text *} {block name='frontend_detail_comment_input_text'} - + {/block} {* Captcha *} diff --git a/themes/Frontend/Bare/frontend/detail/product_quick_view.tpl b/themes/Frontend/Bare/frontend/detail/product_quick_view.tpl index a726ebd9e0b..ef065779001 100644 --- a/themes/Frontend/Bare/frontend/detail/product_quick_view.tpl +++ b/themes/Frontend/Bare/frontend/detail/product_quick_view.tpl @@ -3,13 +3,13 @@ {block name='frontend_detail_product_quick_view_inner'} {block name='frontend_detail_product_quick_view_image_link'} - + {block name='frontend_detail_product_quick_view_image'} - {$alt = $sArticle.articlename|escape} + {$alt = $sArticle.articlename|escapeHtml} {if $sArticle.image.description} - {$alt = $sArticle.image.description|escape} + {$alt = $sArticle.image.description|escapeHtml} {/if} @@ -31,9 +31,9 @@
      {block name='frontend_detail_product_quick_view_header_inner'} {block name='frontend_detail_product_quick_view_title'} - + {block name='frontend_detail_product_quick_view_title_inner'} - {$sArticle.articleName|escape} + {$sArticle.articleName|escapeHtml} {/block} {/block} @@ -41,7 +41,7 @@ {block name='frontend_detail_product_quick_view_supplier'}
      {block name='frontend_detail_product_quick_view_supplier_inner'} - {$sArticle.supplierName|escape} + {$sArticle.supplierName|escapeHtml} {/block}
      {/block} diff --git a/themes/Frontend/Bare/frontend/listing/actions/action-filter-panel.tpl b/themes/Frontend/Bare/frontend/listing/actions/action-filter-panel.tpl index 281e71ca5d3..b0ad832201b 100644 --- a/themes/Frontend/Bare/frontend/listing/actions/action-filter-panel.tpl +++ b/themes/Frontend/Bare/frontend/listing/actions/action-filter-panel.tpl @@ -35,25 +35,25 @@ {block name="frontend_listing_actions_filter_form_search"} {if $term !== null} - + {/if} {/block} {block name="frontend_listing_actions_filter_form_sort"} {if $sSort} - + {/if} {/block} {block name="frontend_listing_actions_filter_form_perpage"} {if $criteria && $criteria->getLimit()} - + {/if} {/block} {block name="frontend_listing_actions_filter_form_category"} {if !$sCategoryContent && $sCategoryCurrent != $sCategoryStart && {controllerName} != 'search'} - + {/if} {/block} diff --git a/themes/Frontend/Bare/frontend/listing/actions/action-pagination.tpl b/themes/Frontend/Bare/frontend/listing/actions/action-pagination.tpl index b100191b888..40968db16fc 100644 --- a/themes/Frontend/Bare/frontend/listing/actions/action-pagination.tpl +++ b/themes/Frontend/Bare/frontend/listing/actions/action-pagination.tpl @@ -11,7 +11,7 @@ {block name="frontend_listing_actions_paging_first"} {if $sPage > 1} {s name="ListingLinkFirst" assign="snippetListingLinkFirst"}{/s} - + @@ -22,7 +22,7 @@ {block name='frontend_listing_actions_paging_previous'} {if $sPage > 1} {s name="ListingLinkPrevious" assign="snippetListingLinkPrevious"}{/s} - + {/if} @@ -31,7 +31,7 @@ {* Pagination - current page *} {block name='frontend_listing_actions_paging_numbers'} {if $pages > 1} - {$sPage} + {$sPage} {/if} {/block} @@ -39,7 +39,7 @@ {block name='frontend_listing_actions_paging_next'} {if $sPage < $pages} {s name="ListingLinkNext" assign="snippetListingLinkNext"}{/s} - + {/if} @@ -49,7 +49,7 @@ {block name="frontend_listing_actions_paging_last"} {if $sPage < $pages} {s name="ListingLinkLast" assign="snippetListingLinkLast"}{/s} - + diff --git a/themes/Frontend/Bare/frontend/listing/atom.tpl b/themes/Frontend/Bare/frontend/listing/atom.tpl index a029b85d143..612a7375195 100644 --- a/themes/Frontend/Bare/frontend/listing/atom.tpl +++ b/themes/Frontend/Bare/frontend/listing/atom.tpl @@ -1,31 +1,31 @@ - + {$sShopname|escapeHtml} -{block name='frontend_listing_atom_title'}{$sCategoryContent.description|escape:'hexentity'}{/block} -{$sCategoryContent.rssFeed|escape:'hexentity'} +{block name='frontend_listing_atom_title'}{$sCategoryContent.description|escapeHtml:'hexentity'}{/block} +{$sCategoryContent.rssFeed|escapeHtml:'hexentity'} {time()|date:atom} {foreach $sArticles as $sArticle} {block name='frontend_listing_atom_entry'} - {block name='frontend_listing_atom_article_title'}{$sArticle.articleName|strip_tags|strip|truncate:80:"...":true|escape}{/block} - {block name='frontend_listing_atom_article_name'}{$sArticle.linkDetails|escape}{/block} - + {block name='frontend_listing_atom_article_title'}{$sArticle.articleName|strip_tags|strip|truncate:80:"...":true|escapeHtml}{/block} + {block name='frontend_listing_atom_article_name'}{$sArticle.linkDetails|escapeHtml}{/block} + {if $sArticle.changetime}{$sArticle.changetime|date:atom}{else}{$sArticle.datum|date:atom}{/if} diff --git a/themes/Frontend/Bare/frontend/listing/banner.tpl b/themes/Frontend/Bare/frontend/listing/banner.tpl index bbc3d23f54b..80db9c40689 100644 --- a/themes/Frontend/Bare/frontend/listing/banner.tpl +++ b/themes/Frontend/Bare/frontend/listing/banner.tpl @@ -10,18 +10,18 @@ - + {/block} {else} {* Normal banner *} {block name='frontend_listing_normal_banner'} - {/block} diff --git a/themes/Frontend/Bare/frontend/listing/customer_stream/layout.tpl b/themes/Frontend/Bare/frontend/listing/customer_stream/layout.tpl index 7d07c0b7207..62b603a9e0c 100644 --- a/themes/Frontend/Bare/frontend/listing/customer_stream/layout.tpl +++ b/themes/Frontend/Bare/frontend/listing/customer_stream/layout.tpl @@ -56,7 +56,7 @@ {if $showListingButton}
      - + {s name="ListingActionsOffersLink"}Weitere Artikel in dieser Kategorie »{/s}
      diff --git a/themes/Frontend/Bare/frontend/listing/filter/_includes/filter-multi-media-selection.tpl b/themes/Frontend/Bare/frontend/listing/filter/_includes/filter-multi-media-selection.tpl index d0f2bd712d0..61f8f33d039 100644 --- a/themes/Frontend/Bare/frontend/listing/filter/_includes/filter-multi-media-selection.tpl +++ b/themes/Frontend/Bare/frontend/listing/filter/_includes/filter-multi-media-selection.tpl @@ -1,15 +1,15 @@ {extends file="parent:frontend/listing/filter/_includes/filter-multi-selection.tpl"} {block name="frontend_listing_filter_facet_multi_selection_input"} - {$name = "__{$facet->getFieldName()|escape:'htmlall'}__{$option->getId()|escape:'htmlall'}"} + {$name = "__{$facet->getFieldName()|escapeHtmlAttr}__{$option->getId()|escapeHtmlAttr}"} {if $singleSelection} - {$name = {$facet->getFieldName()|escape:'htmlall'} } + {$name = {$facet->getFieldName()|escapeHtmlAttr} } {/if} isActive()}checked="checked" {/if}/> -{/block} \ No newline at end of file +{/block} diff --git a/themes/Frontend/Bare/frontend/listing/filter/_includes/filter-multi-selection.tpl b/themes/Frontend/Bare/frontend/listing/filter/_includes/filter-multi-selection.tpl index d0cf3102de7..ccf4a8a4d61 100644 --- a/themes/Frontend/Bare/frontend/listing/filter/_includes/filter-multi-selection.tpl +++ b/themes/Frontend/Bare/frontend/listing/filter/_includes/filter-multi-selection.tpl @@ -1,17 +1,17 @@ {namespace name="frontend/listing/listing_actions"} {block name="frontend_listing_filter_facet_multi_selection"} -
      + data-facet-name="{$facet->getFacetName()|escapeHtmlAttr}" + data-field-name="{$facet->getFieldName()|escapeHtmlAttr}"> {block name="frontend_listing_filter_facet_multi_selection_flyout"}
      {block name="frontend_listing_filter_facet_multi_selection_title"} -
      diff --git a/themes/Frontend/Bare/frontend/register/index.tpl b/themes/Frontend/Bare/frontend/register/index.tpl index 3b3a1a3b93f..96762535c93 100644 --- a/themes/Frontend/Bare/frontend/register/index.tpl +++ b/themes/Frontend/Bare/frontend/register/index.tpl @@ -18,7 +18,7 @@ {s name="FinishButtonBackToShop" namespace="frontend/checkout/finish" assign="snippetFinishButtonBackToShop"}{/s} + title="{$snippetFinishButtonBackToShop|escapeHtml}"> {s name="FinishButtonBackToShop" namespace="frontend/checkout/finish"}{/s} diff --git a/themes/Frontend/Bare/frontend/register/login.tpl b/themes/Frontend/Bare/frontend/register/login.tpl index d8e0174055b..83003fcdcf3 100644 --- a/themes/Frontend/Bare/frontend/register/login.tpl +++ b/themes/Frontend/Bare/frontend/register/login.tpl @@ -40,7 +40,7 @@ {block name='frontend_register_login_form_additional_inputs'} - {if $sTarget}{/if} + {if $sTarget}{/if} {if $showNoAccount}{/if} {/block} @@ -55,7 +55,7 @@ type="email" autocomplete="email" tabindex="1" - value="{$sFormData.email|escape}" + value="{$sFormData.email|escapeHtml}" id="email" class="register--login-field{if $sErrorFlag.email} has--error{/if}" /> @@ -78,7 +78,7 @@ {/block} @@ -123,7 +123,7 @@ required="required" aria-required="true" placeholder="{s name='RegisterPlaceholderLastname'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}" - id="lastname" value="{$form_data.lastname|escape}" + id="lastname" value="{$form_data.lastname|escapeHtml}" class="register--field is--required{if isset($error_flags.lastname)} has--error{/if}" />
      {/block} @@ -162,7 +162,7 @@ aria-required="true" placeholder="{s name='RegisterPlaceholderMail'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}" id="register_personal_email" - value="{$form_data.email|escape}" + value="{$form_data.email|escapeHtml}" class="register--field email is--required{if isset($error_flags.email)} has--error{/if}" />
      @@ -175,7 +175,7 @@ aria-required="true" placeholder="{s name='RegisterPlaceholderMailConfirmation'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}" id="register_personal_emailConfirmation" - value="{$form_data.emailConfirmation|escape}" + value="{$form_data.emailConfirmation|escapeHtml}" class="register--field emailConfirmation is--required{if isset($error_flags.emailConfirmation)} has--error{/if}" /> {/if} @@ -231,7 +231,7 @@ type="tel"{if {config name="requirePhoneField"}} required="required" aria-required="true"{/if} placeholder="{s name='RegisterPlaceholderPhone'}{/s}{if {config name="requirePhoneField"}}{s name="RequiredField" namespace="frontend/register/index"}{/s}{/if}" id="phone" - value="{$form_data.phone|escape}" + value="{$form_data.phone|escapeHtml}" class="register--field{if {config name="requirePhoneField"}} is--required{/if}{if isset($error_flags.phone) && {config name="requirePhoneField"}} has--error{/if}" /> {/if} diff --git a/themes/Frontend/Bare/frontend/register/shipping_fieldset.tpl b/themes/Frontend/Bare/frontend/register/shipping_fieldset.tpl index 38e82709e2c..0abba6a2348 100644 --- a/themes/Frontend/Bare/frontend/register/shipping_fieldset.tpl +++ b/themes/Frontend/Bare/frontend/register/shipping_fieldset.tpl @@ -32,7 +32,7 @@ name="register[shipping][company]" type="text" placeholder="{s name='RegisterShippingPlaceholderCompany'}{/s}" - id="company2" value="{$form_data.company|escape}" + id="company2" value="{$form_data.company|escapeHtml}" class="register--field{if isset($error_flags.company)} has--error{/if}" /> {/block} @@ -44,7 +44,7 @@ name="register[shipping][department]" type="text" placeholder="{s name='RegisterShippingPlaceholderDepartment'}{/s}" - id="department2" value="{$form_data.department|escape}" + id="department2" value="{$form_data.department|escapeHtml}" class="register--field {if isset($error_flags.department)} has--error{/if}" /> {/block} @@ -59,7 +59,7 @@ aria-required="true" placeholder="{s name='RegisterShippingPlaceholderFirstname'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}" id="firstname2" - value="{$form_data.firstname|escape}" + value="{$form_data.firstname|escapeHtml}" class="register--field is--required{if isset($error_flags.firstname)} has--error{/if}" /> {/block} @@ -74,7 +74,7 @@ aria-required="true" placeholder="{s name='RegisterShippingPlaceholderLastname'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}" id="lastname2" - value="{$form_data.lastname|escape}" + value="{$form_data.lastname|escapeHtml}" class="register--field is--required{if isset($error_flags.lastname)} has--error{/if}" /> {/block} @@ -89,7 +89,7 @@ aria-required="true" placeholder="{s name='RegisterShippingPlaceholderStreet'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}" id="street2" - value="{$form_data.street|escape}" + value="{$form_data.street|escapeHtml}" class="register--field register--field-street is--required{if isset($error_flags.street)} has--error{/if}" /> {/block} @@ -103,7 +103,7 @@ type="text"{if {config name="requireAdditionAddressLine1"}} required="required" aria-required="true"{/if} placeholder="{s name='RegisterLabelAdditionalAddressLine1'}{/s}{if {config name="requireAdditionAddressLine1"}}{s name="RequiredField" namespace="frontend/register/index"}{/s}{/if}" id="additionalAddressLine21" - value="{$form_data.additionalAddressLine1|escape}" + value="{$form_data.additionalAddressLine1|escapeHtml}" class="register--field{if {config name="requireAdditionAddressLine1"}} is--required{/if}{if isset($error_flags.additionalAddressLine1) && {config name="requireAdditionAddressLine1"}} has--error{/if}" /> {/if} @@ -118,7 +118,7 @@ type="text"{if {config name="requireAdditionAddressLine2"}} required="required" aria-required="true"{/if} placeholder="{s name='RegisterLabelAdditionalAddressLine2'}{/s}{if {config name="requireAdditionAddressLine2"}}{s name="RequiredField" namespace="frontend/register/index"}{/s}{/if}" id="additionalAddressLine22" - value="{$form_data.additionalAddressLine2|escape}" + value="{$form_data.additionalAddressLine2|escapeHtml}" class="register--field{if {config name="requireAdditionAddressLine2"}} is--required{/if}{if isset($error_flags.additionalAddressLine2) && {config name="requireAdditionAddressLine2"}} has--error{/if}" /> {/if} @@ -135,7 +135,7 @@ aria-required="true" placeholder="{s name='RegisterShippingPlaceholderZipcode'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}" id="zipcode2" - value="{$form_data.zipcode|escape}" + value="{$form_data.zipcode|escapeHtml}" class="register--field register--spacer register--field-zipcode is--required{if isset($error_flags.zipcode)} has--error{/if}" /> {else} @@ -156,7 +156,7 @@ aria-required="true" placeholder="{s name='RegisterShippingPlaceholderCity'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}" id="city2" - value="{$form_data.city|escape}" + value="{$form_data.city|escapeHtml}" size="25" class="register--field register--spacer register--field-city is--required{if isset($error_flags.city)} has--error{/if}" /> @@ -167,7 +167,7 @@ aria-required="true" placeholder="{s name='RegisterShippingPlaceholderZipcode'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}" id="zipcode2" - value="{$form_data.zipcode|escape}" + value="{$form_data.zipcode|escapeHtml}" class="register--field register--field-zipcode is--required{if isset($error_flags.zipcode)} has--error{/if}" /> {/if} From 6e51cd4389fd78292f89a1345067b8519e3192ad Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 26 Jun 2023 16:50:19 +0200 Subject: [PATCH 418/730] fix(SW-27005): Fix notices and warnings in tests --- .phpstan-baseline.neon | 519 +----------------- engine/Library/Enlight/Class.php | 13 +- .../Template/Plugins/modifier.currency.php | 9 +- .../AccountBundle/Controller/AccountTest.php | 8 +- .../AccountBundle/Controller/RegisterTest.php | 5 + .../AttributeBundle/SchemaOperatorTest.php | 109 ++-- .../CustomerSearchBundleDBAL/TestCase.php | 6 +- .../ImmediateDeliveryConditionTest.php | 28 +- .../Condition/PriceConditionTest.php | 2 +- .../VariantConditionWithPriceGroupTest.php | 2 +- .../StoreFrontBundle/ManufacturerTest.php | 6 +- .../Bundle/StoreFrontBundle/VoteTest.php | 2 +- tests/Functional/Components/Api/CacheTest.php | 6 +- .../Components/Api/EmotionPresetTest.php | 16 +- .../Captcha/CaptchaValidatorTest.php | 3 + .../Cart/CalculationOnLogoutTest.php | 12 +- .../Components/Cart/CartDatabaseViewTest.php | 6 +- .../Components/Cart/CartMigrationTest.php | 56 +- .../Components/Cart/CartRaceConditionTest.php | 8 +- .../Cart/FloatTaxCalculationTest.php | 4 +- .../Cart/PaymentTokenServiceTest.php | 1 - ...tionalCartCalculationCustomerGroupTest.php | 4 +- ...roportionalCartCalculationDispatchTest.php | 4 +- ...oportionalCartCalculationSurchargeTest.php | 4 +- ...ProportionalCartCalculationVoucherTest.php | 4 +- .../Cart/fixture/cart_migration_1.sql | 6 +- ...{CheckoutTest.php => CheckoutTestCase.php} | 13 +- .../DependencyInjection/Bridge/CacheTest.php | 141 +++-- .../Compiler/LegacyApiResourcesPassTest.php | 2 +- .../EmotionToPresetDataTransformerTest.php | 15 +- .../Preset/PresetDataSynchronizerTest.php | 32 +- .../Components/NumberRangeIncrementerTest.php | 2 + .../Privacy/CookieRemoveSubscriberTest.php | 22 +- .../ProductStream/RepositoryTest.php | 2 +- .../Components/Router/RouterTest.php | 3 +- .../Template/TemplateManagerTest.php | 8 +- .../Components/TemplateMailTest.php | 30 +- .../Controllers/Backend/AnalyticsTest.php | 2 +- .../Controllers/Backend/ArticleTest.php | 1 - .../Controllers/Backend/CustomerTest.php | 134 +++-- .../Controllers/Backend/LogTest.php | 36 +- .../Controllers/Backend/MailTest.php | 5 +- .../Controllers/Backend/MediaManagerTest.php | 4 +- .../Backend/OrderProductSearchTest.php | 2 +- .../Controllers/Backend/OrderTest.php | 2 +- .../Controllers/Backend/PaymentTest.php | 55 +- .../Backend/RiskManagementTest.php | 3 +- .../Controllers/Backend/UserManagerTest.php | 34 +- .../Controllers/Backend/VoteTest.php | 30 +- .../Controllers/Backend/VoucherTest.php | 142 ++--- .../Controllers/Frontend/BlogTest.php | 27 +- .../Frontend/RegisterWithCaptchaTest.php | 2 + .../Controllers/Frontend/SearchTest.php | 29 +- .../Controllers/Frontend/SitemapTest.php | 28 +- .../Controllers/Frontend/SitemapXmlTest.php | 37 -- .../Controllers/Widgets/IndexTest.php | 2 +- tests/Functional/Core/AdminTest.php | 3 +- tests/Functional/Core/BasketTest.php | 51 +- tests/Functional/Core/ExportTest.php | 6 +- tests/Functional/Core/OrderTest.php | 74 ++- .../Template/Plugins/CurrencyModifierTest.php | 55 ++ .../Library/{ => Zend}/ZendDBTest.php | 2 +- .../Library/{ => Zend}/ZendLocaleTest.php | 19 +- .../Functional/Models/Article/DetailTest.php | 6 +- .../BlogCategoryTreeListQueryTest.php | 22 +- .../CustomerStreamRepositoryTest.php | 4 +- .../Order/OrderDocumentDocumentTest.php | 3 + .../Modules/Articles/CompareTest.php | 14 +- .../Modules/Articles/sGetArticleByIdTest.php | 2 +- .../HttpCache/DynamicCacheTimeServiceTest.php | 153 +++--- 70 files changed, 776 insertions(+), 1326 deletions(-) rename tests/Functional/Components/{CheckoutTest.php => CheckoutTestCase.php} (95%) rename tests/Functional/{Shopware => }/Components/ProductStream/RepositoryTest.php (96%) delete mode 100644 tests/Functional/Controllers/Frontend/SitemapXmlTest.php create mode 100644 tests/Functional/Library/Enlight/Template/Plugins/CurrencyModifierTest.php rename tests/Functional/Library/{ => Zend}/ZendDBTest.php (96%) rename tests/Functional/Library/{ => Zend}/ZendLocaleTest.php (77%) diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index 950b3d5008f..7bfec3b74a3 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -1281,13 +1281,8 @@ parameters: path: engine/Library/Enlight/Application.php - - message: "#^Method Enlight_Class\\:\\:Instance\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Library/Enlight/Class.php - - - - message: "#^Method Enlight_Class\\:\\:Instance\\(\\) should return Enlight_Class but returns object\\.$#" - count: 1 + message: "#^Method Enlight_Class\\:\\:Instance\\(\\) should return TClass of object but returns object\\.$#" + count: 2 path: engine/Library/Enlight/Class.php - @@ -1335,11 +1330,6 @@ parameters: count: 1 path: engine/Library/Enlight/Class.php - - - message: "#^Property Enlight_Class\\:\\:\\$instances type has no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Library/Enlight/Class.php - - message: "#^Method Enlight_Collection_ArrayCollection\\:\\:__call\\(\\) has no return type specified\\.$#" count: 1 @@ -3795,16 +3785,6 @@ parameters: count: 1 path: engine/Library/Enlight/Template/Plugins/modifier.count.php - - - message: "#^Function smarty_modifier_currency\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Library/Enlight/Template/Plugins/modifier.currency.php - - - - message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, float given\\.$#" - count: 1 - path: engine/Library/Enlight/Template/Plugins/modifier.currency.php - - message: "#^Parameter \\#1 \\$date of class Zend_Date constructor expects array\\|int\\|string\\|Zend_Date\\|null, DateTime\\|int\\|false given\\.$#" count: 1 @@ -15430,6 +15410,11 @@ parameters: count: 1 path: engine/Shopware/Components/DependencyInjection/Bridge/MailTransport.php + - + message: "#^Unable to resolve the template type TClass in call to method static method Enlight_Class\\:\\:Instance\\(\\)$#" + count: 2 + path: engine/Shopware/Components/DependencyInjection/Bridge/MailTransport.php + - message: "#^Method Shopware\\\\Components\\\\DependencyInjection\\\\Bridge\\\\Models\\:\\:generateAttributeModels\\(\\) has no return type specified\\.$#" count: 1 @@ -34960,21 +34945,6 @@ parameters: count: 1 path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php - - - message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:initAlsoBoughtResource\\(\\) should return Shopware_Components_AlsoBought but returns Enlight_Class\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php - - - - message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:initSimilarShownResource\\(\\) should return Shopware_Components_SimilarShown but returns Enlight_Class\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php - - - - message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:initTopSellerResource\\(\\) should return Shopware_Components_TopSeller but returns Enlight_Class\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php - - message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:isSimilarShownActivated\\(\\) has no return type specified\\.$#" count: 1 @@ -35390,11 +35360,6 @@ parameters: count: 1 path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Bootstrap.php - - - message: "#^Method Shopware_Plugins_Core_RebuildIndex_Bootstrap\\:\\:initSeoIndexResource\\(\\) should return Shopware_Components_SeoIndex but returns Enlight_Class\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Bootstrap.php - - message: "#^Method Shopware_Plugins_Core_RebuildIndex_Bootstrap\\:\\:onAfterSendResponse\\(\\) has no return type specified\\.$#" count: 1 @@ -35920,11 +35885,6 @@ parameters: count: 1 path: tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AttributeBundle\\\\SchemaOperatorTest\\:\\:iterateTypeArray\\(\\) has parameter \\$types with no value type specified in iterable type array\\.$#" - count: 1 - path: tests/Functional/Bundle/AttributeBundle/SchemaOperatorTest.php - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\ContentTypeBundle\\\\Services\\\\ExtjsBuilderTest\\:\\:dataProviderColumnFields\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -37360,16 +37320,6 @@ parameters: count: 1 path: tests/Functional/Components/Cart/ProportionalCartCalculationCustomerGroupTest.php - - - message: "#^Query error\\: Column \"s_emarketing_vouchers\\.percental\" expects value type int, got type bool$#" - count: 1 - path: tests/Functional/Components/CheckoutTest.php - - - - message: "#^Query error\\: Column \"s_emarketing_vouchers\\.taxconfig\" expects value type string, got type int$#" - count: 1 - path: tests/Functional/Components/CheckoutTest.php - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\DependencyInjection\\\\Compiler\\\\ConfigureContainerAwareCommandsTest\\:\\:getShopwareCommands\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -38060,86 +38010,6 @@ parameters: count: 1 path: tests/Functional/Controllers/Backend/AnalyticsTest.php - - - message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$data\\.$#" - count: 2 - path: tests/Functional/Controllers/Backend/CustomerTest.php - - - - message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#" - count: 5 - path: tests/Functional/Controllers/Backend/CustomerTest.php - - - - message: "#^Cannot call method getAdditionalAddressLine1\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#" - count: 2 - path: tests/Functional/Controllers/Backend/CustomerTest.php - - - - message: "#^Cannot call method getAdditionalAddressLine2\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#" - count: 2 - path: tests/Functional/Controllers/Backend/CustomerTest.php - - - - message: "#^Cannot call method getCity\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#" - count: 2 - path: tests/Functional/Controllers/Backend/CustomerTest.php - - - - message: "#^Cannot call method getDepartment\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#" - count: 2 - path: tests/Functional/Controllers/Backend/CustomerTest.php - - - - message: "#^Cannot call method getFirstname\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#" - count: 2 - path: tests/Functional/Controllers/Backend/CustomerTest.php - - - - message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Customer\\\\Group\\|null\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/CustomerTest.php - - - - message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Payment\\\\Payment\\|null\\.$#" - count: 12 - path: tests/Functional/Controllers/Backend/CustomerTest.php - - - - message: "#^Cannot call method getLastname\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#" - count: 2 - path: tests/Functional/Controllers/Backend/CustomerTest.php - - - - message: "#^Cannot call method getStreet\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#" - count: 2 - path: tests/Functional/Controllers/Backend/CustomerTest.php - - - - message: "#^Cannot call method getTitle\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#" - count: 2 - path: tests/Functional/Controllers/Backend/CustomerTest.php - - - - message: "#^Cannot call method getVatId\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#" - count: 2 - path: tests/Functional/Controllers/Backend/CustomerTest.php - - - - message: "#^Cannot call method getZipcode\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#" - count: 2 - path: tests/Functional/Controllers/Backend/CustomerTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\CustomerTest\\:\\:testUpdateCustomerPaymentDataWithSepa\\(\\) has parameter \\$dummyDataId with no type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/CustomerTest.php - - - - message: "#^Parameter \\#1 \\$group of method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setGroup\\(\\) expects array\\|Shopware\\\\Models\\\\Customer\\\\Group, Shopware\\\\Models\\\\Customer\\\\Group\\|null given\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/CustomerTest.php - - message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$data\\.$#" count: 5 @@ -38180,36 +38050,6 @@ parameters: count: 1 path: tests/Functional/Controllers/Backend/FormTest.php - - - message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#" - count: 3 - path: tests/Functional/Controllers/Backend/LogTest.php - - - - message: "#^Method Enlight_Controller_Request_RequestTestCase\\:\\:setClientIp\\(\\) invoked with 2 parameters, 1 required\\.$#" - count: 2 - path: tests/Functional/Controllers/Backend/LogTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\LogTest\\:\\:testCreateDeprecatedLog\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/LogTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\LogTest\\:\\:testCreateLog\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/LogTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\LogTest\\:\\:testDeleteLogs\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/LogTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\LogTest\\:\\:testGetLogs\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/LogTest.php - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\MailTest\\:\\:testCreateMail\\(\\) has no return type specified\\.$#" count: 1 @@ -38285,51 +38125,6 @@ parameters: count: 1 path: tests/Functional/Controllers/Backend/NotificationTest.php - - - message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#" - count: 5 - path: tests/Functional/Controllers/Backend/PaymentTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PaymentTest\\:\\:testCreatePayments\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/PaymentTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PaymentTest\\:\\:testDeletePayment\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/PaymentTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PaymentTest\\:\\:testDeletePayment\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/PaymentTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PaymentTest\\:\\:testGetCountries\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/PaymentTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PaymentTest\\:\\:testGetPayments\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/PaymentTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PaymentTest\\:\\:testUpdatePayments\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/PaymentTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PaymentTest\\:\\:testUpdatePayments\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/PaymentTest.php - - - - message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PaymentTest\\:\\:\\$testDataCreate has no type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/PaymentTest.php - - message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#" count: 2 @@ -38420,71 +38215,6 @@ parameters: count: 1 path: tests/Functional/Controllers/Backend/SupplierTest.php - - - message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$data\\.$#" - count: 7 - path: tests/Functional/Controllers/Backend/VoucherTest.php - - - - message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#" - count: 8 - path: tests/Functional/Controllers/Backend/VoucherTest.php - - - - message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$totalCount\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/VoucherTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoucherTest\\:\\:testDeleteVoucher\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/VoucherTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoucherTest\\:\\:testExportVoucherCode\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/VoucherTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoucherTest\\:\\:testGenerateVoucherCodes\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/VoucherTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoucherTest\\:\\:testGetTaxConfiguration\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/VoucherTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoucherTest\\:\\:testGetVoucher\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/VoucherTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoucherTest\\:\\:testGetVoucherCodes\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/VoucherTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoucherTest\\:\\:testUpdateVoucher\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/VoucherTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoucherTest\\:\\:testValidateOrderCode\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/VoucherTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoucherTest\\:\\:testValidateVoucherCode\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/VoucherTest.php - - - - message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoucherTest\\:\\:\\$voucherData type has no value type specified in iterable type array\\.$#" - count: 1 - path: tests/Functional/Controllers/Backend/VoucherTest.php - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\WidgetsTest\\:\\:backendAuthProvider\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -38525,106 +38255,21 @@ parameters: count: 1 path: tests/Functional/Controllers/Backend/WidgetsTest.php - - - message: "#^Access to an undefined property Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\BlogTest\\:\\:\\$connection\\.$#" - count: 3 - path: tests/Functional/Controllers/Frontend/BlogTest.php - - - - message: "#^Cannot call method getCode\\(\\) on Exception\\|null\\.$#" - count: 2 - path: tests/Functional/Controllers/Frontend/BlogTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\BlogTest\\:\\:invalidCategoryUrlDataProvider\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Frontend/BlogTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\BlogTest\\:\\:testDispatchInactiveCategory\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Frontend/BlogTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\BlogTest\\:\\:testDispatchNoActiveBlogItem\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Frontend/BlogTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\BlogTest\\:\\:testDispatchNonBlogCategory\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Frontend/BlogTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\BlogTest\\:\\:testDispatchNotExistingBlogCategory\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Frontend/BlogTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\BlogTest\\:\\:testDispatchNotExistingBlogItem\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Frontend/BlogTest.php - - message: "#^Query error\\: Column \"s_core_rulesets\\.value1\" expects value type string, got type 100$#" count: 1 path: tests/Functional/Controllers/Frontend/CheckoutTest.php - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\SearchTest\\:\\:searchTermProvider\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Frontend/SearchTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\SearchTest\\:\\:testAjaxSearch\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Frontend/SearchTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\SearchTest\\:\\:testSearchEscapes\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Frontend/SearchTest.php - - - - message: "#^Parameter \\#1 \\$needle of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, string\\|null given\\.$#" - count: 1 - path: tests/Functional/Controllers/Frontend/SearchTest.php - - - - message: "#^Parameter \\#2 \\$haystack of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, string\\|null given\\.$#" - count: 1 - path: tests/Functional/Controllers/Frontend/SearchTest.php - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\SitemapTest\\:\\:sitemapDataprovider\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 path: tests/Functional/Controllers/Frontend/SitemapTest.php - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\SitemapTest\\:\\:testIndex\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Frontend/SitemapTest.php - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\SitemapTest\\:\\:testIndex\\(\\) has parameter \\$sitemapData with no value type specified in iterable type array\\.$#" count: 1 path: tests/Functional/Controllers/Frontend/SitemapTest.php - - - message: "#^Parameter \\#1 \\$shop of method Shopware\\\\Components\\\\ShopRegistrationService\\:\\:registerShop\\(\\) expects Shopware\\\\Models\\\\Shop\\\\Shop, Shopware\\\\Models\\\\Shop\\\\Shop\\|null given\\.$#" - count: 1 - path: tests/Functional/Controllers/Frontend/SitemapTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\SitemapXmlTest\\:\\:testIndex\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Frontend/SitemapXmlTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Widgets\\\\IndexTest\\:\\:testShopMenu\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Controllers/Widgets/IndexTest.php - - message: "#^Query error\\: Argument \\#1 is not a constant array, got array\\$#" count: 7 @@ -39110,16 +38755,6 @@ parameters: count: 1 path: tests/Functional/Core/sCoreTest.php - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Library\\\\ZendLocaleTest\\:\\:getLocales\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: tests/Functional/Library/ZendLocaleTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Library\\\\ZendLocaleTest\\:\\:testLocalCreation\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Library/ZendLocaleTest.php - - message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Models\\\\Category\\\\BlogCategoryTreeListQueryTest\\:\\:\\$expected type has no value type specified in iterable type array\\.$#" count: 1 @@ -39180,11 +38815,6 @@ parameters: count: 2 path: tests/Functional/Models/Order/OrderDocumentDocumentTest.php - - - message: "#^Variable \\$document might not be defined\\.$#" - count: 1 - path: tests/Functional/Models/Order/OrderDocumentDocumentTest.php - - message: "#^Parameter \\#1 \\$dispatch of method Shopware\\\\Models\\\\Order\\\\Order\\:\\:setDispatch\\(\\) expects Shopware\\\\Models\\\\Dispatch\\\\Dispatch, Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\|null given\\.$#" count: 1 @@ -39385,141 +39015,6 @@ parameters: count: 1 path: tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php - - - message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Cannot call method getNumber\\(\\) on Shopware\\\\Models\\\\Article\\\\Detail\\|null\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Cannot call method setCategories\\(\\) on Shopware\\\\Models\\\\Emotion\\\\Emotion\\|null\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Cannot call method setCategoryId\\(\\) on Shopware\\\\Models\\\\Blog\\\\Blog\\|null\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Cannot call method setReleaseDate\\(\\) on Shopware\\\\Models\\\\Article\\\\Detail\\|null\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:createTestBlog\\(\\) never returns null so it can be removed from the return type\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:createTestCategory\\(\\) never returns null so it can be removed from the return type\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:createTestEmotion\\(\\) never returns null so it can be removed from the return type\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:createTestProduct\\(\\) never returns null so it can be removed from the return type\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:getBlogTestData\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:getEmotionTestData\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:getProductTestData\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:testBlogListingTimeCalculation\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:testBlogTimeCalculation\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:testCategoryTimeCalculation\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:testProductDetailTimeCalculation\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:testServiceIsAvailable\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Parameter \\#1 \\$active of method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setActive\\(\\) expects bool, int given\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Parameter \\#1 \\$blog of method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:getBlogListingRequest\\(\\) expects Shopware\\\\Models\\\\Blog\\\\Blog, Shopware\\\\Models\\\\Blog\\\\Blog\\|null given\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Parameter \\#1 \\$blog of method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:getBlogRequest\\(\\) expects Shopware\\\\Models\\\\Blog\\\\Blog, Shopware\\\\Models\\\\Blog\\\\Blog\\|null given\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Parameter \\#1 \\$category of method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:getcategoryRequest\\(\\) expects Shopware\\\\Models\\\\Category\\\\Category, Shopware\\\\Models\\\\Category\\\\Category\\|null given\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Parameter \\#1 \\$emotions of method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setEmotions\\(\\) expects Doctrine\\\\Common\\\\Collections\\\\ArrayCollection&iterable\\, Doctrine\\\\Common\\\\Collections\\\\ArrayCollection\\ given\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Parameter \\#1 \\$entity of method Doctrine\\\\ORM\\\\EntityManager\\:\\:persist\\(\\) expects object, Shopware\\\\Models\\\\Blog\\\\Blog\\|null given\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Parameter \\#1 \\$entity of method Doctrine\\\\ORM\\\\EntityManager\\:\\:remove\\(\\) expects object, Shopware\\\\Models\\\\Article\\\\Article\\|null given\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Parameter \\#1 \\$entity of method Doctrine\\\\ORM\\\\EntityManager\\:\\:remove\\(\\) expects object, Shopware\\\\Models\\\\Blog\\\\Blog\\|null given\\.$#" - count: 2 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Parameter \\#1 \\$entity of method Doctrine\\\\ORM\\\\EntityManager\\:\\:remove\\(\\) expects object, Shopware\\\\Models\\\\Category\\\\Category\\|null given\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - - - message: "#^Parameter \\#1 \\$product of method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:getProductRequest\\(\\) expects Shopware\\\\Models\\\\Article\\\\Article, Shopware\\\\Models\\\\Article\\\\Article\\|null given\\.$#" - count: 1 - path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\AbstractMarketing\\:\\:assertArrayEquals\\(\\) has no return type specified\\.$#" count: 1 diff --git a/engine/Library/Enlight/Class.php b/engine/Library/Enlight/Class.php index b96f1f7e565..12f3a445664 100644 --- a/engine/Library/Enlight/Class.php +++ b/engine/Library/Enlight/Class.php @@ -33,7 +33,7 @@ abstract class Enlight_Class /** * Contains all initialized Enlight instances. * - * @var array + * @var array, Enlight_Class|object> */ protected static $instances = []; @@ -59,7 +59,8 @@ public function __construct() } if ($this instanceof Enlight_Hook && !$this instanceof Enlight_Hook_Proxy - && Shopware()->Hooks()->hasProxy($class)) { + && Shopware()->Hooks()->hasProxy($class) + ) { throw new Enlight_Exception( 'Class "' . \get_class($this) . '" has hooks, please use the instance method' ); @@ -161,12 +162,14 @@ public static function getClassName($class = null) * Returns a class instance. If the class is already initialed the existing instance will returned. * Otherwise the class will be initialed with the given arguments. * - * @param class-string $class - * @param array $args + * @template TClass of (Enlight_Class|object) + * + * @param class-string|null $class + * @param array|null $args * * @throws \ReflectionException * - * @return Enlight_Class + * @return TClass */ public static function Instance($class = null, $args = null) { diff --git a/engine/Library/Enlight/Template/Plugins/modifier.currency.php b/engine/Library/Enlight/Template/Plugins/modifier.currency.php index 77f3fa9f92b..b3baea6dea0 100644 --- a/engine/Library/Enlight/Template/Plugins/modifier.currency.php +++ b/engine/Library/Enlight/Template/Plugins/modifier.currency.php @@ -22,9 +22,9 @@ * * @see http://framework.zend.com/manual/de/zend.currency.options.html * - * @param float $value Value can have a coma as a decimal separator - * @param array|string $config - * @param string $position where the currency symbol should be displayed + * @param float|string $value Value can have a coma as a decimal separator + * @param array|string $config + * @param string|null $position where the currency symbol should be displayed * * @return string */ @@ -49,9 +49,8 @@ function smarty_modifier_currency($value, $config = null, $position = null) } $currency = Shopware()->Container()->get('currency'); - $formattedValue = (float) str_replace(',', '.', $value); + $formattedValue = (float) str_replace(',', '.', (string) $value); $formattedValue = $currency->toCurrency($formattedValue, $config); - $formattedValue = mb_convert_encoding($formattedValue, 'HTML-ENTITIES', 'UTF-8'); return htmlentities($formattedValue, ENT_COMPAT, 'UTF-8', false); } diff --git a/tests/Functional/Bundle/AccountBundle/Controller/AccountTest.php b/tests/Functional/Bundle/AccountBundle/Controller/AccountTest.php index fc427091f27..4d413bf8df2 100644 --- a/tests/Functional/Bundle/AccountBundle/Controller/AccountTest.php +++ b/tests/Functional/Bundle/AccountBundle/Controller/AccountTest.php @@ -26,7 +26,6 @@ namespace Shopware\Tests\Functional\Bundle\AccountBundle\Controller; -use Enlight_Components_Db_Adapter_Pdo_Mysql; use Enlight_Components_Session_Namespace; use Enlight_Components_Test_Controller_TestCase as ControllerTestCase; use Shopware_Components_Config; @@ -127,12 +126,12 @@ public function testNormalLogin(): void public function testHashPostLogin(): void { // test with md5 password and without the ignoreAccountMode parameter - static::assertEmpty($this->session->offsetGet('sUserId')); + static::assertEmpty($this->session->get('sUserId')); $this->setUserDataToPost(); $this->dispatch('/account/login'); - static::assertEmpty($this->session->offsetGet('sUserId')); + static::assertEmpty($this->session->get('sUserId')); $this->logoutUser(); } @@ -222,9 +221,10 @@ private function setUserDataToPost(): void { $sql = 'SELECT email, password FROM s_user WHERE id = 1'; $database = $this->container->get('db'); - static::assertInstanceOf(Enlight_Components_Db_Adapter_Pdo_Mysql::class, $database); $userData = $database->fetchRow($sql); + static::assertNotEmpty($userData['email']); + static::assertNotEmpty($userData['password']); $this->Request()->setMethod('POST') ->setPost('email', $userData['email']) ->setPost('passwordMD5', $userData['password']); diff --git a/tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php b/tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php index 78ba7845b77..76121322551 100644 --- a/tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php +++ b/tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php @@ -72,6 +72,7 @@ public function testSimpleRegistration(): void 'register' => [ 'personal' => $this->getPersonalData(), 'billing' => $this->getBillingData(), + 'shipping' => $this->getShippingData(), ], ]); @@ -104,6 +105,7 @@ public function testDoubleOptInRegistration(): void 'register' => [ 'personal' => $this->getPersonalData(), 'billing' => $this->getBillingData(), + 'shipping' => $this->getShippingData(), ], ]); @@ -173,6 +175,7 @@ public function testCompanyRegistration(): void 'company' => 'company', 'department' => 'department', ]), + 'shipping' => $this->getShippingData(), ], ]); @@ -199,6 +202,7 @@ public function testFastRegistration(): void 'accountmode' => Customer::ACCOUNT_MODE_FAST_LOGIN, ]), 'billing' => $this->getBillingData(), + 'shipping' => $this->getShippingData(), ], ]); @@ -228,6 +232,7 @@ public function testDefaultPayment(): void 'register' => [ 'personal' => $this->getPersonalData(), 'billing' => $this->getBillingData(), + 'shipping' => $this->getShippingData(), ], ]); diff --git a/tests/Functional/Bundle/AttributeBundle/SchemaOperatorTest.php b/tests/Functional/Bundle/AttributeBundle/SchemaOperatorTest.php index feb321cf422..61586f71d27 100644 --- a/tests/Functional/Bundle/AttributeBundle/SchemaOperatorTest.php +++ b/tests/Functional/Bundle/AttributeBundle/SchemaOperatorTest.php @@ -24,26 +24,30 @@ namespace Shopware\Tests\Functional\Bundle\AttributeBundle; +use Doctrine\DBAL\DBALException; use Exception; use PHPUnit\Framework\TestCase; use Shopware\Bundle\AttributeBundle\Service\ConfigurationStruct; +use Shopware\Bundle\AttributeBundle\Service\CrudService; +use Shopware\Bundle\AttributeBundle\Service\TableMapping; +use Shopware\Bundle\AttributeBundle\Service\TypeMappingInterface; class SchemaOperatorTest extends TestCase { public function testDefaultValues(): void { $types = [ - 'string' => 'test123', - 'integer' => 123, - 'float' => 123, - 'boolean' => 1, - 'date' => '2010-01-01', - 'datetime' => '2010-01-01 10:00:00', - 'text' => 'test123', - 'html' => 'test123', - 'combobox' => '1', - 'multi_selection' => '1', - 'single_selection' => 'SW10003', + TypeMappingInterface::TYPE_STRING => 'test123', + TypeMappingInterface::TYPE_INTEGER => 123, + TypeMappingInterface::TYPE_FLOAT => 123, + TypeMappingInterface::TYPE_BOOLEAN => 1, + TypeMappingInterface::TYPE_DATE => '2010-01-01', + TypeMappingInterface::TYPE_DATETIME => '2010-01-01 10:00:00', + TypeMappingInterface::TYPE_TEXT => 'test123', + TypeMappingInterface::TYPE_HTML => 'test123', + TypeMappingInterface::TYPE_COMBOBOX => '1', + TypeMappingInterface::TYPE_MULTI_SELECTION => '1', + TypeMappingInterface::TYPE_SINGLE_SELECTION => 'SW10003', ]; $this->iterateTypeArray($types); @@ -52,17 +56,17 @@ public function testDefaultValues(): void public function testNullDefaultValues(): void { $types = [ - 'string' => null, - 'integer' => null, - 'float' => null, - 'boolean' => null, - 'date' => null, - 'datetime' => null, - 'text' => null, - 'html' => null, - 'combobox' => null, - 'multi_selection' => null, - 'single_selection' => null, + TypeMappingInterface::TYPE_STRING => null, + TypeMappingInterface::TYPE_INTEGER => null, + TypeMappingInterface::TYPE_FLOAT => null, + TypeMappingInterface::TYPE_BOOLEAN => null, + TypeMappingInterface::TYPE_DATE => null, + TypeMappingInterface::TYPE_DATETIME => null, + TypeMappingInterface::TYPE_TEXT => null, + TypeMappingInterface::TYPE_HTML => null, + TypeMappingInterface::TYPE_COMBOBOX => null, + TypeMappingInterface::TYPE_MULTI_SELECTION => null, + TypeMappingInterface::TYPE_SINGLE_SELECTION => null, ]; $this->iterateTypeArray($types); @@ -71,17 +75,17 @@ public function testNullDefaultValues(): void public function testNullStringDefaultValues(): void { $types = [ - 'string' => 'NULL', - 'integer' => 'NULL', - 'float' => 'NULL', - 'boolean' => 'NULL', - 'date' => 'NULL', - 'datetime' => 'NULL', - 'text' => 'NULL', - 'html' => 'NULL', - 'combobox' => 'NULL', - 'multi_selection' => 'NULL', - 'single_selection' => 'NULL', + TypeMappingInterface::TYPE_STRING => 'NULL', + TypeMappingInterface::TYPE_INTEGER => 'NULL', + TypeMappingInterface::TYPE_FLOAT => 'NULL', + TypeMappingInterface::TYPE_BOOLEAN => 'NULL', + TypeMappingInterface::TYPE_DATE => 'NULL', + TypeMappingInterface::TYPE_DATETIME => 'NULL', + TypeMappingInterface::TYPE_TEXT => 'NULL', + TypeMappingInterface::TYPE_HTML => 'NULL', + TypeMappingInterface::TYPE_COMBOBOX => 'NULL', + TypeMappingInterface::TYPE_MULTI_SELECTION => 'NULL', + TypeMappingInterface::TYPE_SINGLE_SELECTION => 'NULL', ]; $this->iterateTypeArray($types); @@ -92,16 +96,16 @@ public function testNullStringDefaultValues(): void */ public function testDefaultValuesBoolean(): void { - $this->iterateTypeArray(['boolean' => 1]); - $this->iterateTypeArray(['boolean' => 0]); - $this->iterateTypeArray(['boolean' => true]); - $this->iterateTypeArray(['boolean' => false]); - $this->iterateTypeArray(['boolean' => null]); - $this->iterateTypeArray(['boolean' => '1']); - $this->iterateTypeArray(['boolean' => '0']); - $this->iterateTypeArray(['boolean' => 'true']); - $this->iterateTypeArray(['boolean' => 'false']); - $this->iterateTypeArray(['boolean' => 'null']); + $this->iterateTypeArray([TypeMappingInterface::TYPE_BOOLEAN => 1]); + $this->iterateTypeArray([TypeMappingInterface::TYPE_BOOLEAN => 0]); + $this->iterateTypeArray([TypeMappingInterface::TYPE_BOOLEAN => true]); + $this->iterateTypeArray([TypeMappingInterface::TYPE_BOOLEAN => false]); + $this->iterateTypeArray([TypeMappingInterface::TYPE_BOOLEAN => null]); + $this->iterateTypeArray([TypeMappingInterface::TYPE_BOOLEAN => '1']); + $this->iterateTypeArray([TypeMappingInterface::TYPE_BOOLEAN => '0']); + $this->iterateTypeArray([TypeMappingInterface::TYPE_BOOLEAN => 'true']); + $this->iterateTypeArray([TypeMappingInterface::TYPE_BOOLEAN => 'false']); + $this->iterateTypeArray([TypeMappingInterface::TYPE_BOOLEAN => 'null']); } public function testUpdateConfiguration(): void @@ -109,22 +113,21 @@ public function testUpdateConfiguration(): void $service = Shopware()->Container()->get('shopware_attribute.crud_service'); $tableMapping = Shopware()->Container()->get('shopware_attribute.table_mapping'); $table = 's_articles_attributes'; - $columnName = 'attr_' . uniqid((string) mt_rand(), false); + $columnName = 'attr_' . uniqid((string) mt_rand()); - $service->update($table, $columnName, 'bool'); + $service->update($table, $columnName, TypeMappingInterface::TYPE_BOOLEAN); static::assertTrue($tableMapping->isTableColumn($table, $columnName)); - $service->update($table, $columnName, 'date'); + $service->update($table, $columnName, TypeMappingInterface::TYPE_DATE); static::assertTrue($tableMapping->isTableColumn($table, $columnName)); - /** @var ConfigurationStruct|null $column */ $column = $service->get($table, $columnName); static::assertInstanceOf(ConfigurationStruct::class, $column); - static::assertEquals('date', $column->getColumnType()); + static::assertEquals(TypeMappingInterface::TYPE_DATE, $column->getColumnType()); } public function testReinsertColumnConfigurationShouldFail(): void { - $this->expectException(\Doctrine\DBAL\DBALException::class); + $this->expectException(DBALException::class); $connection = Shopware()->Container()->get('dbal_connection'); $attributeData = [ 'table_name' => 's_articles_attributes', @@ -136,14 +139,14 @@ public function testReinsertColumnConfigurationShouldFail(): void } /** - * @param array $types + * @param array $types * * @throws Exception */ - private function iterateTypeArray($types): void + private function iterateTypeArray(array $types): void { - $service = Shopware()->Container()->get(\Shopware\Bundle\AttributeBundle\Service\CrudService::class); - $tableMapping = Shopware()->Container()->get(\Shopware\Bundle\AttributeBundle\Service\TableMapping::class); + $service = Shopware()->Container()->get(CrudService::class); + $tableMapping = Shopware()->Container()->get(TableMapping::class); $table = 's_articles_attributes'; foreach ($types as $type => $default) { diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/TestCase.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/TestCase.php index 415af0de3a6..c983d19f04e 100644 --- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/TestCase.php +++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/TestCase.php @@ -114,7 +114,7 @@ protected function createCustomer(array $customer) $customer['addresses'] = [['country_id' => 2]]; } - $customerId = $this->insert('s_user', array_merge([ + $customerData = array_merge([ 'firstname' => 'example', 'lastname' => 'example', 'customergroup' => 'EK', @@ -123,7 +123,9 @@ protected function createCustomer(array $customer) 'paymentpreset' => 1, 'subshopID' => $customer['subshopID'] ?? 1000, 'failedlogins' => 0, - ], $customer)); + ], $customer); + unset($customerData['addresses'], $customerData['orders'], $customerData['newsletter']); + $customerId = $this->insert('s_user', $customerData); if (\array_key_exists('addresses', $customer)) { foreach ($customer['addresses'] as $address) { diff --git a/tests/Functional/Bundle/SearchBundle/Condition/ImmediateDeliveryConditionTest.php b/tests/Functional/Bundle/SearchBundle/Condition/ImmediateDeliveryConditionTest.php index 6027058152f..5a9ac4712cf 100644 --- a/tests/Functional/Bundle/SearchBundle/Condition/ImmediateDeliveryConditionTest.php +++ b/tests/Functional/Bundle/SearchBundle/Condition/ImmediateDeliveryConditionTest.php @@ -43,10 +43,10 @@ public function testNoStock(): void $this->search( [ - 'first' => ['inStock' => 0, 'minPurchase' => 1], - 'second' => ['inStock' => 0, 'minPurchase' => 1], - 'third' => ['inStock' => 2, 'minPurchase' => 1], - 'fourth' => ['inStock' => 1, 'minPurchase' => 1], + 'first' => ['inStock' => 0, 'minPurchase' => 1, 'createVariants' => false], + 'second' => ['inStock' => 0, 'minPurchase' => 1, 'createVariants' => false], + 'third' => ['inStock' => 2, 'minPurchase' => 1, 'createVariants' => false], + 'fourth' => ['inStock' => 1, 'minPurchase' => 1, 'createVariants' => false], ], ['third', 'fourth'], null, @@ -60,10 +60,10 @@ public function testMinPurchaseEquals(): void $this->search( [ - 'first' => ['inStock' => 0, 'minPurchase' => 1], - 'second' => ['inStock' => 0, 'minPurchase' => 1], - 'third' => ['inStock' => 3, 'minPurchase' => 3], - 'fourth' => ['inStock' => 20, 'minPurchase' => 20], + 'first' => ['inStock' => 0, 'minPurchase' => 1, 'createVariants' => false], + 'second' => ['inStock' => 0, 'minPurchase' => 1, 'createVariants' => false], + 'third' => ['inStock' => 3, 'minPurchase' => 3, 'createVariants' => false], + 'fourth' => ['inStock' => 20, 'minPurchase' => 20, 'createVariants' => false], ], ['third', 'fourth'], null, @@ -77,11 +77,11 @@ public function testSubVariantWithStock(): void $this->search( [ - 'first' => ['inStock' => 0, 'minPurchase' => 1], - 'second' => ['inStock' => 0, 'minPurchase' => 1], - 'third' => ['inStock' => 1, 'minPurchase' => 1], + 'first' => ['inStock' => 0, 'minPurchase' => 1, 'createVariants' => false], + 'second' => ['inStock' => 0, 'minPurchase' => 1, 'createVariants' => false], + 'third' => ['inStock' => 1, 'minPurchase' => 1, 'createVariants' => false], 'fourth' => ['inStock' => 1, 'minPurchase' => 1, 'createVariants' => true], - 'fifth' => ['inStock' => 2, 'minPurchase' => 1], + 'fifth' => ['inStock' => 2, 'minPurchase' => 1, 'createVariants' => false], ], ['third', 'fifth'], null, @@ -118,10 +118,10 @@ protected function createProduct( $additionally ): Article { if ($additionally['createVariants'] === true) { - $fourth = $this->getProduct('fourth', $context, $category); + $fourth = $this->getProduct($number, $context, $category); $configurator = $this->helper->getConfigurator( $context->getCurrentCustomerGroup(), - 'fourth' + $number ); $fourth = array_merge($fourth, $configurator); diff --git a/tests/Functional/Bundle/SearchBundle/Condition/PriceConditionTest.php b/tests/Functional/Bundle/SearchBundle/Condition/PriceConditionTest.php index 89b261070b2..e6fda6ffdb4 100644 --- a/tests/Functional/Bundle/SearchBundle/Condition/PriceConditionTest.php +++ b/tests/Functional/Bundle/SearchBundle/Condition/PriceConditionTest.php @@ -225,7 +225,7 @@ protected function getProduct( ]; } - if ($prices['priceGroup']) { + if (isset($prices['priceGroup'])) { $product['priceGroupActive'] = true; $product['priceGroupId'] = $prices['priceGroup']->getId(); } diff --git a/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithPriceGroupTest.php b/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithPriceGroupTest.php index 6bd426da5c2..94ca2afa23e 100644 --- a/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithPriceGroupTest.php +++ b/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithPriceGroupTest.php @@ -266,7 +266,7 @@ protected function getProduct( ++$i; } - if ($data['priceGroup']) { + if (isset($data['priceGroup'])) { $product['priceGroupActive'] = true; $product['priceGroupId'] = $data['priceGroup']->getId(); } diff --git a/tests/Functional/Bundle/StoreFrontBundle/ManufacturerTest.php b/tests/Functional/Bundle/StoreFrontBundle/ManufacturerTest.php index ac1e0a2d9f2..5a12f9c6739 100644 --- a/tests/Functional/Bundle/StoreFrontBundle/ManufacturerTest.php +++ b/tests/Functional/Bundle/StoreFrontBundle/ManufacturerTest.php @@ -37,7 +37,7 @@ public function testManufacturerList(): void $manufacturer = $this->helper->createManufacturer([ 'name' => 'testManufacturerList-1', - 'image' => 'Manufacturer-Cover-1', + 'image' => 'media/image/Manufacturer-Cover-1', 'link' => 'www.google.de?manufacturer=1', 'metaTitle' => 'Meta title', 'description' => 'Lorem ipsum manufacturer', @@ -47,7 +47,7 @@ public function testManufacturerList(): void $manufacturer = $this->helper->createManufacturer([ 'name' => 'testManufacturerList-2', - 'image' => 'Manufacturer-Cover-2.jpg', + 'image' => 'media/image/Manufacturer-Cover-2.jpg', 'link' => 'www.google.de?manufacturer=2', 'metaTitle' => 'Meta title', 'description' => 'Lorem ipsum manufacturer', @@ -57,7 +57,7 @@ public function testManufacturerList(): void $manufacturer = $this->helper->createManufacturer([ 'name' => 'testManufacturerList-2', - 'image' => 'Manufacturer-Cover-2.jpg', + 'image' => 'media/image/Manufacturer-Cover-2.jpg', 'link' => 'www.google.de?manufacturer=2', 'metaTitle' => 'Meta title', 'description' => 'Lorem ipsum manufacturer', diff --git a/tests/Functional/Bundle/StoreFrontBundle/VoteTest.php b/tests/Functional/Bundle/StoreFrontBundle/VoteTest.php index 92b20c16eac..9354bf5585a 100644 --- a/tests/Functional/Bundle/StoreFrontBundle/VoteTest.php +++ b/tests/Functional/Bundle/StoreFrontBundle/VoteTest.php @@ -192,7 +192,7 @@ private function assertShopVotes(string $number, array $points = [], array $expe $config = Shopware()->Container()->get(Shopware_Components_Config::class); $originals = []; foreach ($configs as $key => $value) { - $originals = $config->get($key); + $originals[$key] = $config->get($key); $config->offsetSet($key, $value); } diff --git a/tests/Functional/Components/Api/CacheTest.php b/tests/Functional/Components/Api/CacheTest.php index 0f64a735184..e3d311cb866 100644 --- a/tests/Functional/Components/Api/CacheTest.php +++ b/tests/Functional/Components/Api/CacheTest.php @@ -89,7 +89,7 @@ public function testClearTemplateCacheShouldBeSuccessFull(): void $this->getResource()->delete('template'); $info = $this->getResource()->getOne('template'); - static::assertEquals(0, $info['files']); + static::assertFalse(isset($info['files'])); } /** @@ -99,10 +99,10 @@ public function testClearHttpCacheShouldBeSuccessFull(): void { $this->getResource()->delete('http'); $info = $this->getResource()->getOne('http'); - static::assertEquals(0, $info['files']); + static::assertFalse(isset($info['files'])); $this->getResource()->delete('template'); $info = $this->getResource()->getOne('template'); - static::assertEquals(0, $info['files']); + static::assertFalse(isset($info['files'])); } } diff --git a/tests/Functional/Components/Api/EmotionPresetTest.php b/tests/Functional/Components/Api/EmotionPresetTest.php index 029d41f0d02..9bef5d4499f 100644 --- a/tests/Functional/Components/Api/EmotionPresetTest.php +++ b/tests/Functional/Components/Api/EmotionPresetTest.php @@ -35,32 +35,30 @@ use Shopware\Components\Api\Exception\ValidationException; use Shopware\Components\Api\Resource\EmotionPreset; use Shopware\Models\Emotion\Preset; +use Shopware\Tests\Functional\Traits\ContainerTrait; +use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour; /** * @group EmotionPreset */ class EmotionPresetTest extends TestCase { + use ContainerTrait; + use DatabaseTransactionBehaviour; + private Connection $connection; private EmotionPreset $resource; protected function setUp(): void { - $this->connection = Shopware()->Container()->get(Connection::class); - $this->connection->beginTransaction(); + $this->connection = $this->getContainer()->get(Connection::class); $this->connection->executeQuery('DELETE FROM s_emotion_presets'); $this->connection->executeQuery('DELETE FROM s_core_plugins'); - $this->resource = Shopware()->Container()->get(EmotionPreset::class); + $this->resource = $this->getContainer()->get(EmotionPreset::class); parent::setUp(); } - protected function tearDown(): void - { - $this->connection->rollBack(); - parent::tearDown(); - } - public function testCreate(): void { $this->resource->create(['name' => 'test', 'presetData' => '[]']); diff --git a/tests/Functional/Components/Captcha/CaptchaValidatorTest.php b/tests/Functional/Components/Captcha/CaptchaValidatorTest.php index 5e8cc37325f..b13356eed23 100644 --- a/tests/Functional/Components/Captcha/CaptchaValidatorTest.php +++ b/tests/Functional/Components/Captcha/CaptchaValidatorTest.php @@ -31,10 +31,13 @@ use PHPUnit\Framework\TestCase; use Shopware\Components\Captcha\CaptchaValidator; use Shopware\Components\Captcha\DefaultCaptcha; +use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour; use Shopware_Components_Config; class CaptchaValidatorTest extends TestCase { + use DatabaseTransactionBehaviour; + private DefaultCaptcha $captcha; public function setUp(): void diff --git a/tests/Functional/Components/Cart/CalculationOnLogoutTest.php b/tests/Functional/Components/Cart/CalculationOnLogoutTest.php index 385bb9edec6..275d1eedd02 100644 --- a/tests/Functional/Components/Cart/CalculationOnLogoutTest.php +++ b/tests/Functional/Components/Cart/CalculationOnLogoutTest.php @@ -27,21 +27,15 @@ namespace Shopware\Tests\Functional\Components\Cart; use Enlight_Controller_Request_RequestHttp; -use Shopware\Tests\Functional\Components\CheckoutTest; +use Shopware\Tests\Functional\Components\CheckoutTestCase; use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour; -class CalculationOnLogoutTest extends CheckoutTest +class CalculationOnLogoutTest extends CheckoutTestCase { use DatabaseTransactionBehaviour; public bool $clearBasketOnReset = false; - public function setUp(): void - { - parent::setUp(); - Shopware()->Session()->offsetSet('sessionId', null); - } - public function testLogout(): void { Shopware()->Front()->setRequest(new Enlight_Controller_Request_RequestHttp()); @@ -54,7 +48,7 @@ public function testLogout(): void $currentAmount = Shopware()->Session()->get('sBasketAmount'); - $this->loginFrontendCustomer('H'); + $this->loginCustomerOfGroup('H'); Shopware()->Modules()->Admin()->logout(); diff --git a/tests/Functional/Components/Cart/CartDatabaseViewTest.php b/tests/Functional/Components/Cart/CartDatabaseViewTest.php index 9f71d8cd12b..0c8766b4b1d 100644 --- a/tests/Functional/Components/Cart/CartDatabaseViewTest.php +++ b/tests/Functional/Components/Cart/CartDatabaseViewTest.php @@ -27,11 +27,11 @@ namespace Shopware\Tests\Functional\Components\Cart; use Doctrine\DBAL\Connection; -use Shopware\Tests\Functional\Components\CheckoutTest; +use Shopware\Tests\Functional\Components\CheckoutTestCase; use Shopware\Tests\Functional\Traits\ContainerTrait; use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour; -class CartDatabaseViewTest extends CheckoutTest +class CartDatabaseViewTest extends CheckoutTestCase { use ContainerTrait; use DatabaseTransactionBehaviour; @@ -42,7 +42,7 @@ public function testEnsureCartInViewHasSameIDsAsTheDatabase(): void { $productNumber = $this->createProduct(5, 19.00); - $this->loginFrontendCustomer(); + $this->loginCustomerOfGroup(); $this->addProduct($productNumber); $this->visitConfirm(); diff --git a/tests/Functional/Components/Cart/CartMigrationTest.php b/tests/Functional/Components/Cart/CartMigrationTest.php index f635bc2af3e..96456a37b37 100644 --- a/tests/Functional/Components/Cart/CartMigrationTest.php +++ b/tests/Functional/Components/Cart/CartMigrationTest.php @@ -24,16 +24,19 @@ namespace Shopware\Tests\Functional\Components\Cart; -use Enlight_Controller_Request_RequestHttp; +use Doctrine\DBAL\Connection; use Enlight_Controller_Request_RequestTestCase; use PHPUnit\Framework\TestCase; +use Shopware\Components\Model\ModelManager; use Shopware\Components\ShopRegistrationServiceInterface; use Shopware\Models\Shop\Shop; +use Shopware\Tests\Functional\Traits\ContainerTrait; use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour; use Shopware\Tests\Functional\Traits\FixtureBehaviour; class CartMigrationTest extends TestCase { + use ContainerTrait; use DatabaseTransactionBehaviour; use FixtureBehaviour; @@ -41,46 +44,51 @@ public function testMigrateOnLoginWithEmptyCart(): void { self::executeFixture(__DIR__ . '/fixture/cart_migration_1.sql'); - Shopware()->Front()->setRequest(new Enlight_Controller_Request_RequestTestCase()); - Shopware()->Modules()->Basket()->sRefreshBasket(); - static::assertEquals(0, Shopware()->Session()->get('sBasketAmount')); + $this->setFrontRequest(); + $this->getContainer()->get('modules')->Basket()->sRefreshBasket(); + static::assertEquals(0, $this->getContainer()->get('session')->get('sBasketAmount')); - $this->loginFrontendUser(); + $this->loginCustomer(); - static::assertGreaterThan(0, Shopware()->Session()->get('sBasketAmount')); + static::assertGreaterThan(0, $this->getContainer()->get('session')->get('sBasketAmount')); } public function testMigrateOnLoginWithFilledCart(): void { self::executeFixture(__DIR__ . '/fixture/cart_migration_1.sql'); - Shopware()->Modules()->Basket()->sAddArticle('SW10001'); - Shopware()->Modules()->Basket()->sRefreshBasket(); + $this->setFrontRequest(); + $this->getContainer()->get('modules')->Basket()->sAddArticle('SW10001'); + $this->getContainer()->get('modules')->Basket()->sRefreshBasket(); - $currentBasketAmount = Shopware()->Session()->get('sBasketAmount'); + $currentBasketAmount = $this->getContainer()->get('session')->get('sBasketAmount'); - $this->loginFrontendUser(); + $this->loginCustomer(); - static::assertEquals($currentBasketAmount, Shopware()->Session()->get('sBasketAmount')); + static::assertEquals($currentBasketAmount, $this->getContainer()->get('session')->get('sBasketAmount')); } - private function loginFrontendUser(): void + private function setFrontRequest(): void { - $user = Shopware()->Db()->fetchRow( - 'SELECT `id`, `email`, `password`, `subshopID`, `language` FROM s_user WHERE `id` = 1' + $this->getContainer()->get('front')->setRequest(new Enlight_Controller_Request_RequestTestCase()); + } + + private function loginCustomer(): void + { + $customer = $this->getContainer()->get(Connection::class)->fetchAssociative( + 'SELECT `email`, `password`, `language` FROM s_user WHERE `id` = 1' ); + static::assertIsArray($customer); - $shop = Shopware()->Models()->getRepository(Shop::class)->getActiveById($user['language']); - static::assertNotNull($shop); - Shopware()->Container()->get(ShopRegistrationServiceInterface::class)->registerResources($shop); + $shop = $this->getContainer()->get(ModelManager::class)->getRepository(Shop::class)->getActiveById($customer['language']); + static::assertInstanceOf(Shop::class, $shop); + $this->getContainer()->get(ShopRegistrationServiceInterface::class)->registerResources($shop); - $request = new Enlight_Controller_Request_RequestHttp(); - $request->setPost([ - 'email' => $user['email'], - 'passwordMD5' => $user['password'], + $this->getContainer()->get('front')->ensureRequest()->setPost([ + 'email' => $customer['email'], + 'passwordMD5' => $customer['password'], ]); - Shopware()->Front()->setRequest($request); - Shopware()->Session()->set('Admin', true); - Shopware()->Modules()->Admin()->sLogin(true); + $this->getContainer()->get('session')->set('Admin', true); + static::assertIsArray($this->getContainer()->get('modules')->Admin()->sLogin(true)); } } diff --git a/tests/Functional/Components/Cart/CartRaceConditionTest.php b/tests/Functional/Components/Cart/CartRaceConditionTest.php index 25e0b16cbec..799815764a1 100644 --- a/tests/Functional/Components/Cart/CartRaceConditionTest.php +++ b/tests/Functional/Components/Cart/CartRaceConditionTest.php @@ -27,10 +27,10 @@ namespace Shopware\Tests\Functional\Components\Cart; use Doctrine\DBAL\Connection; -use Shopware\Tests\Functional\Components\CheckoutTest; +use Shopware\Tests\Functional\Components\CheckoutTestCase; use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour; -class CartRaceConditionTest extends CheckoutTest +class CartRaceConditionTest extends CheckoutTestCase { use DatabaseTransactionBehaviour; @@ -40,7 +40,7 @@ public function testPriceChangesInConfirmWithoutPriceModifications(): void { $productNumber = $this->createProduct(5, 19.00); - $this->loginFrontendCustomer(); + $this->loginCustomerOfGroup(); $this->addProduct($productNumber); $this->visitConfirm(); @@ -56,7 +56,7 @@ public function testPriceChangesInConfirmWithPriceModifications(): void { $productNumber1 = $this->createProduct(5, 19.00); - $this->loginFrontendCustomer(); + $this->loginCustomerOfGroup(); $this->addProduct($productNumber1); $this->visitConfirm(); diff --git a/tests/Functional/Components/Cart/FloatTaxCalculationTest.php b/tests/Functional/Components/Cart/FloatTaxCalculationTest.php index 64af47c3435..a00b2eacb40 100644 --- a/tests/Functional/Components/Cart/FloatTaxCalculationTest.php +++ b/tests/Functional/Components/Cart/FloatTaxCalculationTest.php @@ -27,9 +27,9 @@ namespace Shopware\Tests\Functional\Components\Cart; use Doctrine\DBAL\Connection; -use Shopware\Tests\Functional\Components\CheckoutTest; +use Shopware\Tests\Functional\Components\CheckoutTestCase; -class FloatTaxCalculationTest extends CheckoutTest +class FloatTaxCalculationTest extends CheckoutTestCase { private Connection $connection; diff --git a/tests/Functional/Components/Cart/PaymentTokenServiceTest.php b/tests/Functional/Components/Cart/PaymentTokenServiceTest.php index 582269fd120..83d4592c12d 100644 --- a/tests/Functional/Components/Cart/PaymentTokenServiceTest.php +++ b/tests/Functional/Components/Cart/PaymentTokenServiceTest.php @@ -119,7 +119,6 @@ public function paymentTokenProviders(): array */ public function testPaymentTokenPath(string $virtualUrl, string $path): void { - session_destroy(); Shopware()->Container()->reset('session'); $currentUrl = Shopware()->Shop()->getBaseUrl(); diff --git a/tests/Functional/Components/Cart/ProportionalCartCalculationCustomerGroupTest.php b/tests/Functional/Components/Cart/ProportionalCartCalculationCustomerGroupTest.php index 6a71c386302..7cfa988d977 100644 --- a/tests/Functional/Components/Cart/ProportionalCartCalculationCustomerGroupTest.php +++ b/tests/Functional/Components/Cart/ProportionalCartCalculationCustomerGroupTest.php @@ -27,12 +27,12 @@ namespace Shopware\Tests\Functional\Components\Cart; use Doctrine\DBAL\Connection; -use Shopware\Tests\Functional\Components\CheckoutTest; +use Shopware\Tests\Functional\Components\CheckoutTestCase; /** * @group Basket */ -class ProportionalCartCalculationCustomerGroupTest extends CheckoutTest +class ProportionalCartCalculationCustomerGroupTest extends CheckoutTestCase { public function setUp(): void { diff --git a/tests/Functional/Components/Cart/ProportionalCartCalculationDispatchTest.php b/tests/Functional/Components/Cart/ProportionalCartCalculationDispatchTest.php index 22056d53a32..90d2890c960 100644 --- a/tests/Functional/Components/Cart/ProportionalCartCalculationDispatchTest.php +++ b/tests/Functional/Components/Cart/ProportionalCartCalculationDispatchTest.php @@ -27,12 +27,12 @@ namespace Shopware\Tests\Functional\Components\Cart; use Doctrine\DBAL\Connection; -use Shopware\Tests\Functional\Components\CheckoutTest; +use Shopware\Tests\Functional\Components\CheckoutTestCase; /** * @group Basket */ -class ProportionalCartCalculationDispatchTest extends CheckoutTest +class ProportionalCartCalculationDispatchTest extends CheckoutTestCase { public function setUp(): void { diff --git a/tests/Functional/Components/Cart/ProportionalCartCalculationSurchargeTest.php b/tests/Functional/Components/Cart/ProportionalCartCalculationSurchargeTest.php index d5fa36e91b1..96b8e093314 100644 --- a/tests/Functional/Components/Cart/ProportionalCartCalculationSurchargeTest.php +++ b/tests/Functional/Components/Cart/ProportionalCartCalculationSurchargeTest.php @@ -27,12 +27,12 @@ namespace Shopware\Tests\Functional\Components\Cart; use Doctrine\DBAL\Connection; -use Shopware\Tests\Functional\Components\CheckoutTest; +use Shopware\Tests\Functional\Components\CheckoutTestCase; /** * @group Basket */ -class ProportionalCartCalculationSurchargeTest extends CheckoutTest +class ProportionalCartCalculationSurchargeTest extends CheckoutTestCase { /** * A product with 7% tax diff --git a/tests/Functional/Components/Cart/ProportionalCartCalculationVoucherTest.php b/tests/Functional/Components/Cart/ProportionalCartCalculationVoucherTest.php index fb9626c663f..6797d3314b9 100644 --- a/tests/Functional/Components/Cart/ProportionalCartCalculationVoucherTest.php +++ b/tests/Functional/Components/Cart/ProportionalCartCalculationVoucherTest.php @@ -27,12 +27,12 @@ namespace Shopware\Tests\Functional\Components\Cart; use Doctrine\DBAL\Connection; -use Shopware\Tests\Functional\Components\CheckoutTest; +use Shopware\Tests\Functional\Components\CheckoutTestCase; /** * @group Basket */ -class ProportionalCartCalculationVoucherTest extends CheckoutTest +class ProportionalCartCalculationVoucherTest extends CheckoutTestCase { public function setUp(): void { diff --git a/tests/Functional/Components/Cart/fixture/cart_migration_1.sql b/tests/Functional/Components/Cart/fixture/cart_migration_1.sql index 67c25e2ed04..46814df340c 100644 --- a/tests/Functional/Components/Cart/fixture/cart_migration_1.sql +++ b/tests/Functional/Components/Cart/fixture/cart_migration_1.sql @@ -1,3 +1,3 @@ -INSERT INTO `s_order_basket` (`sessionID`, `userID`, `articlename`, `articleID`, `ordernumber`, `shippingfree`, `quantity`, `price`, `netprice`, `tax_rate`, `datum`, `modus`, `esdarticle`, `partnerID`, `lastviewport`, `useragent`, `config`, `currencyFactor`) VALUES -('52f0cf0e9f3737fd42f8371ec79fbd5a', 1, 'Münsterländer Aperitif 16%', 3, 'SW10003', 0, 1, 14.95, 12.563025210084, 19, '2019-04-05 09:09:54', 0, 0, '', 'account', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.86 Safari/537.36', '', 1), -('52f0cf0e9f3737fd42f8371ec79fbd5a', 1, 'Warenkorbrabatt', 0, 'SHIPPINGDISCOUNT', 0, 1, -2, -1.68, 19, '2019-04-05 09:10:30', 4, 0, '', '', '', '', 1); +INSERT INTO `s_order_basket` (`userID`, `articlename`, `articleID`, `ordernumber`, `shippingfree`, `quantity`, `price`, `netprice`, `tax_rate`, `datum`, `modus`, `esdarticle`, `partnerID`, `lastviewport`, `useragent`, `config`, `currencyFactor`) VALUES +(1, 'Münsterländer Aperitif 16%', 3, 'SW10003', 0, 1, 14.95, 12.563025210084, 19, '2019-04-05 09:09:54', 0, 0, '', 'account', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.86 Safari/537.36', '', 1), +(1, 'Warenkorbrabatt', 0, 'SHIPPINGDISCOUNT', 0, 1, -2, -1.68, 19, '2019-04-05 09:10:30', 4, 0, '', '', '', '', 1); diff --git a/tests/Functional/Components/CheckoutTest.php b/tests/Functional/Components/CheckoutTestCase.php similarity index 95% rename from tests/Functional/Components/CheckoutTest.php rename to tests/Functional/Components/CheckoutTestCase.php index 15007fc0a21..ad7581ceb83 100644 --- a/tests/Functional/Components/CheckoutTest.php +++ b/tests/Functional/Components/CheckoutTestCase.php @@ -27,14 +27,14 @@ namespace Shopware\Tests\Functional\Components; use Doctrine\DBAL\Connection; -use Enlight_Components_Test_Controller_TestCase; +use Enlight_Components_Test_Controller_TestCase as ControllerTestCase; use Shopware\Components\Random; use Shopware\Tests\Functional\Bundle\StoreFrontBundle\Helper; use Shopware\Tests\Functional\Traits\ContainerTrait; use Shopware\Tests\Functional\Traits\CustomerLoginTrait; use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour; -abstract class CheckoutTest extends Enlight_Components_Test_Controller_TestCase +abstract class CheckoutTestCase extends ControllerTestCase { use ContainerTrait; use CustomerLoginTrait; @@ -115,7 +115,10 @@ protected function updateProductPrice(string $orderNumber, float $price, float $ ]); } - protected function createVoucher(float $value, int $taxId, bool $percental = true): string + /** + * @param 0|1 $percental + */ + protected function createVoucher(float $value, int $taxId, int $percental = 1): string { $code = Random::getAlphanumericString(12); $this->getContainer()->get(Connection::class) @@ -130,7 +133,7 @@ protected function createVoucher(float $value, int $taxId, bool $percental = tru 'modus' => 0, 'numorder' => 1000, 'percental' => $percental, - 'taxconfig' => $taxId, + 'taxconfig' => (string) $taxId, ]); return $code; @@ -199,7 +202,7 @@ protected function setVoucherTax(string $orderCode, string $taxConfig): void ]); } - protected function loginFrontendCustomer(string $group = 'EK'): void + protected function loginCustomerOfGroup(string $group = 'EK'): void { $customer = Shopware()->Db()->fetchRow( 'SELECT id, email, password, subshopID, language FROM s_user WHERE customergroup = ? LIMIT 1', diff --git a/tests/Functional/Components/DependencyInjection/Bridge/CacheTest.php b/tests/Functional/Components/DependencyInjection/Bridge/CacheTest.php index 26d7a87931d..58da6d9b9d5 100644 --- a/tests/Functional/Components/DependencyInjection/Bridge/CacheTest.php +++ b/tests/Functional/Components/DependencyInjection/Bridge/CacheTest.php @@ -37,140 +37,125 @@ class CacheTest extends TestCase private ShopwareReleaseStruct $release; - public function setUp(): void + private string $testDir; + + private string $cacheDirectory; + + private string $cacheFile; + + protected function setUp(): void { $this->release = new ShopwareReleaseStruct('5.5.0', '', '4711'); + $this->testDir = $this->createTestDir(); + $this->cacheDirectory = $this->testDir . '/shopware_test--0'; + $this->cacheFile = $this->cacheDirectory . '/shopware_test---bar'; + } + + protected function tearDown(): void + { + $this->deleteDirectory($this->testDir); } public function testWorldReadWriteExecutable(): void { - $testDir = sys_get_temp_dir() . '/umask-test'; $options = [ 'hashed_directory_perm' => 0777 & ~umask(), 'cache_file_perm' => 0666 & ~umask(), 'hashed_directory_level' => 1, - 'cache_dir' => $testDir, + 'cache_dir' => $this->testDir, 'file_name_prefix' => 'shopware_test', ]; - mkdir($testDir); - - $cache = (new Cache())->factory('file', [ - 'automatic_serialization' => true, - ], $options, $this->release); - $cache->save('foo', 'bar'); - - $cacheDirectory = $testDir . '/shopware_test--0'; - $cacheFile = $cacheDirectory . '/shopware_test---bar'; + $this->createCache($options); - $dirPermissions = fileperms($cacheDirectory) & 0777; - $filePermissions = fileperms($cacheFile) & 0777; - - static::assertFileExists($cacheDirectory); - static::assertFileExists($cacheFile); - - static::assertEquals($options['hashed_directory_perm'], $dirPermissions); - static::assertEquals($options['cache_file_perm'], $filePermissions); - - $this->deleteDirectory($testDir); + $this->assertCacheDirectory($options); } public function testUserReadWriteExecutable(): void { - $testDir = sys_get_temp_dir() . '/umask-test'; $options = [ 'hashed_directory_perm' => 0700 & ~umask(), 'cache_file_perm' => 0600 & ~umask(), 'hashed_directory_level' => 1, - 'cache_dir' => $testDir, + 'cache_dir' => $this->testDir, 'file_name_prefix' => 'shopware_test', ]; - mkdir($testDir); - - $cache = (new Cache())->factory('file', [ - 'automatic_serialization' => true, - ], $options, $this->release); - $cache->save('foo', 'bar'); - - $cacheDirectory = $testDir . '/shopware_test--0'; - $cacheFile = $cacheDirectory . '/shopware_test---bar'; - - $dirPermissions = fileperms($cacheDirectory) & 0777; - $filePermissions = fileperms($cacheFile) & 0777; - - static::assertFileExists($cacheDirectory); - static::assertFileExists($cacheFile); - - static::assertEquals($options['hashed_directory_perm'], $dirPermissions); - static::assertEquals($options['cache_file_perm'], $filePermissions); + $this->createCache($options); - $this->deleteDirectory($testDir); + $this->assertCacheDirectory($options); } public function testMixedReadWriteExecutable(): void { - $testDir = sys_get_temp_dir() . '/umask-test'; $options = [ 'hashed_directory_perm' => 0755 & ~umask(), 'cache_file_perm' => 0600 & ~umask(), 'hashed_directory_level' => 1, - 'cache_dir' => $testDir, + 'cache_dir' => $this->testDir, 'file_name_prefix' => 'shopware_test', ]; - mkdir($testDir); - - $cache = (new Cache())->factory('file', [ - 'automatic_serialization' => true, - ], $options, $this->release); - $cache->save('foo', 'bar'); - - $cacheDirectory = $testDir . '/shopware_test--0'; - $cacheFile = $cacheDirectory . '/shopware_test---bar'; + $this->createCache($options); - $dirPermissions = fileperms($cacheDirectory) & 0777; - $filePermissions = fileperms($cacheFile) & 0777; - - static::assertFileExists($cacheDirectory); - static::assertFileExists($cacheFile); - - static::assertEquals($options['hashed_directory_perm'], $dirPermissions); - static::assertEquals($options['cache_file_perm'], $filePermissions); - - $this->deleteDirectory($testDir); + $this->assertCacheDirectory($options); } public function testWorldReadWriteExecutableAsString(): void { - $testDir = sys_get_temp_dir() . '/umask-test'; $options = [ 'hashed_directory_perm' => '0777', 'cache_file_perm' => '0666', 'hashed_directory_level' => 1, - 'cache_dir' => $testDir, + 'cache_dir' => $this->testDir, 'file_name_prefix' => 'shopware_test', ]; - mkdir($testDir); + $this->createCache($options); + + $dirPermissions = fileperms($this->cacheDirectory) & 0777; + $filePermissions = fileperms($this->cacheFile) & 0777; + + static::assertFileExists($this->cacheDirectory); + static::assertFileExists($this->cacheFile); + static::assertSame(octdec($options['hashed_directory_perm']), $dirPermissions); + static::assertSame(octdec($options['cache_file_perm']), $filePermissions); + } + + private function createTestDir(): string + { + $testDir = sys_get_temp_dir() . '/umask-test'; + if (!is_dir($testDir)) { + mkdir($testDir); + } + + return $testDir; + } + + /** + * @param array $options + */ + private function createCache(array $options): void + { $cache = (new Cache())->factory('file', [ 'automatic_serialization' => true, ], $options, $this->release); $cache->save('foo', 'bar'); + } - $cacheDirectory = $testDir . '/shopware_test--0'; - $cacheFile = $cacheDirectory . '/shopware_test---bar'; - - $dirPermissions = fileperms($cacheDirectory) & 0777; - $filePermissions = fileperms($cacheFile) & 0777; - - static::assertFileExists($cacheDirectory); - static::assertFileExists($cacheFile); + /** + * @param array $options + */ + private function assertCacheDirectory(array $options): void + { + $dirPermissions = fileperms($this->cacheDirectory) & 0777; + $filePermissions = fileperms($this->cacheFile) & 0777; - static::assertEquals(octdec($options['hashed_directory_perm']), $dirPermissions); - static::assertEquals(octdec($options['cache_file_perm']), $filePermissions); + static::assertFileExists($this->cacheDirectory); + static::assertFileExists($this->cacheFile); - $this->deleteDirectory($testDir); + static::assertSame($options['hashed_directory_perm'], $dirPermissions); + static::assertSame($options['cache_file_perm'], $filePermissions); } } diff --git a/tests/Functional/Components/DependencyInjection/Compiler/LegacyApiResourcesPassTest.php b/tests/Functional/Components/DependencyInjection/Compiler/LegacyApiResourcesPassTest.php index d2d40601f18..c5fa1febbe4 100644 --- a/tests/Functional/Components/DependencyInjection/Compiler/LegacyApiResourcesPassTest.php +++ b/tests/Functional/Components/DependencyInjection/Compiler/LegacyApiResourcesPassTest.php @@ -45,7 +45,7 @@ public function testLegacyServiceGettingAssigned(): void $container ->register('shopware.api.mynewresource.hasalreadytag') ->setClass(Article::class) - ->setTags(['shopware.api.mynewresource.hasalreadytag']) + ->setTags(['shopware.api.mynewresource.hasalreadytag' => ['attr' => ['foo']]]) ->setPublic(true); $container->compile(); diff --git a/tests/Functional/Components/Emotion/Preset/EmotionToPresetDataTransformerTest.php b/tests/Functional/Components/Emotion/Preset/EmotionToPresetDataTransformerTest.php index b09a3b6fbef..9e40cba4705 100644 --- a/tests/Functional/Components/Emotion/Preset/EmotionToPresetDataTransformerTest.php +++ b/tests/Functional/Components/Emotion/Preset/EmotionToPresetDataTransformerTest.php @@ -32,12 +32,17 @@ use ReflectionMethod; use Shopware\Components\Emotion\Preset\EmotionToPresetDataTransformer; use Shopware\Components\Emotion\Preset\EmotionToPresetDataTransformerInterface; +use Shopware\Tests\Functional\Traits\ContainerTrait; +use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour; /** * @group EmotionPreset */ class EmotionToPresetDataTransformerTest extends TestCase { + use ContainerTrait; + use DatabaseTransactionBehaviour; + /** * @var EmotionToPresetDataTransformer */ @@ -50,18 +55,12 @@ class EmotionToPresetDataTransformerTest extends TestCase protected function setUp(): void { - $this->connection = Shopware()->Container()->get(Connection::class); - $this->connection->beginTransaction(); + $this->connection = $this->getContainer()->get(Connection::class); $this->connection->executeQuery('DELETE FROM s_emotion_presets'); $this->connection->executeQuery('DELETE FROM s_core_plugins'); - $this->transformer = Shopware()->Container()->get(EmotionToPresetDataTransformerInterface::class); - } - - protected function tearDown(): void - { - $this->connection->rollBack(); + $this->transformer = $this->getContainer()->get(EmotionToPresetDataTransformerInterface::class); } public function testShouldFailBecauseOfMissingEmotion(): void diff --git a/tests/Functional/Components/Emotion/Preset/PresetDataSynchronizerTest.php b/tests/Functional/Components/Emotion/Preset/PresetDataSynchronizerTest.php index 09764c1389e..de5af198c7a 100644 --- a/tests/Functional/Components/Emotion/Preset/PresetDataSynchronizerTest.php +++ b/tests/Functional/Components/Emotion/Preset/PresetDataSynchronizerTest.php @@ -32,48 +32,38 @@ use Shopware\Components\Emotion\Preset\Exception\PresetAssetImportException; use Shopware\Components\Emotion\Preset\PresetDataSynchronizer; use Shopware\Components\Emotion\Preset\PresetDataSynchronizerInterface; +use Shopware\Tests\Functional\Traits\ContainerTrait; +use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour; /** * @group EmotionPreset */ class PresetDataSynchronizerTest extends TestCase { - /** - * @var PresetDataSynchronizer - */ - private $synchronizerService; + use ContainerTrait; + use DatabaseTransactionBehaviour; - /** - * @var EmotionPreset - */ - private $presetResource; + private PresetDataSynchronizer $synchronizerService; - /** - * @var Connection - */ - private $connection; + private EmotionPreset $presetResource; + + private Connection $connection; private string $imageData; protected function setUp(): void { - $this->connection = Shopware()->Container()->get(Connection::class); - $this->connection->beginTransaction(); + $this->connection = $this->getContainer()->get(Connection::class); $this->connection->executeQuery('DELETE FROM s_emotion_presets'); $this->connection->executeQuery('DELETE FROM s_core_plugins'); - $this->synchronizerService = Shopware()->Container()->get(PresetDataSynchronizerInterface::class); - $this->presetResource = Shopware()->Container()->get(EmotionPreset::class); + $this->synchronizerService = $this->getContainer()->get(PresetDataSynchronizerInterface::class); + $this->presetResource = $this->getContainer()->get(EmotionPreset::class); $this->imageData = 'data:image/gif;base64,R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs='; } - protected function tearDown(): void - { - $this->connection->rollBack(); - } - public function testAssetImportWithPresetAlreadyImported(): void { $preset = $this->presetResource->create(['name' => 'test', 'presetData' => '[]', 'assetsImported' => true]); diff --git a/tests/Functional/Components/NumberRangeIncrementerTest.php b/tests/Functional/Components/NumberRangeIncrementerTest.php index 00081e28956..3306c20b97d 100644 --- a/tests/Functional/Components/NumberRangeIncrementerTest.php +++ b/tests/Functional/Components/NumberRangeIncrementerTest.php @@ -31,10 +31,12 @@ use RuntimeException; use Shopware\Components\NumberRangeIncrementer; use Shopware\Tests\Functional\Traits\ContainerTrait; +use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour; class NumberRangeIncrementerTest extends TestCase { use ContainerTrait; + use DatabaseTransactionBehaviour; private Connection $connection; diff --git a/tests/Functional/Components/Privacy/CookieRemoveSubscriberTest.php b/tests/Functional/Components/Privacy/CookieRemoveSubscriberTest.php index 7f93720de9a..33468aa6c9f 100644 --- a/tests/Functional/Components/Privacy/CookieRemoveSubscriberTest.php +++ b/tests/Functional/Components/Privacy/CookieRemoveSubscriberTest.php @@ -34,11 +34,8 @@ use Enlight_Template_Manager; use Enlight_View_Default; use PHPUnit\Framework\TestCase; -use Shopware\Bundle\CookieBundle\CookieCollection; use Shopware\Bundle\CookieBundle\Services\CookieHandler; use Shopware\Bundle\CookieBundle\Services\CookieRemoveHandler; -use Shopware\Bundle\CookieBundle\Structs\CookieGroupStruct; -use Shopware\Bundle\CookieBundle\Structs\CookieStruct; use Shopware\Components\Privacy\CookieRemoveSubscriber; use Shopware_Controllers_Frontend_Index; @@ -73,9 +70,8 @@ public function testPostDispatchDoesNothingAllowAllModeCookieSet(): void Shopware()->Config()->offsetSet('cookie_note_mode', CookieRemoveSubscriber::COOKIE_MODE_ALL); Shopware()->Config()->offsetSet('show_cookie_note', 1); - $_COOKIE['allowCookie'] = 1; - $controller = $this->getController(); + $controller->Request()->cookies->set('allowCookie', 1); // May not be removed, since further code may not be executed $controller->Response()->setCookie('notRemoved', 'foo'); @@ -179,19 +175,3 @@ private function getCookieRemoveSubscriber(bool $httpCacheEnabled = true): Cooki ); } } - -class PreserveCookieFromRemovingSubscriber -{ - public function addCookie(): CookieCollection - { - $cookieCollection = new CookieCollection(); - $cookieCollection->add(new CookieStruct( - 'keepMe', - '/^keepMe$/', - 'keepMe', - CookieGroupStruct::PERSONALIZATION - )); - - return $cookieCollection; - } -} diff --git a/tests/Functional/Shopware/Components/ProductStream/RepositoryTest.php b/tests/Functional/Components/ProductStream/RepositoryTest.php similarity index 96% rename from tests/Functional/Shopware/Components/ProductStream/RepositoryTest.php rename to tests/Functional/Components/ProductStream/RepositoryTest.php index 9c4c68084a8..37d9472c0e4 100644 --- a/tests/Functional/Shopware/Components/ProductStream/RepositoryTest.php +++ b/tests/Functional/Components/ProductStream/RepositoryTest.php @@ -24,7 +24,7 @@ * our trademarks remain entirely with us. */ -namespace Shopware\Tests\Functional\Shopware\Components\ProductStream; +namespace Shopware\Tests\Functional\Components\ProductStream; use Doctrine\DBAL\Connection; use PHPUnit\Framework\TestCase; diff --git a/tests/Functional/Components/Router/RouterTest.php b/tests/Functional/Components/Router/RouterTest.php index 20da66048e3..a259199a5d1 100644 --- a/tests/Functional/Components/Router/RouterTest.php +++ b/tests/Functional/Components/Router/RouterTest.php @@ -110,7 +110,8 @@ public function testArrayParams(array $params): void static::assertIsString($url); $match = $router->match($url); static::assertIsArray($match); - static::assertEquals(array_intersect($match, $params), $params); + unset($match['module'], $match['controller'], $match['action'], $match['index']); + static::assertEquals($params, $match); } public function getTestParamsProvider(): array diff --git a/tests/Functional/Components/Template/TemplateManagerTest.php b/tests/Functional/Components/Template/TemplateManagerTest.php index d168a03f48b..69b658b715f 100644 --- a/tests/Functional/Components/Template/TemplateManagerTest.php +++ b/tests/Functional/Components/Template/TemplateManagerTest.php @@ -89,14 +89,14 @@ public function testFetchInvalidExtends(): void public function testValidPermissionsAreSet(): void { $testDir = sys_get_temp_dir() . '/tpl-test'; + if (!is_dir($testDir)) { + mkdir($testDir); + } $backendOptions = [ 'hashed_directory_perm' => 0777 & ~umask(), 'cache_file_perm' => 0666 & ~umask(), ]; - /** @var Enlight_Template_Manager $template */ - $template = Enlight_Class::Instance('Enlight_Template_Manager', [null, $backendOptions]); - - mkdir($testDir); + $template = Enlight_Class::Instance(Enlight_Template_Manager::class, [null, $backendOptions]); $cacheDirectory = $testDir . '/compile-test'; $cacheFile = $cacheDirectory . '/8843d7f92416211de9ebb963ff4ce28125932878.string.php'; diff --git a/tests/Functional/Components/TemplateMailTest.php b/tests/Functional/Components/TemplateMailTest.php index 73379510e5d..e1898c4db9b 100644 --- a/tests/Functional/Components/TemplateMailTest.php +++ b/tests/Functional/Components/TemplateMailTest.php @@ -284,26 +284,14 @@ private function getSimpleMailMockObject(): Mail private function getSmartyMailMockObject(): Mail { - $templateMock = $this->createMock(Mail::class); - - $templateMock->method('getFromMail') - ->willReturn('{$sConfig.sMAIL}'); - - $templateMock->method('getFromName') - ->willReturn('{$sConfig.sSHOPNAME}'); - - $templateMock->method('getSubject') - ->willReturn('Ihr Bestellung bei {$sConfig.sSHOPNAME}'); - - $templateMock->method('getContent') - ->willReturn('Testbestellung bei {$sConfig.sSHOPNAME}'); - - $templateMock->method('getContentHtml') - ->willReturn('Testbestellung HTML bei {$sConfig.sSHOPNAME}'); - - $templateMock->method('isHtml') - ->willReturn(true); - - return $templateMock; + $mail = new Mail(); + $mail->setFromMail('{$sConfig.sMAIL}'); + $mail->setFromName('{$sConfig.sSHOPNAME}'); + $mail->setSubject('Ihr Bestellung bei {$sConfig.sSHOPNAME}'); + $mail->setContent('Testbestellung bei {$sConfig.sSHOPNAME}'); + $mail->setContentHtml('Testbestellung HTML bei {$sConfig.sSHOPNAME}'); + $mail->setIsHtml(); + + return $mail; } } diff --git a/tests/Functional/Controllers/Backend/AnalyticsTest.php b/tests/Functional/Controllers/Backend/AnalyticsTest.php index 29e49ae8bf4..649ac991c2a 100644 --- a/tests/Functional/Controllers/Backend/AnalyticsTest.php +++ b/tests/Functional/Controllers/Backend/AnalyticsTest.php @@ -1154,7 +1154,7 @@ private function getSearchTermFromReferrerUrl(string $url): string { preg_match_all( '#[?&]([qp]|query|highlight|encquery|url|field-keywords|as_q|sucheall|satitle|KW)=([^&\$]+)#', - utf8_encode($url) . '&', + mb_convert_encoding($url, 'UTF-8', 'ISO-8859-1') . '&', $matches ); if (empty($matches[0])) { diff --git a/tests/Functional/Controllers/Backend/ArticleTest.php b/tests/Functional/Controllers/Backend/ArticleTest.php index dea51c114f9..ef71724e56d 100644 --- a/tests/Functional/Controllers/Backend/ArticleTest.php +++ b/tests/Functional/Controllers/Backend/ArticleTest.php @@ -166,7 +166,6 @@ public function testSaveNetRegulationPrice(): void 'autoNumber' => '10002', 'mainPrices' => [ [ - 'id' => 0, 'from' => 1, 'to' => 'Beliebig', 'price' => 10, diff --git a/tests/Functional/Controllers/Backend/CustomerTest.php b/tests/Functional/Controllers/Backend/CustomerTest.php index fe16fc439f3..6fb9db0f864 100644 --- a/tests/Functional/Controllers/Backend/CustomerTest.php +++ b/tests/Functional/Controllers/Backend/CustomerTest.php @@ -1,4 +1,6 @@ manager ->getRepository(Payment::class) ->findOneBy(['name' => 'debit']); + static::assertInstanceOf(Payment::class, $debit); static::assertNotNull($customer->getChanged()); $params = [ @@ -102,7 +105,7 @@ public function testChangeCustomerPaymentMean(): void $this->dispatch('/backend/Customer/save'); $jsonBody = $this->View()->getAssign(); - static::assertTrue($this->View()->success); + static::assertTrue($this->View()->getAssign('success')); static::assertEquals($debit->getId(), $jsonBody['data']['paymentId']); $this->manager->refresh($customer); @@ -120,6 +123,7 @@ public function testAddCustomerPaymentDataWithDebit(): int $debit = $this->manager ->getRepository(Payment::class) ->findOneBy(['name' => 'debit']); + static::assertInstanceOf(Payment::class, $debit); $params = [ 'paymentId' => $debit->getId(), @@ -139,16 +143,16 @@ public function testAddCustomerPaymentDataWithDebit(): int $this->dispatch('/backend/Customer/save'); $jsonBody = $this->View()->getAssign(); - static::assertTrue($this->View()->success); + static::assertTrue($this->View()->getAssign('success')); static::assertEquals($debit->getId(), $jsonBody['data']['paymentId']); - $dummyData = $this->repository->find($this->View()->data['id']); - static::assertNotNull($dummyData); + $customer = $this->repository->find($this->View()->getAssign('data')['id']); + static::assertInstanceOf(Customer::class, $customer); - static::assertEquals($debit->getId(), $dummyData->getPaymentId()); - static::assertCount(1, $dummyData->getPaymentData()->toArray()); + static::assertEquals($debit->getId(), $customer->getPaymentId()); + static::assertCount(1, $customer->getPaymentData()->toArray()); - $paymentDataArray = $dummyData->getPaymentData()->toArray(); + $paymentDataArray = $customer->getPaymentData()->toArray(); $paymentData = array_shift($paymentDataArray); static::assertInstanceOf(PaymentData::class, $paymentData); static::assertEquals('Account Holder Name', $paymentData->getAccountHolder()); @@ -159,7 +163,7 @@ public function testAddCustomerPaymentDataWithDebit(): int static::assertEmpty($paymentData->getIban()); static::assertFalse($paymentData->getUseBillingData()); - return $dummyData->getId(); + return $customer->getId(); } /** @@ -170,6 +174,7 @@ public function testAddCustomerWithAddress(): void $debit = $this->manager ->getRepository(Payment::class) ->findOneBy(['name' => 'debit']); + static::assertInstanceOf(Payment::class, $debit); $params = [ 'paymentId' => $debit->getId(), @@ -180,7 +185,7 @@ public function testAddCustomerWithAddress(): void $this->dispatch('/backend/Customer/save'); $jsonBody = $this->View()->getAssign(); - static::assertTrue($this->View()->success); + static::assertTrue($this->View()->getAssign('success')); static::assertEquals($debit->getId(), $jsonBody['data']['paymentId']); $params = [ @@ -188,7 +193,7 @@ public function testAddCustomerWithAddress(): void 'defaultAddress' => '', 'setDefaultBillingAddress' => true, 'setDefaultShippingAddress' => true, - 'user_id' => $this->View()->data['id'], + 'user_id' => $this->View()->getAssign('data')['id'], 'company' => 'company', 'department' => 'department', 'vatId' => 'vatId', @@ -219,54 +224,61 @@ public function testAddCustomerWithAddress(): void $this->dispatch('/backend/Address/create'); - /** @var Customer $dummyData */ - $dummyData = $this->repository->find($params['user_id']); - - static::assertEquals('firstname', $dummyData->getDefaultBillingAddress()->getFirstname()); - static::assertEquals('lastname', $dummyData->getDefaultBillingAddress()->getLastname()); - static::assertEquals('department', $dummyData->getDefaultBillingAddress()->getDepartment()); - static::assertEquals('vatId', $dummyData->getDefaultBillingAddress()->getVatId()); - static::assertEquals('title', $dummyData->getDefaultBillingAddress()->getTitle()); - static::assertEquals('zipcode', $dummyData->getDefaultBillingAddress()->getZipcode()); - static::assertEquals('city', $dummyData->getDefaultBillingAddress()->getCity()); - static::assertEquals('street', $dummyData->getDefaultBillingAddress()->getStreet()); - static::assertEquals('additionalAddressLine1', $dummyData->getDefaultBillingAddress()->getAdditionalAddressLine1()); - static::assertEquals('additionalAddressLine2', $dummyData->getDefaultBillingAddress()->getAdditionalAddressLine2()); - - static::assertEquals('firstname', $dummyData->getDefaultShippingAddress()->getFirstname()); - static::assertEquals('lastname', $dummyData->getDefaultShippingAddress()->getLastname()); - static::assertEquals('department', $dummyData->getDefaultShippingAddress()->getDepartment()); - static::assertEquals('vatId', $dummyData->getDefaultShippingAddress()->getVatId()); - static::assertEquals('title', $dummyData->getDefaultShippingAddress()->getTitle()); - static::assertEquals('zipcode', $dummyData->getDefaultShippingAddress()->getZipcode()); - static::assertEquals('city', $dummyData->getDefaultShippingAddress()->getCity()); - static::assertEquals('street', $dummyData->getDefaultShippingAddress()->getStreet()); - static::assertEquals('additionalAddressLine1', $dummyData->getDefaultShippingAddress()->getAdditionalAddressLine1()); - static::assertEquals('additionalAddressLine2', $dummyData->getDefaultShippingAddress()->getAdditionalAddressLine2()); + $customer = $this->repository->find($params['user_id']); + static::assertInstanceOf(Customer::class, $customer); + + $billingAddress = $customer->getDefaultBillingAddress(); + static::assertInstanceOf(Address::class, $billingAddress); + static::assertEquals('firstname', $billingAddress->getFirstname()); + static::assertEquals('lastname', $billingAddress->getLastname()); + static::assertEquals('department', $billingAddress->getDepartment()); + static::assertEquals('vatId', $billingAddress->getVatId()); + static::assertEquals('title', $billingAddress->getTitle()); + static::assertEquals('zipcode', $billingAddress->getZipcode()); + static::assertEquals('city', $billingAddress->getCity()); + static::assertEquals('street', $billingAddress->getStreet()); + static::assertEquals('additionalAddressLine1', $billingAddress->getAdditionalAddressLine1()); + static::assertEquals('additionalAddressLine2', $billingAddress->getAdditionalAddressLine2()); + + $shippingAddress = $customer->getDefaultShippingAddress(); + static::assertInstanceOf(Address::class, $shippingAddress); + static::assertEquals('firstname', $shippingAddress->getFirstname()); + static::assertEquals('lastname', $shippingAddress->getLastname()); + static::assertEquals('department', $shippingAddress->getDepartment()); + static::assertEquals('vatId', $shippingAddress->getVatId()); + static::assertEquals('title', $shippingAddress->getTitle()); + static::assertEquals('zipcode', $shippingAddress->getZipcode()); + static::assertEquals('city', $shippingAddress->getCity()); + static::assertEquals('street', $shippingAddress->getStreet()); + static::assertEquals('additionalAddressLine1', $shippingAddress->getAdditionalAddressLine1()); + static::assertEquals('additionalAddressLine2', $shippingAddress->getAdditionalAddressLine2()); } /** * Test saveAction controller action - Update an existing customer - * - * @depends testAddCustomerPaymentDataWithDebit */ - public function testUpdateCustomerPaymentDataWithSepa($dummyDataId): void + public function testUpdateCustomerPaymentDataWithSepa(): void { - /** @var Customer $dummyData */ - $dummyData = $this->repository->find($dummyDataId); + $customerId = $this->testAddCustomerPaymentDataWithDebit(); + $customer = $this->repository->find($customerId); + static::assertInstanceOf(Customer::class, $customer); + $sepa = $this->manager ->getRepository(Payment::class) ->findOneBy(['name' => 'sepa']); + static::assertInstanceOf(Payment::class, $sepa); + $debit = $this->manager ->getRepository(Payment::class) ->findOneBy(['name' => 'debit']); + static::assertInstanceOf(Payment::class, $debit); - static::assertEquals($debit->getId(), $dummyData->getPaymentId()); - static::assertCount(1, $dummyData->getPaymentData()->toArray()); - static::assertNotNull($dummyData->getChanged()); + static::assertEquals($debit->getId(), $customer->getPaymentId()); + static::assertCount(1, $customer->getPaymentData()->toArray()); + static::assertNotNull($customer->getChanged()); $params = [ - 'id' => $dummyData->getId(), + 'id' => $customer->getId(), 'paymentId' => $sepa->getId(), 'paymentData' => [[ 'accountHolder' => '', @@ -277,23 +289,22 @@ public function testUpdateCustomerPaymentDataWithSepa($dummyDataId): void 'iban' => '456iban654', 'useBillingData' => true, ]], - 'changed' => $dummyData->getChanged()->format('c'), + 'changed' => $customer->getChanged()->format('c'), ]; $this->Request()->setMethod('POST')->setPost($params); $this->dispatch('/backend/Customer/save'); $jsonBody = $this->View()->getAssign(); - static::assertTrue($this->View()->success); + static::assertTrue($this->View()->getAssign('success')); static::assertEquals($sepa->getId(), $jsonBody['data']['paymentId']); - $this->manager->refresh($dummyData); + $this->manager->refresh($customer); - static::assertEquals($sepa->getId(), $dummyData->getPaymentId()); - $paymentDataArray = $dummyData->getPaymentData()->toArray(); + static::assertEquals($sepa->getId(), $customer->getPaymentId()); + $paymentDataArray = $customer->getPaymentData()->toArray(); static::assertCount(2, $paymentDataArray); // Old debit payment data is still there, it's just not used currently - /** @var PaymentData $paymentData */ $paymentData = array_shift($paymentDataArray); static::assertInstanceOf(PaymentData::class, $paymentData); static::assertEquals('Account Holder Name', $paymentData->getAccountHolder()); @@ -305,7 +316,6 @@ public function testUpdateCustomerPaymentDataWithSepa($dummyDataId): void static::assertFalse($paymentData->getUseBillingData()); // New SEPA data - /** @var PaymentData $paymentData */ $paymentData = array_shift($paymentDataArray); static::assertInstanceOf(PaymentData::class, $paymentData); static::assertEmpty($paymentData->getAccountHolder()); @@ -316,7 +326,7 @@ public function testUpdateCustomerPaymentDataWithSepa($dummyDataId): void static::assertEquals('456iban654', $paymentData->getIban()); static::assertTrue($paymentData->getUseBillingData()); - $this->manager->remove($dummyData); + $this->manager->remove($customer); $this->manager->flush(); } @@ -329,8 +339,8 @@ public function testPerformOrderAction(): void $this->Request()->setParams(['id' => $customer->getId()]); - /** @var Enlight_Controller_Response_ResponseTestCase $response */ $response = $this->dispatch('backend/Customer/performOrder'); + static::assertInstanceOf(Enlight_Controller_Response_ResponseTestCase::class, $response); $headerLocation = $response->getHeader('Location'); $this->reset(); @@ -365,7 +375,7 @@ public function testSaveCustomerOverwriteProtection(): void ->setMethod('POST') ->setPost($postData); $this->dispatch('backend/Customer/save'); - static::assertTrue($this->View()->success); + static::assertTrue($this->View()->getAssign('success')); // Now use an outdated timestamp. The controller should detect this and fail. $postData['changed'] = '2008-08-07 18:11:31'; @@ -373,7 +383,7 @@ public function testSaveCustomerOverwriteProtection(): void ->setMethod('POST') ->setPost($postData); $this->dispatch('backend/Customer/save'); - static::assertFalse($this->View()->success); + static::assertFalse($this->View()->getAssign('success')); } /** @@ -386,7 +396,9 @@ public function testCustomerId(): void $customer = Shopware()->Models()->find(Customer::class, $dummy->getId()); static::assertInstanceOf(Customer::class, $customer); - static::assertEquals('1', $customer->getGroup()->getId()); + $customerGroup = $customer->getGroup(); + static::assertInstanceOf(Group::class, $customerGroup); + static::assertSame(1, $customerGroup->getId()); } /** @@ -407,7 +419,9 @@ private function createDummyCustomer(): Customer { $dummyData = new Customer(); $dummyData->setEmail('test@phpunit.org'); - $dummyData->setGroup($this->manager->find(Group::class, 1)); + $customerGroup = $this->manager->find(Group::class, 1); + static::assertInstanceOf(Group::class, $customerGroup); + $dummyData->setGroup($customerGroup); $this->manager->persist($dummyData); $this->manager->flush(); diff --git a/tests/Functional/Controllers/Backend/LogTest.php b/tests/Functional/Controllers/Backend/LogTest.php index 573b3ae71f2..4b35a30a65a 100644 --- a/tests/Functional/Controllers/Backend/LogTest.php +++ b/tests/Functional/Controllers/Backend/LogTest.php @@ -1,4 +1,6 @@ dispatch('backend/log/getLogs'); - static::assertTrue($this->View()->success); + static::assertTrue($this->View()->getAssign('success')); $jsonBody = $this->View()->getAssign(); @@ -61,11 +63,11 @@ public function testGetLogs() * This test tests the creating of a new log. * This function is called before testDeleteLogs */ - public function testCreateLog() + public function testCreateLog(): int { - Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->beginTransaction(); + Shopware()->Container()->get(Connection::class)->beginTransaction(); - $this->Request()->setClientIp('10.0.0.3', false); + $this->Request()->setClientIp('10.0.0.3'); $this->Request()->setMethod('POST')->setPost( [ 'type' => 'backend', @@ -78,7 +80,7 @@ public function testCreateLog() ); $this->dispatch('backend/logger/createLog'); - static::assertTrue($this->View()->success); + static::assertTrue($this->View()->getAssign('success')); $jsonBody = $this->View()->getAssign(); @@ -93,10 +95,8 @@ public function testCreateLog() * This test-method tests the deleting of a log. * * @depends testCreateLog - * - * @param string $lastId */ - public function testDeleteLogs($lastId) + public function testDeleteLogs(int $lastId): void { $this->Request()->setMethod('POST')->setPost(['id' => $lastId]); @@ -105,20 +105,21 @@ public function testDeleteLogs($lastId) $jsonBody = $this->View()->getAssign(); static::assertArrayHasKey('success', $jsonBody); + static::assertTrue($jsonBody['success']); static::assertArrayHasKey('data', $jsonBody); - Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->rollBack(); + Shopware()->Container()->get(Connection::class)->rollBack(); } /** * This test tests the creating of a new log. * This function is called before testDeleteLogs */ - public function testCreateDeprecatedLog() + public function testCreateDeprecatedLog(): void { - Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->beginTransaction(); + Shopware()->Container()->get(Connection::class)->beginTransaction(); - $this->Request()->setClientIp('10.0.0.3', false); + $this->Request()->setClientIp('10.0.0.3'); $this->Request()->setMethod('POST')->setPost( [ 'type' => 'backend', @@ -130,8 +131,8 @@ public function testCreateDeprecatedLog() ] ); - $this->dispatch('backend/log/createLog'); - static::assertTrue($this->View()->success); + $this->dispatch('backend/logger/createLog'); + static::assertTrue($this->View()->getAssign('success')); $jsonBody = $this->View()->getAssign(); @@ -139,7 +140,7 @@ public function testCreateDeprecatedLog() static::assertArrayHasKey('success', $jsonBody); static::assertArrayHasKey('id', $jsonBody['data']); - Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->rollBack(); + Shopware()->Container()->get(Connection::class)->rollBack(); } public function testSystemLogList(): void @@ -195,7 +196,6 @@ public function testSystemLogListWithFilter(): void $pluginLogger->info('Running test...'); $coreLogger->info('Running test...'); - /** @var string $environment */ $environment = $container->getParameter('kernel.environment'); // test filtering diff --git a/tests/Functional/Controllers/Backend/MailTest.php b/tests/Functional/Controllers/Backend/MailTest.php index bd618244089..9ff3461d459 100644 --- a/tests/Functional/Controllers/Backend/MailTest.php +++ b/tests/Functional/Controllers/Backend/MailTest.php @@ -28,10 +28,7 @@ class MailTest extends Enlight_Components_Test_Controller_TestCase { - /** - * @var array - */ - public $testData = [ + public array $testData = [ 'name' => 'Testmail123', 'fromMail' => 'Shopware Demoshop', 'fromName' => 'info@example.com', diff --git a/tests/Functional/Controllers/Backend/MediaManagerTest.php b/tests/Functional/Controllers/Backend/MediaManagerTest.php index dcb8f2c151b..7ca95ebf073 100644 --- a/tests/Functional/Controllers/Backend/MediaManagerTest.php +++ b/tests/Functional/Controllers/Backend/MediaManagerTest.php @@ -40,7 +40,7 @@ class MediaManagerTest extends TestCase /** * Creates a new album, * checks if the new album has inherited the parents settings - * and deletes it afterwards + * and deletes it afterward */ public function testAlbumInheritance(): void { @@ -54,7 +54,7 @@ public function testAlbumInheritance(): void 'parentId' => '-11', 'position' => '', 'text' => 'PHPUNIT_ALBUM', - 'thumbnailSize' => '', + 'thumbnailSize' => [], ]; $request = new Enlight_Controller_Request_RequestTestCase(); diff --git a/tests/Functional/Controllers/Backend/OrderProductSearchTest.php b/tests/Functional/Controllers/Backend/OrderProductSearchTest.php index f96ebe262bb..3b20b05f6b6 100644 --- a/tests/Functional/Controllers/Backend/OrderProductSearchTest.php +++ b/tests/Functional/Controllers/Backend/OrderProductSearchTest.php @@ -680,7 +680,7 @@ private function getSearchParams(array $searchParams): array ]], ]; - if ($searchParams['orderId']) { + if (isset($searchParams['orderId'])) { $params['orderId'] = $searchParams['orderId']; } diff --git a/tests/Functional/Controllers/Backend/OrderTest.php b/tests/Functional/Controllers/Backend/OrderTest.php index e6dcce8bfc3..7a78ec818bc 100644 --- a/tests/Functional/Controllers/Backend/OrderTest.php +++ b/tests/Functional/Controllers/Backend/OrderTest.php @@ -396,7 +396,7 @@ public function testSavePositionActionWithTaxRule(int $customerGroupId, string $ $controller->savePositionAction(); $results = $controller->View()->getAssign(); - static::assertTrue($results['success'], (string) $results['message']); + static::assertTrue($results['success'], $results['message'] ?? ''); static::assertSame(self::NEW_TAX, $results['data']['taxRate']); } diff --git a/tests/Functional/Controllers/Backend/PaymentTest.php b/tests/Functional/Controllers/Backend/PaymentTest.php index 4620b0972a5..ed21cc1a7c7 100644 --- a/tests/Functional/Controllers/Backend/PaymentTest.php +++ b/tests/Functional/Controllers/Backend/PaymentTest.php @@ -1,4 +1,6 @@ + */ + private array $testDataCreate = [ 'name' => 'New payment', 'description' => 'New payment', 'source' => 1, @@ -55,19 +65,18 @@ public function setUp(): void parent::setUp(); // Disable auth and acl - Shopware()->Plugins()->Backend()->Auth()->setNoAuth(); - Shopware()->Plugins()->Backend()->Auth()->setNoAcl(); + $this->getContainer()->get('plugins')->Backend()->Auth()->setNoAuth(); + $this->getContainer()->get('plugins')->Backend()->Auth()->setNoAcl(); } /** * Tests the getPaymentsAction() * to test if reading the payments is working */ - public function testGetPayments() + public function testGetPayments(): void { - /* @var \Enlight_Controller_Response_ResponseTestCase */ $this->dispatch('backend/payment/getPayments'); - static::assertTrue($this->View()->success); + static::assertTrue($this->View()->getAssign('success')); $jsonBody = $this->View()->getAssign(); @@ -79,11 +88,10 @@ public function testGetPayments() * Tests the getCountriesAction() * to test if reading the countries is working */ - public function testGetCountries() + public function testGetCountries(): void { - /* @var \Enlight_Controller_Response_ResponseTestCase */ $this->dispatch('backend/payment/getCountries'); - static::assertTrue($this->View()->success); + static::assertTrue($this->View()->getAssign('success')); $jsonBody = $this->View()->getAssign(); @@ -93,15 +101,15 @@ public function testGetCountries() /** * Function to test creating a new payment + * + * @return array */ - public function testCreatePayments() + public function testCreatePayments(): array { - Shopware()->Db()->exec('DELETE FROM s_core_paymentmeans WHERE name = "New payment"'); - $this->Request()->setMethod('POST')->setPost($this->testDataCreate); $this->dispatch('backend/payment/createPayments'); - static::assertTrue($this->View()->success); + static::assertTrue($this->View()->getAssign('success')); $jsonBody = $this->View()->getAssign(); static::assertArrayHasKey('data', $jsonBody); @@ -112,18 +120,14 @@ public function testCreatePayments() /** * Function to test updating a payment - * - * @param array $data Contains the data of the created payment - * - * @depends testCreatePayments */ - public function testUpdatePayments($data) + public function testUpdatePayments(): void { + $data = $this->testCreatePayments(); $this->Request()->setMethod('POST')->setPost(['id' => $data['id'], 'name' => 'Neue Zahlungsart']); - /* @var \Enlight_Controller_Response_ResponseTestCase */ $this->dispatch('backend/payment/updatePayments'); - static::assertTrue($this->View()->success); + static::assertTrue($this->View()->getAssign('success')); $jsonBody = $this->View()->getAssign(); @@ -133,18 +137,15 @@ public function testUpdatePayments($data) /** * Function to test deleting a payment - * - * @param array $data Contains the data of the created payment - * - * @depends testCreatePayments */ - public function testDeletePayment($data) + public function testDeletePayment(): void { + $data = $this->testCreatePayments(); + $this->resetRequest(); $this->Request()->setMethod('POST')->setPost(['id' => $data['id']]); - /* @var \Enlight_Controller_Response_ResponseTestCase */ $this->dispatch('backend/payment/deletePayment'); - static::assertTrue($this->View()->success); + static::assertTrue($this->View()->getAssign('success')); $jsonBody = $this->View()->getAssign(); diff --git a/tests/Functional/Controllers/Backend/RiskManagementTest.php b/tests/Functional/Controllers/Backend/RiskManagementTest.php index 139aad2deac..50036f29b79 100644 --- a/tests/Functional/Controllers/Backend/RiskManagementTest.php +++ b/tests/Functional/Controllers/Backend/RiskManagementTest.php @@ -123,8 +123,9 @@ public function testEditRule($lastId) $jsonBody = $this->View()->getAssign(); - static::assertArrayHasKey('data', $jsonBody); static::assertArrayHasKey('success', $jsonBody); + static::assertTrue($jsonBody['success'], $jsonBody['errorMsg'] ?? ''); + static::assertArrayHasKey('data', $jsonBody); } /** diff --git a/tests/Functional/Controllers/Backend/UserManagerTest.php b/tests/Functional/Controllers/Backend/UserManagerTest.php index ebe6c8a7926..488ffe92d3e 100644 --- a/tests/Functional/Controllers/Backend/UserManagerTest.php +++ b/tests/Functional/Controllers/Backend/UserManagerTest.php @@ -29,15 +29,18 @@ use Doctrine\DBAL\Connection; use Doctrine\DBAL\Query\QueryBuilder; use Enlight_Components_Test_Controller_TestCase; +use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour; class UserManagerTest extends Enlight_Components_Test_Controller_TestCase { + use DatabaseTransactionBehaviour; + /** * Temporary user data * * @var array{username: string, password: string, localeId: int, roleId: int, name: string, email: string, active: bool} */ - protected array $temporaryUserData = [ + private array $temporaryUserData = [ 'username' => 'UserManagerTemporaryUser', 'password' => 'test', 'localeId' => 1, @@ -52,7 +55,7 @@ class UserManagerTest extends Enlight_Components_Test_Controller_TestCase * * @var array{id: int|null, localeId: int, roleId: int, active: bool, username: string, name: string, email: string, password: string, admin: bool, encoder: string, disabledCache: bool, lockedUntil: string} */ - protected array $temporaryAdminUserData = [ + private array $temporaryAdminUserData = [ 'id' => null, 'localeId' => 1, 'roleId' => 1, @@ -78,7 +81,7 @@ public function setUp(): void } /** - * Verify that we can not login with a user that doesn't exists (yet) + * Verify that we can not log in with a user that doesn't exist (yet) */ public function testWrongAdminLogin(): void { @@ -112,11 +115,10 @@ public function testCreateAdminUser(): void /** * Verify that the previously created admin user can login with a correct password - * - * @depends testCreateAdminUser */ public function testAdminLogin(): void { + $this->testCreateAdminUser(); $this->enableAuth(); $this->resetRequest(); @@ -168,11 +170,10 @@ public function testUserAdd(): string /** * Test edit of users - * - * @depends testUserAdd */ - public function testUserEdit(string $username): string + public function testUserEdit(): string { + $username = $this->testUserAdd(); $this->resetRequest() ->resetResponse(); @@ -199,11 +200,10 @@ public function testUserEdit(string $username): string /** * Test deleting of users - * - * @depends testUserEdit */ - public function testUserDelete(string $username): void + public function testUserDelete(): void { + $username = $this->testUserAdd(); $user = $this->getUserByUsername($username); static::assertGreaterThan(0, $user['id']); @@ -253,7 +253,7 @@ public function testUserDetails(): void static::assertEquals($user['id'], $this->View()->getAssign('data')['id']); // Check that result does not contain passwords - static::assertNull($this->View()->getAssign('data')['password']); + static::assertFalse(isset($this->View()->getAssign('data')['password'])); } /** @@ -289,11 +289,10 @@ public function testCreateRole(): string /** * Test editing of roles - * - * @depends testCreateRole */ - public function testEditRole(string $randomRoleName): int + public function testEditRole(): int { + $randomRoleName = $this->testCreateRole(); $randomRole = Shopware()->Container() ->get(Connection::class) ->createQueryBuilder() @@ -318,11 +317,10 @@ public function testEditRole(string $randomRoleName): int /** * Test deleting of roles - * - * @depends testEditRole */ - public function testDeleteRole(int $randomRoleId): void + public function testDeleteRole(): void { + $randomRoleId = $this->testEditRole(); $this->Request()->setParam('id', $randomRoleId); $this->dispatch('backend/UserManager/deleteRole'); diff --git a/tests/Functional/Controllers/Backend/VoteTest.php b/tests/Functional/Controllers/Backend/VoteTest.php index e6465a1c195..e9badcae998 100644 --- a/tests/Functional/Controllers/Backend/VoteTest.php +++ b/tests/Functional/Controllers/Backend/VoteTest.php @@ -27,9 +27,12 @@ namespace Shopware\Tests\Functional\Controllers\Backend; use Enlight_Components_Test_Controller_TestCase; +use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour; class VoteTest extends Enlight_Components_Test_Controller_TestCase { + use DatabaseTransactionBehaviour; + /** * Standard set up for every test - just disable auth */ @@ -78,13 +81,12 @@ public function testGetVotes(): array /** * Test method to test the answerVoteAction-method, which sets an answer to a vote - * - * @depends testGetVotes - * - * @param array $data Contains the product, which is created in testGetVotes */ - public function testAnswerVote(array $data): void + public function testAnswerVote(): void { + $data = $this->testGetVotes(); + $this->resetRequest()->resetResponse(); + $data['answer'] = 'Test'; $this->Request()->setMethod('POST')->setPost($data); @@ -98,13 +100,12 @@ public function testAnswerVote(array $data): void /** * Test method to test the acceptVoteAction-method, which sets the active-property to 1, so the vote is enabled * in the frontend - * - * @depends testGetVotes - * - * @param array $data Contains the product, which is created in testGetVotes */ - public function testAcceptVote(array $data): void + public function testAcceptVote(): void { + $data = $this->testGetVotes(); + $this->resetRequest()->resetResponse(); + $sql = 'UPDATE s_articles_vote SET active=0 WHERE id=?'; Shopware()->Db()->query($sql, [$data['id']]); @@ -120,13 +121,12 @@ public function testAcceptVote(array $data): void /** * Test method to test the deleteVoteAction-method, which deletes the product created in the testGetVotes-method - * - * @depends testGetVotes - * - * @param array $data Contains the product, which is created in testGetVotes */ - public function testDeleteVote(array $data): void + public function testDeleteVote(): void { + $data = $this->testGetVotes(); + $this->resetRequest()->resetResponse(); + $this->Request()->setMethod('POST')->setPost($data); $this->dispatch('backend/vote/delete'); static::assertTrue($this->View()->getAssign('success')); diff --git a/tests/Functional/Controllers/Backend/VoucherTest.php b/tests/Functional/Controllers/Backend/VoucherTest.php index c2b5e183fa1..154e77e5602 100644 --- a/tests/Functional/Controllers/Backend/VoucherTest.php +++ b/tests/Functional/Controllers/Backend/VoucherTest.php @@ -1,4 +1,6 @@ */ private array $voucherData = [ 'description' => 'description', @@ -60,14 +57,10 @@ class VoucherTest extends Enlight_Components_Test_Controller_TestCase 'value' => '10', ]; - /** - * @var ModelManager - */ - private $manager; + private Repository $repository; + + private ModelManager $manager; - /** - * Standard set up for every test - just disable auth - */ public function setUp(): void { parent::setUp(); @@ -80,10 +73,7 @@ public function setUp(): void Shopware()->Plugins()->Backend()->Auth()->setNoAcl(); } - /** - * test the voucher list - */ - public function testGetVoucher() + public function testGetVoucher(): void { // Delete old data $vouchers = $this->repository->findBy(['orderCode' => '65168phpunit']); @@ -95,10 +85,10 @@ public function testGetVoucher() $voucher = $this->createDummy(); $this->dispatch('backend/voucher/getVoucher?page=1&start=0&limit=2000'); - static::assertTrue($this->View()->success); - $returnData = $this->View()->data; + static::assertTrue($this->View()->getAssign('success')); + $returnData = $this->View()->getAssign('data'); static::assertNotEmpty($returnData); - static::assertGreaterThan(0, $this->View()->totalCount); + static::assertGreaterThan(0, $this->View()->getAssign('totalCount')); $lastInsert = $returnData[\count($returnData) - 1]; static::assertEquals($voucher->getId(), $lastInsert['id']); @@ -106,42 +96,31 @@ public function testGetVoucher() $this->manager->flush(); } - /** - * test adding a voucher - * - * @return string The id to for the testUpdateVoucher Method - */ - public function testAddVoucher() + public function testAddVoucher(): int { - $this->manager->getConnection()->executeUpdate('DELETE FROM s_emarketing_vouchers WHERE ordercode = :code', [ + $this->manager->getConnection()->executeStatement('DELETE FROM s_emarketing_vouchers WHERE ordercode = :code', [ ':code' => $this->voucherData['orderCode'], ]); $params = $this->voucherData; $this->Request()->setParams($params); $this->dispatch('backend/voucher/saveVoucher'); - static::assertTrue($this->View()->success); - static::assertEquals($params['description'], $this->View()->data['description']); + static::assertTrue($this->View()->getAssign('success')); + static::assertEquals($params['description'], $this->View()->getAssign('data')['description']); - return $this->View()->data['id']; + return $this->View()->getAssign('data')['id']; } /** - * the the getVoucherDetail Method - * * @depends testAddVoucher - * - * @param string $id - * - * @return string the id to for the testUpdateVoucher Method */ - public function testGetVoucherDetail($id) + public function testGetVoucherDetail(int $id): int { $params['voucherID'] = $id; $this->Request()->setParams($params); $this->dispatch('backend/voucher/getVoucherDetail'); - static::assertTrue($this->View()->success); - $returningData = $this->View()->data; + static::assertTrue($this->View()->getAssign('success')); + $returningData = $this->View()->getAssign('data'); $voucherData = $this->voucherData; static::assertEquals($voucherData['description'], $returningData['description']); static::assertEquals($voucherData['numberOfUnits'], $returningData['numberOfUnits']); @@ -154,11 +133,9 @@ public function testGetVoucherDetail($id) } /** - * test the voucherCode validation methods with the created voucher - * * @depends testAddVoucher */ - public function testValidateVoucherCode() + public function testValidateVoucherCode(): void { $params = []; $voucherModel = $this->createDummy(false); @@ -186,13 +163,9 @@ public function testValidateVoucherCode() } /** - * Test the orderCode validation methods with the created voucher - * * @depends testAddVoucher - * - * @param string $id */ - public function testValidateOrderCode($id) + public function testValidateOrderCode(int $id): void { $params = []; $voucherData = $this->voucherData; @@ -217,13 +190,9 @@ public function testValidateOrderCode($id) } /** - * Test updating a voucher - * * @depends testGetVoucherDetail - * - * @param string $id */ - public function testUpdateVoucher($id) + public function testUpdateVoucher(int $id): int { $params = $this->voucherData; $params['id'] = $id; @@ -231,59 +200,47 @@ public function testUpdateVoucher($id) $this->Request()->setParams($params); $this->dispatch('backend/voucher/saveVoucher'); - static::assertTrue($this->View()->success); - static::assertEquals($params['description'], $this->View()->data['description']); + static::assertTrue($this->View()->getAssign('success')); + static::assertEquals($params['description'], $this->View()->getAssign('data')['description']); return $id; } /** - * Test generating voucher codes - * * @depends testUpdateVoucher - * - * @param string $id */ - public function testGenerateVoucherCodes($id) + public function testGenerateVoucherCodes(int $id): int { $voucherData = $this->voucherData; $params = []; $params['numberOfUnits'] = $voucherData['numberOfUnits']; - $params['voucherId'] = (int) $id; + $params['voucherId'] = $id; $this->Request()->setParams($params); $this->dispatch('backend/voucher/createVoucherCodes'); - static::assertTrue($this->View()->success); + static::assertTrue($this->View()->getAssign('success')); return $id; } /** - * Test the listing of the voucher codes - * * @depends testGenerateVoucherCodes - * - * @param string $id */ - public function testGetVoucherCodes($id) + public function testGetVoucherCodes(int $id): int { $this->dispatch('backend/voucher/getVoucherCodes?voucherID=' . $id); - static::assertTrue($this->View()->success); - static::assertCount(50, $this->View()->data); + static::assertTrue($this->View()->getAssign('success')); + static::assertCount(50, $this->View()->getAssign('data')); return $id; } /** - * Test the exportVoucherCode Method - * * @depends testGetVoucherCodes - * - * @param string $id */ - public function testExportVoucherCode($id) + public function testExportVoucherCode(int $id): int { $params = []; - $params['voucherId'] = (int) $id; + $params['voucherId'] = $id; $this->Request()->setParams($params); $this->dispatch('backend/voucher/exportVoucherCode'); $header = $this->Response()->getHeaders(); @@ -299,40 +256,26 @@ public function testExportVoucherCode($id) } /** - * Test the delete the voucher method - * * @depends testExportVoucherCode - * - * @param string $id */ - public function testDeleteVoucher($id) + public function testDeleteVoucher(int $id): void { $params = []; - $params['id'] = (int) $id; + $params['id'] = $id; $this->Request()->setParams($params); $this->dispatch('backend/voucher/deleteVoucher'); - static::assertTrue($this->View()->success); + static::assertTrue($this->View()->getAssign('success')); static::assertNull($this->repository->find($params['id'])); } - /** - * Test getTaxConfiguration Method - */ - public function testGetTaxConfiguration() + public function testGetTaxConfiguration(): void { $this->dispatch('backend/voucher/getTaxConfiguration'); - static::assertTrue($this->View()->success); - static::assertNotEmpty($this->View()->data); + static::assertTrue($this->View()->getAssign('success')); + static::assertNotEmpty($this->View()->getAssign('data')); } - /** - * Creates the dummy voucher - * - * @param bool $individualMode - * - * @return Voucher - */ - private function getDummyVoucher($individualMode = true) + private function getDummyVoucher(bool $individualMode = true): Voucher { $voucher = new Voucher(); $voucherData = $this->voucherData; @@ -345,14 +288,7 @@ private function getDummyVoucher($individualMode = true) return $voucher; } - /** - * Helper method to create the dummy object - * - * @param bool $individualMode - * - * @return Voucher - */ - private function createDummy($individualMode = true) + private function createDummy(bool $individualMode = true): Voucher { $voucher = $this->getDummyVoucher($individualMode); $this->manager->persist($voucher); diff --git a/tests/Functional/Controllers/Frontend/BlogTest.php b/tests/Functional/Controllers/Frontend/BlogTest.php index 74b02feef88..d0e93112ab1 100644 --- a/tests/Functional/Controllers/Frontend/BlogTest.php +++ b/tests/Functional/Controllers/Frontend/BlogTest.php @@ -1,4 +1,6 @@ connection = Shopware()->Container()->get(\Doctrine\DBAL\Connection::class); + $this->connection = Shopware()->Container()->get(Connection::class); } /** * Tests the behavior if the blog article is not activated */ - public function testDispatchNoActiveBlogItem() + public function testDispatchNoActiveBlogItem(): void { $this->expectException('Enlight_Exception'); $this->expectExceptionCode('404'); @@ -55,7 +60,7 @@ public function testDispatchNoActiveBlogItem() /** * Tests the behavior if the BlogItem does not exist anymore */ - public function testDispatchNotExistingBlogItem() + public function testDispatchNotExistingBlogItem(): void { $this->expectException('Enlight_Exception'); $this->expectExceptionCode('404'); @@ -63,10 +68,10 @@ public function testDispatchNotExistingBlogItem() static::assertTrue($this->Response()->isRedirect()); } - public function testDispatchInactiveCategory() + public function testDispatchInactiveCategory(): void { // Deactivate blog category - $this->connection->exec('UPDATE `s_categories` SET `active` = 0 WHERE `id` = 17'); + $this->connection->executeStatement('UPDATE `s_categories` SET `active` = 0 WHERE `id` = 17'); // Should be redirected because blog category is inactive $ex = null; @@ -75,6 +80,7 @@ public function testDispatchInactiveCategory() } catch (Exception $e) { $ex = $e; } + static::assertInstanceOf(Exception::class, $ex); static::assertEquals(404, $ex->getCode()); // Should be redirected because blog category is inactive @@ -89,7 +95,7 @@ public function testDispatchInactiveCategory() /** * Test that requesting a non-blog category-id creates a redirect */ - public function testDispatchNonBlogCategory() + public function testDispatchNonBlogCategory(): void { $this->expectException('Enlight_Exception'); $this->expectExceptionCode('404'); @@ -100,17 +106,18 @@ public function testDispatchNonBlogCategory() * Test redirect when the blog category does not exist * * @dataProvider invalidCategoryUrlDataProvider - * - * @param string $url */ - public function testDispatchNotExistingBlogCategory($url) + public function testDispatchNotExistingBlogCategory(string $url): void { $this->expectException('Enlight_Exception'); $this->expectExceptionCode('404'); $this->dispatch($url); } - public function invalidCategoryUrlDataProvider() + /** + * @return list> + */ + public function invalidCategoryUrlDataProvider(): array { return [ ['/blog/?sCategory=14'], // Not a blog category diff --git a/tests/Functional/Controllers/Frontend/RegisterWithCaptchaTest.php b/tests/Functional/Controllers/Frontend/RegisterWithCaptchaTest.php index 36c917e7914..a15d8bf0752 100644 --- a/tests/Functional/Controllers/Frontend/RegisterWithCaptchaTest.php +++ b/tests/Functional/Controllers/Frontend/RegisterWithCaptchaTest.php @@ -30,10 +30,12 @@ use Enlight_Components_Test_Plugin_TestCase; use Shopware\Components\Captcha\DefaultCaptcha; use Shopware\Tests\Functional\Traits\ContainerTrait; +use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour; class RegisterWithCaptchaTest extends Enlight_Components_Test_Plugin_TestCase { use ContainerTrait; + use DatabaseTransactionBehaviour; private const USER_AGENT = 'Mozilla/5.0 (Android; Tablet; rv:14.0) Gecko/14.0 Firefox/14.0'; diff --git a/tests/Functional/Controllers/Frontend/SearchTest.php b/tests/Functional/Controllers/Frontend/SearchTest.php index e6d9216fc06..752944b9b37 100644 --- a/tests/Functional/Controllers/Frontend/SearchTest.php +++ b/tests/Functional/Controllers/Frontend/SearchTest.php @@ -1,4 +1,6 @@ dispatch('ajax_search?sSearch=ipad'); // Check for valid markup - // Ignore whitespace, since this testcase checks wether the list is structured correctly (li following ul) + // Ignore whitespace, since this testcase checks whether the list is structured correctly (li following ul) self::assertStringContainsStringIgnoringWhitespace( '
      • > + */ + public function searchTermProvider(): array { return [ ['"Apostrophes"', htmlentities(strip_tags('"Apostrophes"'))], @@ -127,13 +132,13 @@ public function searchTermProvider() ]; } - private static function assertStringContainsStringIgnoringWhitespace(string $needle, string $haystack, string $message = ''): void + private static function assertStringContainsStringIgnoringWhitespace(string $needle, string $haystack): void { - static::assertStringContainsString( - preg_replace('/\s/', '', $needle), - preg_replace('/\s/', '', $haystack), - $message - ); + $needle = preg_replace('/\s/', '', $needle); + static::assertIsString($needle); + $haystack = preg_replace('/\s/', '', $haystack); + static::assertIsString($haystack); + static::assertStringContainsString($needle, $haystack); } private function getResponseContent(): string diff --git a/tests/Functional/Controllers/Frontend/SitemapTest.php b/tests/Functional/Controllers/Frontend/SitemapTest.php index f8057c2e63e..a852106b2f7 100644 --- a/tests/Functional/Controllers/Frontend/SitemapTest.php +++ b/tests/Functional/Controllers/Frontend/SitemapTest.php @@ -1,4 +1,6 @@ Container()->get(ShopRegistrationServiceInterface::class)->registerShop(Shopware()->Models()->getRepository(Shop::class)->getActiveDefault()); } /** - * @param int $shopId - * * @dataProvider sitemapDataprovider */ - public function testIndex($shopId, array $sitemapData) + public function testIndex(int $shopId, array $sitemapData): void { - Shopware()->Container()->get(ShopRegistrationServiceInterface::class)->registerShop(Shopware()->Models()->getRepository(Shop::class)->find($shopId)); + $shop = $this->getContainer()->get(ModelManager::class)->getRepository(Shop::class)->find($shopId); + static::assertInstanceOf(Shop::class, $shop); + $this->getContainer()->get(ShopRegistrationServiceInterface::class)->registerShop($shop); $controller = $this->getController(); $controller->indexAction(); @@ -69,10 +75,7 @@ public function testIndex($shopId, array $sitemapData) } } - /** - * @return array - */ - public function sitemapDataprovider() + public function sitemapDataprovider(): array { return [ [ @@ -104,18 +107,15 @@ public function sitemapDataprovider() ]; } - /** - * @return Shopware_Controllers_Frontend_Sitemap - */ - private function getController() + private function getController(): Shopware_Controllers_Frontend_Sitemap { - /** @var Shopware_Controllers_Frontend_Sitemap $controller */ $controller = Enlight_Class::Instance(Shopware_Controllers_Frontend_Sitemap::class, [ $this->Request(), $this->Response(), ]); + static::assertInstanceOf(Shopware_Controllers_Frontend_Sitemap::class, $controller); - $controller->setContainer(Shopware()->Container()); + $controller->setContainer($this->getContainer()); $controller->setView(new Enlight_View_Default(new Enlight_Template_Manager())); return $controller; diff --git a/tests/Functional/Controllers/Frontend/SitemapXmlTest.php b/tests/Functional/Controllers/Frontend/SitemapXmlTest.php deleted file mode 100644 index a3842facd24..00000000000 --- a/tests/Functional/Controllers/Frontend/SitemapXmlTest.php +++ /dev/null @@ -1,37 +0,0 @@ -dispatch('/SitemapXml'); - - static::assertEquals(302, $this->Response()->getHttpResponseCode()); - } -} diff --git a/tests/Functional/Controllers/Widgets/IndexTest.php b/tests/Functional/Controllers/Widgets/IndexTest.php index 18136d52c84..9ec125fd218 100644 --- a/tests/Functional/Controllers/Widgets/IndexTest.php +++ b/tests/Functional/Controllers/Widgets/IndexTest.php @@ -31,7 +31,7 @@ class IndexTest extends Enlight_Components_Test_Controller_TestCase /** * @ticket SW-8127 */ - public function testShopMenu() + public function testShopMenu(): void { $this->dispatch('/Widgets/Index/shopMenu'); static::assertEquals(200, $this->Response()->getHttpResponseCode()); diff --git a/tests/Functional/Core/AdminTest.php b/tests/Functional/Core/AdminTest.php index c9e40c91c38..303c69ebe05 100644 --- a/tests/Functional/Core/AdminTest.php +++ b/tests/Functional/Core/AdminTest.php @@ -2313,6 +2313,8 @@ public function testsGetPremiumDispatchSurcharge(): void public function testsGetPremiumShippingcosts(): void { + $this->generateBasketSession(); + // No basket, return false, static::assertFalse($this->module->sGetPremiumShippingcosts()); @@ -2325,7 +2327,6 @@ public function testsGetPremiumShippingcosts(): void } static::assertIsArray($germany); - $this->generateBasketSession(); $this->basketModule->sAddArticle('SW10010'); // With country data, no dispatch method diff --git a/tests/Functional/Core/BasketTest.php b/tests/Functional/Core/BasketTest.php index 240cc2dfcdb..9bd6d3e2dde 100644 --- a/tests/Functional/Core/BasketTest.php +++ b/tests/Functional/Core/BasketTest.php @@ -1736,11 +1736,12 @@ public function testsInsertSurchargePercent(): void public function testsGetBasket(): void { + $this->session->clear(); + $this->generateBasketSession(); + // Test with empty basket static::assertEquals([], $this->module->sGetBasket()); - $this->generateBasketSession(); - // Add one product to the basket with low amount $randomProduct = $this->getProductWithLowestVariantId(); $this->connection->insert( @@ -1971,16 +1972,17 @@ public function testsGetBasketDataNegativeCloseToZeroTotal(): void // Assert that a valid basket was returned static::assertArrayHasKey(CartKey::AMOUNT_NUMERIC, $basketData); // Assert that the total is approximately 0.00 - static::assertEqualsWithDelta(0, $basketData[CartKey::AMOUNT_NUMERIC], Utils::FORMER_PHPUNIT_FLOAT_EPSILON, 'total is approxmately 0.00'); - static::assertEqualsWithDelta(0, $basketData[CartKey::AMOUNT_NUMERIC], 0.0001, 'total is approxmately 0.00'); + static::assertEqualsWithDelta(0, $basketData[CartKey::AMOUNT_NUMERIC], Utils::FORMER_PHPUNIT_FLOAT_EPSILON, 'total is approximately 0.00'); + static::assertEqualsWithDelta(0, $basketData[CartKey::AMOUNT_NUMERIC], 0.0001, 'total is approximately 0.00'); } public function testsGetBasketWithInvalidProduct(): void { - static::assertEquals([], $this->module->sGetBasket()); - + $this->session->clear(); $this->generateBasketSession(); + static::assertEquals([], $this->module->sGetBasket()); + // Setup product for the first basket position - a product that costs EUR 29.97 $product = (new Helper($this->getContainer()))->createProduct([ 'name' => 'Testartikel', @@ -2122,28 +2124,17 @@ public function testsDeleteNote(): void $randomProducts[1]['ordernumber'] )); - // Null argument, return null + // Test deleting an invalid ID static::assertFalse($this->module->sDeleteNote(0)); - // Get random product that's not in the basket - $randomNotPresentProductId = $this->connection->fetchOne( - 'SELECT detail.id FROM s_articles_details detail - INNER JOIN s_articles product - ON product.id = detail.articleID - WHERE detail.active = 1 - AND detail.id NOT IN (?) - LIMIT 1', - [array_column($randomProducts, 'id')] - ); - - // Check that we currently have 2 articles - static::assertEquals(2, $this->module->sCountNotes()); + // Check that we currently have 2 products + static::assertSame(2, $this->module->sCountNotes()); - // Get true even if product is not in the wishlist - static::assertTrue($this->module->sDeleteNote($randomNotPresentProductId)); + // Get true even if note ID is not in the database + static::assertTrue($this->module->sDeleteNote(PHP_INT_MAX)); - // Check that we still have 2 articles - static::assertEquals(2, $this->module->sCountNotes()); + // Check that we still have 2 products + static::assertSame(2, $this->module->sCountNotes()); $noteIds = $this->connection->fetchFirstColumn( 'SELECT id FROM s_order_notes detail @@ -2151,17 +2142,17 @@ public function testsDeleteNote(): void [$_COOKIE['sUniqueID']] ); - // Get true even if product is not in the wishlist + // Remove first product static::assertTrue($this->module->sDeleteNote($noteIds[0])); // Check that we now have 1 product - static::assertEquals(1, $this->module->sCountNotes()); + static::assertSame(1, $this->module->sCountNotes()); - // Get true even if product is not in the wishlist + // Remove second product static::assertTrue($this->module->sDeleteNote($noteIds[1])); // Check that we now have an empty wishlist - static::assertEquals(0, $this->module->sCountNotes()); + static::assertSame(0, $this->module->sCountNotes()); } public function testsUpdateArticle(): void @@ -2313,14 +2304,14 @@ public function testsDeleteBasket(): void public function testsDeleteArticle(): void { + $this->generateBasketSession(); + // No id, expect null static::assertNull($this->module->sDeleteArticle(0)); // Random id, expect null static::assertNull($this->module->sDeleteArticle(9999999)); - $this->generateBasketSession(); - // Get random product and add it to the basket $randomProduct = $this->connection->fetchAssociative( 'SELECT detail.* FROM s_articles_details detail diff --git a/tests/Functional/Core/ExportTest.php b/tests/Functional/Core/ExportTest.php index 27c09257e78..2384990da2c 100644 --- a/tests/Functional/Core/ExportTest.php +++ b/tests/Functional/Core/ExportTest.php @@ -183,7 +183,7 @@ public function testsGetPremiumDispatchSurchargeInactiveSurcharge(): void 'shippingfree' => '0', 'amount' => '19.99', 'max_tax' => '19.00', - 'userID' => null, + 'userID' => '', 'has_topseller' => '0', 'has_comment' => '', 'has_esd' => '0', @@ -192,7 +192,7 @@ public function testsGetPremiumDispatchSurchargeInactiveSurcharge(): void 'paymentID' => '5', 'customergroupID' => '1', 'multishopID' => '1', - 'sessionID' => null, + 'sessionID' => 'testSessionId', ]; $surcharge = $this->export->sGetPremiumDispatchSurcharge($cart); @@ -216,7 +216,7 @@ public function testsGetPremiumDispatchSurchargeActiveSurcharge(): void 'shippingfree' => '0', 'amount' => '19.99', 'max_tax' => '19.00', - 'userID' => null, + 'userID' => '', 'has_topseller' => '0', 'has_comment' => '', 'has_esd' => '0', diff --git a/tests/Functional/Core/OrderTest.php b/tests/Functional/Core/OrderTest.php index 508201a76b1..06ec10f2527 100644 --- a/tests/Functional/Core/OrderTest.php +++ b/tests/Functional/Core/OrderTest.php @@ -91,10 +91,9 @@ public function testSendMailPaymentData(): void ] ); - // Register the event listener, so that we test the value of "$context" Shopware()->Events()->addListener( - 'Shopware_Modules_Order_SendMail_Create', - [$this, 'validatePaymentContextData'] + 'Shopware_Modules_Order_SendMail_FilterContext', + [$this, 'extendPaymentContextDataToPreventFailures'] ); Shopware()->Front()->setRequest(new ShopwareRequest()); @@ -102,19 +101,55 @@ public function testSendMailPaymentData(): void $variables = [ 'additional' => [ 'payment' => Shopware()->Modules()->Admin()->sGetPaymentMeanById( - Shopware()->Db()->fetchRow('SELECT * FROM s_core_paymentmeans WHERE name LIKE "debit"') + (int) Shopware()->Db()->fetchOne('SELECT id FROM s_core_paymentmeans WHERE name LIKE "debit"') ), + 'country' => [ + 'countryname' => 'Deutschland', + ], + 'countryShipping' => [ + 'countryname' => 'Deutschland', + ], + ], + 'billingaddress' => [ + 'company' => '', + 'firstname' => 'Test', + 'lastname' => 'Foo', + 'street' => 'Ebbinghoff', + 'streetnumber' => '10', + 'zipcode' => '48624', + 'city' => 'Schöppingen', + 'ustid' => '', + ], + 'shippingaddress' => [ + 'company' => '', + 'firstname' => 'Test', + 'lastname' => 'Foo', + 'street' => 'Ebbinghoff', + 'streetnumber' => '10', + 'zipcode' => '48624', + 'city' => 'Schöppingen', + ], + 'sDispatch' => [ + 'name' => 'test', + 'description' => 'foo', ], ]; $this->module->sendMail($variables); } - public function validatePaymentContextData(Enlight_Event_EventArgs $args): void + public function extendPaymentContextDataToPreventFailures(Enlight_Event_EventArgs $args): void { - $context = $args->get('context'); + $context = $args->getReturn(); static::assertIsArray($context['sPaymentTable']); static::assertCount(0, $context['sPaymentTable']); + + $context['sPaymentTable']['account'] = null; + $context['sPaymentTable']['bankcode'] = null; + $context['sPaymentTable']['bankname'] = null; + $context['sPaymentTable']['bankholder'] = null; + + $args->setReturn($context); } public function testTransactionExistTrue(): void @@ -343,12 +378,12 @@ public function testSSaveBillingAddress(): void $billingAttr = $billing->getAttribute(); if ($billingAttr !== null) { - static::assertSame($originalBillingAddress['text1'], $billingAttr->getText1()); - static::assertSame($originalBillingAddress['text2'], $billingAttr->getText2()); - static::assertSame($originalBillingAddress['text3'], $billingAttr->getText3()); - static::assertSame($originalBillingAddress['text4'], $billingAttr->getText4()); - static::assertSame($originalBillingAddress['text5'], $billingAttr->getText5()); - static::assertSame($originalBillingAddress['text6'], $billingAttr->getText6()); + static::assertSame($originalBillingAddress['text1'] ?? null, $billingAttr->getText1()); + static::assertSame($originalBillingAddress['text2'] ?? null, $billingAttr->getText2()); + static::assertSame($originalBillingAddress['text3'] ?? null, $billingAttr->getText3()); + static::assertSame($originalBillingAddress['text4'] ?? null, $billingAttr->getText4()); + static::assertSame($originalBillingAddress['text5'] ?? null, $billingAttr->getText5()); + static::assertSame($originalBillingAddress['text6'] ?? null, $billingAttr->getText6()); Shopware()->Models()->remove($billingAttr); } Shopware()->Models()->remove($billing); @@ -377,12 +412,12 @@ public function testSaveShippingAddress(): void $shippingAttr = $shipping->getAttribute(); if ($shippingAttr !== null) { - static::assertSame($originalBillingAddress['text1'], $shippingAttr->getText1()); - static::assertSame($originalBillingAddress['text2'], $shippingAttr->getText2()); - static::assertSame($originalBillingAddress['text3'], $shippingAttr->getText3()); - static::assertSame($originalBillingAddress['text4'], $shippingAttr->getText4()); - static::assertSame($originalBillingAddress['text5'], $shippingAttr->getText5()); - static::assertSame($originalBillingAddress['text6'], $shippingAttr->getText6()); + static::assertSame($originalBillingAddress['text1'] ?? null, $shippingAttr->getText1()); + static::assertSame($originalBillingAddress['text2'] ?? null, $shippingAttr->getText2()); + static::assertSame($originalBillingAddress['text3'] ?? null, $shippingAttr->getText3()); + static::assertSame($originalBillingAddress['text4'] ?? null, $shippingAttr->getText4()); + static::assertSame($originalBillingAddress['text5'] ?? null, $shippingAttr->getText5()); + static::assertSame($originalBillingAddress['text6'] ?? null, $shippingAttr->getText6()); Shopware()->Models()->remove($shippingAttr); } @@ -482,6 +517,9 @@ public function testHandleESDOrder(): void 'getVariantEsd', [$basketRow['ordernumber']] ); + if (!\is_array($esdArticle)) { + continue; + } $availableSerials = $this->invokeMethod( $this->module, diff --git a/tests/Functional/Library/Enlight/Template/Plugins/CurrencyModifierTest.php b/tests/Functional/Library/Enlight/Template/Plugins/CurrencyModifierTest.php new file mode 100644 index 00000000000..e892a9751b3 --- /dev/null +++ b/tests/Functional/Library/Enlight/Template/Plugins/CurrencyModifierTest.php @@ -0,0 +1,55 @@ +Engine()->loadPlugin('smarty_modifier_currency'); + static::assertSame($expectedFormattedCurrencyValue, \smarty_modifier_currency($currencyValue)); + } + + public function currencyValues(): Generator + { + yield 'Currency value with comma' => ['1,23', '1,23 €']; + yield 'Currency value as float' => [1.23, '1,23 €']; + yield 'Currency value as numeric string' => ['1.23', '1,23 €']; + yield 'Currency value with special chars' => ['\'"<>&1', '0,00 €']; + } +} diff --git a/tests/Functional/Library/ZendDBTest.php b/tests/Functional/Library/Zend/ZendDBTest.php similarity index 96% rename from tests/Functional/Library/ZendDBTest.php rename to tests/Functional/Library/Zend/ZendDBTest.php index f3b37fd1ba0..f24e86f8c2f 100644 --- a/tests/Functional/Library/ZendDBTest.php +++ b/tests/Functional/Library/Zend/ZendDBTest.php @@ -24,7 +24,7 @@ * our trademarks remain entirely with us. */ -namespace Shopware\Tests\Functional\Library; +namespace Shopware\Tests\Functional\Library\Zend; use PHPUnit\Framework\TestCase; use Shopware\Tests\Functional\Traits\ContainerTrait; diff --git a/tests/Functional/Library/ZendLocaleTest.php b/tests/Functional/Library/Zend/ZendLocaleTest.php similarity index 77% rename from tests/Functional/Library/ZendLocaleTest.php rename to tests/Functional/Library/Zend/ZendLocaleTest.php index 636c40bcd10..3c30636782c 100644 --- a/tests/Functional/Library/ZendLocaleTest.php +++ b/tests/Functional/Library/Zend/ZendLocaleTest.php @@ -1,4 +1,6 @@ DocPath(), $localName)); } /** - * @return array + * @return array> */ - public function getLocales() + public function getLocales(): array { - $con = Shopware()->Container()->get(\Doctrine\DBAL\Connection::class); + $sql = 'SELECT locale FROM s_core_locales WHERE locale NOT IN(?)'; - return $con->fetchAll('SELECT locale FROM s_core_locales WHERE locale NOT IN(?)', [self::KNOWN_FAILURE], [Connection::PARAM_STR_ARRAY]); + return $this->getContainer()->get(Connection::class)->fetchAllAssociative($sql, [self::KNOWN_FAILURE], [Connection::PARAM_STR_ARRAY]); } } diff --git a/tests/Functional/Models/Article/DetailTest.php b/tests/Functional/Models/Article/DetailTest.php index 18f785e9eb9..ef94461dace 100644 --- a/tests/Functional/Models/Article/DetailTest.php +++ b/tests/Functional/Models/Article/DetailTest.php @@ -116,15 +116,15 @@ public function testChangingOrderNumberRegexIsWorking(): void 'number' => '€SW100066@1', ], [ - 'regex' => '/^[\w-_.@€]+$/', + 'regex' => '/^[\w\-_.@€]+$/', 'number' => '@SW100066€1', ], [ - 'regex' => '/^[\w\s-_.@€]+$/', + 'regex' => '/^[\w\s\-_.@€]+$/', 'number' => '€SW1 00 066@1', ], [ - 'regex' => '/^[\w\u-_.@€]+$/', + 'regex' => '/^[\p{L}\p{N}\p{P}\p{S}]+$/u', 'number' => '€SW100💙066@1', ], ]; diff --git a/tests/Functional/Models/Category/BlogCategoryTreeListQueryTest.php b/tests/Functional/Models/Category/BlogCategoryTreeListQueryTest.php index da8f74e4845..2fb9ceecd39 100644 --- a/tests/Functional/Models/Category/BlogCategoryTreeListQueryTest.php +++ b/tests/Functional/Models/Category/BlogCategoryTreeListQueryTest.php @@ -45,8 +45,6 @@ class BlogCategoryTreeListQueryTest extends Enlight_Components_Test_TestCase 'position' => 0, 'blog' => false, 'childrenCount' => '1', - 'emotions' => null, - 'articles' => null, ], 1 => [ 'id' => 39, @@ -54,8 +52,6 @@ class BlogCategoryTreeListQueryTest extends Enlight_Components_Test_TestCase 'position' => 1, 'blog' => false, 'childrenCount' => '1', - 'emotions' => null, - 'articles' => null, ], ], 3 => [ @@ -65,8 +61,6 @@ class BlogCategoryTreeListQueryTest extends Enlight_Components_Test_TestCase 'position' => 5, 'blog' => true, 'childrenCount' => '0', - 'emotions' => null, - 'articles' => null, ], ], 39 => [ @@ -76,8 +70,6 @@ class BlogCategoryTreeListQueryTest extends Enlight_Components_Test_TestCase 'position' => 0, 'blog' => true, 'childrenCount' => '0', - 'emotions' => null, - 'articles' => null, ], ], ]; @@ -88,7 +80,7 @@ public function testQuery(): void $filter = [['property' => 'c.parentId', 'value' => $id]]; $query = $this->getRepo()->getBlogCategoryTreeListQuery($filter); $data = $this->removeDates($query->getArrayResult()); - static::assertEquals($data, $expected); + static::assertEquals($expected, $data); } } @@ -110,13 +102,17 @@ protected function removeDates(array $data): array { foreach ($data as &$subCategory) { unset($subCategory['changed'], $subCategory['cmsText'], $subCategory['added']); - foreach ($subCategory['emotions'] as &$emotion) { - unset($emotion['createDate'], $emotion['modified']); + if (isset($subCategory['emotions'])) { + foreach ($subCategory['emotions'] as &$emotion) { + unset($emotion['createDate'], $emotion['modified']); + } } unset($emotion); - foreach ($subCategory['articles'] as &$article) { - unset($article['added'], $article['changed'], $article['mainDetail']['releaseDate']); + if (isset($subCategory['articles'])) { + foreach ($subCategory['articles'] as &$article) { + unset($article['added'], $article['changed'], $article['mainDetail']['releaseDate']); + } } } diff --git a/tests/Functional/Models/CustomerStream/CustomerStreamRepositoryTest.php b/tests/Functional/Models/CustomerStream/CustomerStreamRepositoryTest.php index d618279c087..3f5a5ee2f28 100644 --- a/tests/Functional/Models/CustomerStream/CustomerStreamRepositoryTest.php +++ b/tests/Functional/Models/CustomerStream/CustomerStreamRepositoryTest.php @@ -118,7 +118,7 @@ private static function getCampaignsEntryData(): array } /** - * @return array{name: 'Teststream', static: false, description: 'Stream created for testing purposes', conditions: '{"Shopware\Bundle\CustomerSearchBundle\Condition\HasOrderCountCondition":{"minimumOrderCount":0}}', indexStream: true} + * @return array{name: 'Teststream', static: false, description: 'Stream created for testing purposes', conditions: string, indexStream: true} */ private static function getCustomerStreamData(): array { @@ -126,7 +126,7 @@ private static function getCustomerStreamData(): array 'name' => 'Teststream', 'static' => false, 'description' => 'Stream created for testing purposes', - 'conditions' => '{"Shopware\\Bundle\\CustomerSearchBundle\\Condition\\HasOrderCountCondition":{"minimumOrderCount":0}}', + 'conditions' => '{"Shopware\\\\Bundle\\\\CustomerSearchBundle\\\\Condition\\\\HasOrderCountCondition":{"minimumOrderCount":0}}', 'indexStream' => true, ]; } diff --git a/tests/Functional/Models/Order/OrderDocumentDocumentTest.php b/tests/Functional/Models/Order/OrderDocumentDocumentTest.php index e6503e40f92..de06b6f5634 100644 --- a/tests/Functional/Models/Order/OrderDocumentDocumentTest.php +++ b/tests/Functional/Models/Order/OrderDocumentDocumentTest.php @@ -35,11 +35,13 @@ use Shopware\Models\Order\Document\Document; use Shopware\Models\Shop\Shop; use Shopware\Tests\Functional\Traits\ContainerTrait; +use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour; use Shopware_Components_Document; class OrderDocumentDocumentTest extends Enlight_Components_Test_TestCase { use ContainerTrait; + use DatabaseTransactionBehaviour; private ModelManager $modelManager; @@ -72,6 +74,7 @@ public function testDocumentForInactiveSubshop(): void // Flush changed shop to the database, needed for the Document code $this->modelManager->flush($shop); + $document = null; try { /* * Used to fail with the following error before allowing inactive subshops diff --git a/tests/Functional/Modules/Articles/CompareTest.php b/tests/Functional/Modules/Articles/CompareTest.php index 7ee62f37313..87b0041293c 100644 --- a/tests/Functional/Modules/Articles/CompareTest.php +++ b/tests/Functional/Modules/Articles/CompareTest.php @@ -63,9 +63,9 @@ public function Module(): sArticles public function testDeleteComparison(): void { - $article = $this->getTestProductId(); - static::assertTrue($this->Module()->sAddComparison($article)); - $this->Module()->sDeleteComparison($article); + $productId = $this->getTestProductId(); + static::assertTrue($this->Module()->sAddComparison($productId)); + $this->Module()->sDeleteComparison($productId); static::assertEmpty($this->Module()->sGetComparisons()); } @@ -85,6 +85,14 @@ public function testAddComparison(): void static::assertNotEmpty($this->Module()->sGetComparisons()); } + public function testAddComparisonSameProductTwice(): void + { + $productId = $this->getTestProductId(); + static::assertTrue($this->Module()->sAddComparison($productId)); + static::assertTrue($this->Module()->sAddComparison($productId)); + static::assertCount(1, $this->Module()->sGetComparisons()); + } + public function testGetComparisons(): void { static::assertTrue($this->Module()->sAddComparison($this->getTestProductId())); diff --git a/tests/Functional/Modules/Articles/sGetArticleByIdTest.php b/tests/Functional/Modules/Articles/sGetArticleByIdTest.php index 131334bb992..32c80940b9c 100644 --- a/tests/Functional/Modules/Articles/sGetArticleByIdTest.php +++ b/tests/Functional/Modules/Articles/sGetArticleByIdTest.php @@ -3542,7 +3542,7 @@ private function assertArticleData(array $expected, array $data): void } static::assertEquals( - $expected[$property], + $expected[$property] ?? null, $data[$property], sprintf('Property %s dont match for article : %s - %s', $property, $expected['ordernumber'], $expected['articleName']) ); diff --git a/tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php b/tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php index d598601f6d1..adc790d68af 100644 --- a/tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php +++ b/tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php @@ -1,4 +1,6 @@ Container()->get(InstallerService::class); - /** @var Plugin $plugin */ $plugin = $pluginManager->getPluginByName('HttpCache'); $pluginManager->installPlugin($plugin); @@ -85,23 +88,23 @@ public static function tearDownAfterClass(): void */ public function setUp(): void { - $this->cacheTimeService = Shopware()->Container()->get(CacheTimeServiceInterface::class); - + $this->cacheTimeService = $this->getContainer()->get(CacheTimeServiceInterface::class); $this->defaultTime = 3600; + $this->modelManager = $this->getContainer()->get(ModelManager::class); Shopware()->Models()->clear(); } - public function testServiceIsAvailable() + public function testServiceIsAvailable(): void { static::assertInstanceOf(DynamicCacheTimeService::class, $this->cacheTimeService); } - public function testProductDetailTimeCalculation() + public function testProductDetailTimeCalculation(): void { $product = $this->createTestProduct(); $request = $this->getProductRequest($product); - Shopware()->Container()->get('front')->setRequest($request); + $this->getContainer()->get('front')->setRequest($request); /** * The release date of products only contains information about the day, not minutes or seconds, @@ -111,14 +114,14 @@ public function testProductDetailTimeCalculation() $productCacheTime = $this->cacheTimeService->getCacheTime($request); static::assertLessThanOrEqual($this->defaultTime, $productCacheTime); - Shopware()->Models()->remove($product); + $this->modelManager->remove($product); } - public function testCategoryTimeCalculation() + public function testCategoryTimeCalculation(): void { $category = $this->createTestCategory(); - $request = $this->getcategoryRequest($category); - Shopware()->Container()->get('front')->setRequest($request); + $request = $this->getCategoryRequest($category); + $this->getContainer()->get('front')->setRequest($request); /* * Test if the five minute time difference is correctly recognised by the CacheTimeService. @@ -129,14 +132,14 @@ public function testCategoryTimeCalculation() $emotionCacheTime = $this->cacheTimeService->getCacheTime($request); static::assertLessThan(5, abs(300 - $emotionCacheTime)); - Shopware()->Models()->remove($category); + $this->modelManager->remove($category); } - public function testBlogTimeCalculation() + public function testBlogTimeCalculation(): void { $blog = $this->createTestBlog(); $request = $this->getBlogRequest($blog); - Shopware()->Container()->get('front')->setRequest($request); + $this->getContainer()->get('front')->setRequest($request); /* * Test if the five minute time difference is correctly recognised by the CacheTimeService. @@ -147,14 +150,14 @@ public function testBlogTimeCalculation() $blogCacheTime = $this->cacheTimeService->getCacheTime($request); static::assertLessThan(5, abs(300 - $blogCacheTime)); - Shopware()->Models()->remove($blog); + $this->modelManager->remove($blog); } - public function testBlogListingTimeCalculation() + public function testBlogListingTimeCalculation(): void { $blog = $this->createTestBlogWithCategory(); $request = $this->getBlogListingRequest($blog); - Shopware()->Container()->get('front')->setRequest($request); + $this->getContainer()->get('front')->setRequest($request); /* * Test if the five minute time difference is correctly recognised by the CacheTimeService. @@ -165,13 +168,10 @@ public function testBlogListingTimeCalculation() $blogCacheTime = $this->cacheTimeService->getCacheTime($request); static::assertLessThan(5, abs(300 - $blogCacheTime)); - Shopware()->Models()->remove($blog); + $this->modelManager->remove($blog); } - /** - * @return Enlight_Controller_Request_RequestTestCase - */ - private function getBlogListingRequest(Blog $blog) + private function getBlogListingRequest(Blog $blog): Enlight_Controller_Request_RequestTestCase { $request = new Enlight_Controller_Request_RequestTestCase(); $request->setParams([ @@ -184,10 +184,7 @@ private function getBlogListingRequest(Blog $blog) return $request; } - /** - * @return Enlight_Controller_Request_RequestTestCase - */ - private function getBlogRequest(Blog $blog) + private function getBlogRequest(Blog $blog): Enlight_Controller_Request_RequestTestCase { $request = new Enlight_Controller_Request_RequestTestCase(); $request->setParams([ @@ -200,17 +197,14 @@ private function getBlogRequest(Blog $blog) return $request; } - /** - * @return Blog|null - */ - private function createTestBlog() + private function createTestBlog(): Blog { try { $blog = new Blog(); $blog->fromArray($this->getBlogTestData()); - Shopware()->Models()->persist($blog); - Shopware()->Models()->flush(); + $this->modelManager->persist($blog); + $this->modelManager->flush(); return $blog; } catch (Exception $e) { @@ -218,10 +212,7 @@ private function createTestBlog() } } - /** - * @return Blog|null - */ - private function createTestBlogWithCategory() + private function createTestBlogWithCategory(): Blog { try { $blog = $this->createTestBlog(); @@ -229,8 +220,8 @@ private function createTestBlogWithCategory() $blog->setCategoryId($blogCategory->getId()); - Shopware()->Models()->persist($blog); - Shopware()->Models()->flush(); + $this->modelManager->persist($blog); + $this->modelManager->flush(); return $blog; } catch (Exception $e) { @@ -238,10 +229,7 @@ private function createTestBlogWithCategory() } } - /** - * @return Enlight_Controller_Request_RequestTestCase - */ - private function getcategoryRequest(Category $category) + private function getCategoryRequest(Category $category): Enlight_Controller_Request_RequestTestCase { $request = new Enlight_Controller_Request_RequestTestCase(); $request->setParams([ @@ -254,17 +242,14 @@ private function getcategoryRequest(Category $category) return $request; } - /** - * @return Emotion|null - */ - private function createTestEmotion() + private function createTestEmotion(): Emotion { try { $emotion = new Emotion(); $emotion->fromArray($this->getEmotionTestData()); - Shopware()->Models()->persist($emotion); - Shopware()->Models()->flush(); + $this->modelManager->persist($emotion); + $this->modelManager->flush(); return $emotion; } catch (Exception $e) { @@ -272,16 +257,13 @@ private function createTestEmotion() } } - /** - * @return Category|null - */ - private function createTestCategory() + private function createTestCategory(): Category { try { $category = new Category(); - $category->setActive(1); + $category->setActive(true); $category->setName('MyTestCategory'); - $category->setParent(Shopware()->Models()->getRepository(Category::class)->find(1)); + $category->setParent($this->modelManager->getRepository(Category::class)->find(1)); $emotion = $this->createTestEmotion(); @@ -293,8 +275,8 @@ private function createTestCategory() new ArrayCollection([$emotion]) ); - Shopware()->Models()->persist($category); - Shopware()->Models()->flush(); + $this->modelManager->persist($category); + $this->modelManager->flush(); return $category; } catch (Exception $e) { @@ -302,11 +284,9 @@ private function createTestCategory() } } - /** - * @return Enlight_Controller_Request_RequestTestCase - */ - private function getProductRequest(Article $product) + private function getProductRequest(Product $product): Enlight_Controller_Request_RequestTestCase { + static::assertInstanceOf(Detail::class, $product->getMainDetail()); $request = new Enlight_Controller_Request_RequestTestCase(); $request->setParams([ 'module' => 'frontend', @@ -319,13 +299,10 @@ private function getProductRequest(Article $product) return $request; } - /** - * @return Article|null - */ - private function createTestProduct() + private function createTestProduct(): Product { try { - $product = new Article(); + $product = new Product(); $product->fromArray($this->getProductTestData()); /* @@ -333,12 +310,13 @@ private function createTestProduct() * so the timestamp "five minutes from now" will evaluate to the previous midnight. * Therefore we need to add another day, so it'll evaluate to the next midnight. */ + static::assertInstanceOf(Detail::class, $product->getMainDetail()); $product->getMainDetail()->setReleaseDate((new DateTime())->add( new DateInterval('P1D') )); - Shopware()->Models()->persist($product); - Shopware()->Models()->flush(); + $this->modelManager->persist($product); + $this->modelManager->flush(); return $product; } catch (Exception $e) { @@ -347,18 +325,18 @@ private function createTestProduct() } /** - * @return array + * @return array */ - private function getProductTestData() + private function getProductTestData(): array { return [ - 'name' => 'Testarticle', - 'description' => 'testdescription', + 'name' => 'Test product', + 'description' => 'test description', 'descriptionLong' => 'Test descriptionLong', 'active' => true, 'pseudoSales' => 999, 'highlight' => true, - 'keywords' => 'test, testarticle', + 'keywords' => 'test, testproduct', 'taxId' => 1, 'mainDetail' => [ 'active' => 1, @@ -369,9 +347,9 @@ private function getProductTestData() } /** - * @return array + * @return array */ - private function getEmotionTestData() + private function getEmotionTestData(): array { return [ 'active' => 1, @@ -392,9 +370,9 @@ private function getEmotionTestData() } /** - * @return array + * @return array */ - private function getBlogTestData() + private function getBlogTestData(): array { return [ 'title' => 'MyTestBlog', @@ -406,10 +384,7 @@ private function getBlogTestData() ]; } - /** - * @return DateTime - */ - private function getTimestampFiveMinutesFromNow() + private function getTimestampFiveMinutesFromNow(): DateTime { return (new DateTime())->add(new DateInterval('PT5M')); } From 36e13ddac62565d4703a0693884ee65f1b21ce89 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Tue, 27 Jun 2023 10:28:38 +0200 Subject: [PATCH 419/730] fix(SW-27005): Fix notices and warnings in engine/Library classes --- .phpstan-baseline.neon | 135 ------------------ engine/Library/Enlight/Components/Auth.php | 4 +- .../Controller/Plugins/Json/Bootstrap.php | 36 +++-- .../Plugins/JsonRequest/Bootstrap.php | 36 +++-- .../Plugins/ScriptRenderer/Bootstrap.php | 7 +- .../Enlight/Controller/Request/Request.php | 2 +- .../Controller/Request/RequestHttp.php | 4 +- engine/Library/Enlight/Plugin/Bootstrap.php | 16 ++- .../Template/Plugins/modifier.count.php | 9 +- .../smarty_internal_configfilelexer.php | 12 +- .../sysplugins/smarty_internal_data.php | 1 + .../sysplugins/smarty_internal_template.php | 4 +- .../smarty_internal_templatebase.php | 2 +- .../smarty_internal_templatelexer.php | 4 +- engine/Library/Zend/Auth/Adapter/DbTable.php | 9 +- engine/Library/Zend/Config.php | 8 +- engine/Library/Zend/Db/Table/Row/Abstract.php | 5 + engine/Library/Zend/Http/Response.php | 4 +- engine/Library/Zend/Mail.php | 3 + .../Components/Auth/Adapter/Default.php | 3 + .../Default/Core/HttpCache/Bootstrap.php | 4 +- .../Plugins/Default/Core/System/Bootstrap.php | 6 +- 22 files changed, 117 insertions(+), 197 deletions(-) diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index 7bfec3b74a3..a3c4d67a546 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -2045,16 +2045,6 @@ parameters: count: 1 path: engine/Library/Enlight/Controller/Front.php - - - message: "#^Method Enlight_Controller_Plugins_Json_Bootstrap\\:\\:convertDateTime\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php - - - - message: "#^Method Enlight_Controller_Plugins_Json_Bootstrap\\:\\:convertDateTime\\(\\) has parameter \\$key with no type specified\\.$#" - count: 1 - path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php - - message: "#^Method Enlight_Controller_Plugins_Json_Bootstrap\\:\\:convertToJson\\(\\) has parameter \\$data with no type specified\\.$#" count: 1 @@ -2075,86 +2065,16 @@ parameters: count: 1 path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php - - - message: "#^Method Enlight_Controller_Plugins_Json_Bootstrap\\:\\:init\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php - - - - message: "#^Method Enlight_Controller_Plugins_Json_Bootstrap\\:\\:onPostDispatch\\(\\) should return bool but empty return statement found\\.$#" - count: 2 - path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php - - - - message: "#^Method Enlight_Controller_Plugins_Json_Bootstrap\\:\\:onPostDispatch\\(\\) should return bool but return statement is missing\\.$#" - count: 1 - path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php - - message: "#^Possibly invalid array key type array\\|string\\.$#" count: 1 path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php - - - message: "#^Property Enlight_Controller_Plugins_Json_Bootstrap\\:\\:\\$padding \\(string\\) does not accept bool\\.$#" - count: 1 - path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php - - - - message: "#^Property Enlight_Controller_Plugins_Json_Bootstrap\\:\\:\\$padding \\(string\\) does not accept null\\.$#" - count: 1 - path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php - - - - message: "#^Property Enlight_Controller_Plugins_Json_Bootstrap\\:\\:\\$padding \\(string\\) does not accept string\\|null\\.$#" - count: 1 - path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php - - - - message: "#^Property Enlight_Controller_Plugins_Json_Bootstrap\\:\\:\\$renderer \\(bool\\) does not accept null\\.$#" - count: 1 - path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php - - - - message: "#^Method Enlight_Controller_Plugins_JsonRequest_Bootstrap\\:\\:getPadding\\(\\) should return string but returns bool\\.$#" - count: 1 - path: engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php - - - - message: "#^Method Enlight_Controller_Plugins_JsonRequest_Bootstrap\\:\\:init\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php - - - - message: "#^Method Enlight_Controller_Plugins_JsonRequest_Bootstrap\\:\\:onPreDispatch\\(\\) should return bool but return statement is missing\\.$#" - count: 1 - path: engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php - - - - message: "#^Method Enlight_Controller_Plugins_JsonRequest_Bootstrap\\:\\:setPadding\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php - - - - message: "#^Method Enlight_Controller_Plugins_JsonRequest_Bootstrap\\:\\:setPadding\\(\\) has parameter \\$padding with no type specified\\.$#" - count: 1 - path: engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php - - message: "#^Method Enlight_Controller_Plugins_JsonRequest_Bootstrap\\:\\:setParseParams\\(\\) has parameter \\$parseParams with no value type specified in iterable type array\\.$#" count: 1 path: engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php - - - message: "#^Parameter \\#1 \\$spec of method Enlight_Controller_Request_RequestHttp\\:\\:setPost\\(\\) expects array\\|string, bool given\\.$#" - count: 1 - path: engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php - - - - message: "#^Property Enlight_Controller_Plugins_JsonRequest_Bootstrap\\:\\:\\$padding \\(bool\\) does not accept null\\.$#" - count: 1 - path: engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php - - message: "#^Property Enlight_Controller_Plugins_JsonRequest_Bootstrap\\:\\:\\$parseParams type has no value type specified in iterable type array\\.$#" count: 1 @@ -3185,21 +3105,6 @@ parameters: count: 1 path: engine/Library/Enlight/Loader.php - - - message: "#^Method Enlight_Plugin_Bootstrap\\:\\:afterInit\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Library/Enlight/Plugin/Bootstrap.php - - - - message: "#^Method Enlight_Plugin_Bootstrap\\:\\:get\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Library/Enlight/Plugin/Bootstrap.php - - - - message: "#^Property Enlight_Plugin_Bootstrap\\:\\:\\$collection \\(Enlight_Plugin_PluginCollection\\) does not accept Enlight_Plugin_PluginCollection\\|null\\.$#" - count: 1 - path: engine/Library/Enlight/Plugin/Bootstrap.php - - message: "#^Method Enlight_Plugin_Bootstrap_Config\\:\\:install\\(\\) should return bool but return statement is missing\\.$#" count: 1 @@ -3775,16 +3680,6 @@ parameters: count: 1 path: engine/Library/Enlight/Template/Plugins/modifier.array_unset.php - - - message: "#^Function smarty_modifier_count\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Library/Enlight/Template/Plugins/modifier.count.php - - - - message: "#^Function smarty_modifier_count\\(\\) has parameter \\$value with no type specified\\.$#" - count: 1 - path: engine/Library/Enlight/Template/Plugins/modifier.count.php - - message: "#^Parameter \\#1 \\$date of class Zend_Date constructor expects array\\|int\\|string\\|Zend_Date\\|null, DateTime\\|int\\|false given\\.$#" count: 1 @@ -14315,11 +14210,6 @@ parameters: count: 1 path: engine/Shopware/Components/Auth.php - - - message: "#^Cannot access property \\$username on bool\\|stdClass\\.$#" - count: 1 - path: engine/Shopware/Components/Auth/Adapter/Default.php - - message: "#^Method Shopware_Components_Auth_Adapter_Default\\:\\:_authenticateValidateResult\\(\\) has parameter \\$resultIdentity with no value type specified in iterable type array\\.$#" count: 1 @@ -34225,11 +34115,6 @@ parameters: count: 1 path: engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php - - - message: "#^Method Shopware_Plugins_Backend_SwagUpdate_Bootstrap\\:\\:afterInit\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Bootstrap.php - - message: "#^Method Shopware_Plugins_Backend_SwagUpdate_Bootstrap\\:\\:onBackendIndexPostDispatch\\(\\) has no return type specified\\.$#" count: 1 @@ -34710,11 +34595,6 @@ parameters: count: 1 path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - - message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:afterInit\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:disableControllerCache\\(\\) has no return type specified\\.$#" count: 1 @@ -35490,11 +35370,6 @@ parameters: count: 1 path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php - - - message: "#^Method Shopware_Plugins_Core_RestApi_Bootstrap\\:\\:afterInit\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php - - message: "#^Method Shopware_Plugins_Core_RestApi_Bootstrap\\:\\:onDispatchLoopStartup\\(\\) has no return type specified\\.$#" count: 1 @@ -35530,16 +35405,6 @@ parameters: count: 1 path: engine/Shopware/Plugins/Default/Core/RestApi/Components/Router.php - - - message: "#^Method Shopware_Plugins_Core_System_Bootstrap\\:\\:onDispatchLoopShutdown\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/System/Bootstrap.php - - - - message: "#^Parameter \\#1 \\$userAgent of method Shopware_Plugins_Frontend_Statistics_Bootstrap\\:\\:checkIsBot\\(\\) expects string, string\\|false given\\.$#" - count: 2 - path: engine/Shopware/Plugins/Default/Core/System/Bootstrap.php - - message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getRequest\\(\\)\\.$#" count: 1 diff --git a/engine/Library/Enlight/Components/Auth.php b/engine/Library/Enlight/Components/Auth.php index ce19e43a3d3..9ca13d4dd9b 100644 --- a/engine/Library/Enlight/Components/Auth.php +++ b/engine/Library/Enlight/Components/Auth.php @@ -72,7 +72,9 @@ public function authenticate(?Zend_Auth_Adapter_Interface $adapter = null) if ($result->isValid() && method_exists($adapter, 'getResultRowObject')) { $user = $adapter->getResultRowObject(); - $this->getStorage()->write($user); + if (\is_object($user)) { + $this->getStorage()->write($user); + } } else { $this->getStorage()->clear(); } diff --git a/engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php b/engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php index bc187649e82..6023a3aa1a9 100644 --- a/engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php +++ b/engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php @@ -49,7 +49,7 @@ class Enlight_Controller_Plugins_Json_Bootstrap extends Enlight_Plugin_Bootstrap /** * Should the JSON object be encapsulated into a javascript function * - * @var string + * @var bool|string|null */ protected $padding; @@ -62,6 +62,8 @@ class Enlight_Controller_Plugins_Json_Bootstrap extends Enlight_Plugin_Bootstrap /** * Initializes this plugin. This Plugin should run after the ViewRenderer Plugin + * + * @return void */ public function init() { @@ -79,11 +81,15 @@ public function init() /** * Called from the Event Manager after the dispatch process * - * @return bool + * @return void */ public function onPostDispatch(Enlight_Event_EventArgs $args) { $subject = $args->get('subject'); + if (!$subject instanceof Enlight_Controller_Action) { + return; + } + $response = $subject->Response(); $request = $subject->Request(); @@ -100,7 +106,7 @@ public function onPostDispatch(Enlight_Event_EventArgs $args) // decide if we should render the data or the whole page if ($this->renderer === true) { $content = $subject->View()->getAssign(); - } elseif (!empty($this->padding)) { + } elseif (\is_string($this->padding) && $this->padding !== '') { $content = $response->getBody(); } else { return; @@ -109,7 +115,7 @@ public function onPostDispatch(Enlight_Event_EventArgs $args) // Convert content to json $content = $this->convertToJson($content); - if (!empty($this->padding)) { + if (\is_string($this->padding) && $this->padding !== '') { $response->setHeader('Content-type', 'text/javascript', true); $response->setBody($this->addPadding($content, $this->padding)); } elseif ($this->renderer === true) { @@ -119,7 +125,7 @@ public function onPostDispatch(Enlight_Event_EventArgs $args) $this->padding = null; $this->encoding = 'UTF-8'; - $this->renderer = null; + $this->renderer = false; } /** @@ -142,7 +148,7 @@ public function setPadding($padding = true) /** * Returns the Value set by setPadding() * - * @return string + * @return bool|string|null */ public function getPadding() { @@ -162,10 +168,13 @@ public function setRenderer($renderer = true) $this->renderer = (bool) $renderer; if ($this->renderer === true) { - /** @var Enlight_Controller_Plugins_ViewRenderer_Bootstrap $viewRenderer */ - $viewRenderer = $this->Collection()->get('ViewRenderer'); - // Disable the default renderer - $viewRenderer->setNoRender(true); + $collection = $this->Collection(); + if ($collection !== null) { + /** @var Enlight_Controller_Plugins_ViewRenderer_Bootstrap $viewRenderer */ + $viewRenderer = $collection->get('ViewRenderer'); + // Disable the default renderer + $viewRenderer->setNoRender(true); + } } return $this; @@ -241,11 +250,14 @@ protected function convertToJson($data) /** * Converts date time objects * - * @param DateTime $value + * @param DateTimeInterface $value + * @param array-key $key + * + * @return void */ protected static function convertDateTime(&$value, $key) { - if ($value instanceof DateTime) { + if ($value instanceof DateTimeInterface) { $value = 'Date(' . (int) $value->getTimestamp() . '000)'; } } diff --git a/engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php b/engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php index 19daca2c475..4467df990b9 100644 --- a/engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php +++ b/engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php @@ -35,7 +35,7 @@ class Enlight_Controller_Plugins_JsonRequest_Bootstrap extends Enlight_Plugin_Bootstrap_Default { /** - * @var bool + * @var string|null */ protected $padding; @@ -51,6 +51,8 @@ class Enlight_Controller_Plugins_JsonRequest_Bootstrap extends Enlight_Plugin_Bo /** * Init this plugin. This Plugin should run before the dispatching process. + * + * @return void */ public function init() { @@ -67,7 +69,7 @@ public function init() * Called from the event manager before the dispatch process. * Parse the json input data, when it was activated. * - * @return bool + * @return void */ public function onPreDispatch(Enlight_Event_EventArgs $args) { @@ -76,13 +78,15 @@ public function onPreDispatch(Enlight_Event_EventArgs $args) $request = $subject->Request(); // Parses the json input data, if the content type is correct + $contentType = $request->getHeader('Content-Type'); + $input = $request->getRawBody(); if ( $this->parseInput === true - && ($contentType = $request->getHeader('Content-Type')) !== false - && strpos($contentType, 'application/json') === 0 - && ($input = $request->getRawBody()) !== false + && \is_string($contentType) + && str_starts_with($contentType, 'application/json') + && \is_string($input) ) { - if ($input != '') { + if ($input !== '') { $input = Zend_Json::decode($input); } else { $input = null; @@ -102,7 +106,8 @@ public function onPreDispatch(Enlight_Event_EventArgs $args) // Parse the json Params if (\count($this->parseParams)) { foreach ($this->parseParams as $Param) { - if (($value = $request->getParam($Param)) !== null) { + $value = $request->getParam($Param); + if ($value !== null) { $value = Zend_Json::decode($value); $request->setParam($Param, $value); } @@ -121,7 +126,7 @@ public function onPreDispatch(Enlight_Event_EventArgs $args) * * @param bool $parseInput * - * @return Enlight_Controller_Plugins_JsonRequest_Bootstrap + * @return $this */ public function setParseInput($parseInput = true) { @@ -136,7 +141,7 @@ public function setParseInput($parseInput = true) * * @param array $parseParams * - * @return Enlight_Controller_Plugins_JsonRequest_Bootstrap + * @return $this */ public function setParseParams($parseParams = []) { @@ -145,11 +150,12 @@ public function setParseParams($parseParams = []) return $this; } - /* - * @param bool $padding - * @return Enlight_Controller_Plugins_Json_Bootstrap - */ - public function setPadding($padding = true) + /** + * @param string $padding + * + * @return $this + */ + public function setPadding($padding = '1') { $this->padding = $padding; @@ -159,7 +165,7 @@ public function setPadding($padding = true) /** * Returns the Value set by setPadding() * - * @return string + * @return string|null */ public function getPadding() { diff --git a/engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php b/engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php index e19a0ebb81b..0f52b3d893f 100644 --- a/engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php +++ b/engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php @@ -144,7 +144,7 @@ public function getTemplateName() $fileNames = (array) $request->getParam('file', $this->defaultFile); if (empty($fileNames)) { $fileNames = $request->getParam('f'); - $fileNames = explode('|', $fileNames); + $fileNames = explode('|', (string) $fileNames); } $templateNames = []; @@ -198,7 +198,10 @@ public function getTemplateName() public function setViewRenderer(?Enlight_Controller_Plugins_ViewRenderer_Bootstrap $viewRenderer = null) { if ($viewRenderer === null) { - $viewRenderer = $this->Collection()->get('ViewRenderer'); + $collection = $this->Collection(); + if ($collection !== null) { + $viewRenderer = $collection->get('ViewRenderer'); + } } $this->viewRenderer = $viewRenderer; diff --git a/engine/Library/Enlight/Controller/Request/Request.php b/engine/Library/Enlight/Controller/Request/Request.php index 5a027e4faee..cf642009532 100644 --- a/engine/Library/Enlight/Controller/Request/Request.php +++ b/engine/Library/Enlight/Controller/Request/Request.php @@ -628,7 +628,7 @@ public function setRequestUri($requestUri = null); * * @throws \Exception * - * @return string|false HTTP header value, or false if not found + * @return string|false|null HTTP header value, or false if not found */ public function getHeader($header); diff --git a/engine/Library/Enlight/Controller/Request/RequestHttp.php b/engine/Library/Enlight/Controller/Request/RequestHttp.php index 89f3d5371d5..3f62c2280ec 100644 --- a/engine/Library/Enlight/Controller/Request/RequestHttp.php +++ b/engine/Library/Enlight/Controller/Request/RequestHttp.php @@ -843,7 +843,7 @@ public function isFlashRequest() trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8', __CLASS__, __METHOD__), E_USER_DEPRECATED); $userAgent = $this->getHeader('USER_AGENT'); - if ($userAgent === false) { + if (empty($userAgent)) { return false; } $header = strtolower($userAgent); @@ -869,7 +869,7 @@ public function getHeader($header) return $this->server->get('HTTP_' . $temp); } - if (strpos($temp, 'CONTENT_') === 0 && $this->server->has($temp)) { + if (str_starts_with($temp, 'CONTENT_') && $this->server->has($temp)) { return $this->server->get($temp); } diff --git a/engine/Library/Enlight/Plugin/Bootstrap.php b/engine/Library/Enlight/Plugin/Bootstrap.php index 1deb1a87cae..1c5fd761102 100644 --- a/engine/Library/Enlight/Plugin/Bootstrap.php +++ b/engine/Library/Enlight/Plugin/Bootstrap.php @@ -36,7 +36,7 @@ abstract class Enlight_Plugin_Bootstrap extends Enlight_Class protected $name; /** - * @var Enlight_Plugin_PluginCollection Contains an instance of the Enlight_Plugin_PluginCollection + * @var Enlight_Plugin_PluginCollection|null Contains an instance of the Enlight_Plugin_PluginCollection */ protected $collection; @@ -54,6 +54,8 @@ public function __construct($name) /** * Is executed after the collection has been added. + * + * @return void */ public function afterInit() { @@ -85,7 +87,7 @@ public function setCollection(?Enlight_Plugin_PluginCollection $collection = nul /** * Getter method for the collection property. * - * @return Enlight_Plugin_PluginCollection + * @return Enlight_Plugin_PluginCollection|null */ public function Collection() { @@ -99,6 +101,10 @@ public function Collection() */ public function Application() { + if (!$this->collection instanceof Enlight_Plugin_PluginCollection) { + throw new RuntimeException('Could not get "Application". Plugin collection is not set.'); + } + return $this->collection->Application(); } @@ -106,9 +112,15 @@ public function Application() * Get service from resource loader * * @param string $name + * + * @return mixed|object|null */ public function get($name) { + if (!$this->collection instanceof Enlight_Plugin_PluginCollection) { + throw new RuntimeException(sprintf('Could not get "%s". Plugin collection is not set.', $name)); + } + return $this->collection->Application()->Container()->get($name); } } diff --git a/engine/Library/Enlight/Template/Plugins/modifier.count.php b/engine/Library/Enlight/Template/Plugins/modifier.count.php index 1670aae1990..40566a7f0c9 100644 --- a/engine/Library/Enlight/Template/Plugins/modifier.count.php +++ b/engine/Library/Enlight/Template/Plugins/modifier.count.php @@ -19,14 +19,13 @@ /** * Overwrites the default smarty count modifier for PHP8 compatibility reasons + * + * @param mixed|null $value + * + * @return int */ function smarty_modifier_count($value) { - // PHP version is below 8.0.0, use default behavior - if (\PHP_VERSION_ID < 80000) { - return \count($value); - } - // Neither a countable object nor an array if (!\is_array($value) && !($value instanceof Countable)) { return 0; diff --git a/engine/Library/Smarty/sysplugins/smarty_internal_configfilelexer.php b/engine/Library/Smarty/sysplugins/smarty_internal_configfilelexer.php index f5fa3f2ea45..2700f1dc112 100644 --- a/engine/Library/Smarty/sysplugins/smarty_internal_configfilelexer.php +++ b/engine/Library/Smarty/sysplugins/smarty_internal_configfilelexer.php @@ -92,7 +92,7 @@ function yylex1() $yy_global_pattern = "/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, 0, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { @@ -204,7 +204,7 @@ function yylex2() $yy_global_pattern = "/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, 0, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { @@ -325,7 +325,7 @@ function yylex3() $yy_global_pattern = "/\G([^\n]+?(?=[ \t\r]*\n))/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, 0, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { @@ -394,7 +394,7 @@ function yylex4() $yy_global_pattern = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, 0, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { @@ -472,7 +472,7 @@ function yylex5() $yy_global_pattern = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, 0, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { @@ -544,7 +544,7 @@ function yylex6() $yy_global_pattern = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, 0, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { diff --git a/engine/Library/Smarty/sysplugins/smarty_internal_data.php b/engine/Library/Smarty/sysplugins/smarty_internal_data.php index df4f74b51b6..4f43dce5763 100644 --- a/engine/Library/Smarty/sysplugins/smarty_internal_data.php +++ b/engine/Library/Smarty/sysplugins/smarty_internal_data.php @@ -464,6 +464,7 @@ public function __construct ($_parent = null, $smarty = null) * @package Smarty * @subpackage Template */ +#[AllowDynamicProperties] class Smarty_Variable { /** diff --git a/engine/Library/Smarty/sysplugins/smarty_internal_template.php b/engine/Library/Smarty/sysplugins/smarty_internal_template.php index 8059a5d57d4..53b37aa4550 100644 --- a/engine/Library/Smarty/sysplugins/smarty_internal_template.php +++ b/engine/Library/Smarty/sysplugins/smarty_internal_template.php @@ -241,7 +241,7 @@ public function writeCachedContent($content) * @param integer $cache_lifetime life time of cache data * @param array $vars optional variables to assign * @param int $parent_scope scope in which {include} should execute - * @returns string template content + * @return string template content */ public function getSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope) { @@ -298,7 +298,7 @@ public function getSubTemplate($template, $cache_id, $compile_id, $caching, $cac * @param array $vars optional variables to assign * @param int $parent_scope scope in which {include} should execute * @param string $hash nocache hash code - * @returns string template content + * @return string template content */ public function setupInlineSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope, $hash) { diff --git a/engine/Library/Smarty/sysplugins/smarty_internal_templatebase.php b/engine/Library/Smarty/sysplugins/smarty_internal_templatebase.php index 416b5bf239e..ef38afac01f 100644 --- a/engine/Library/Smarty/sysplugins/smarty_internal_templatebase.php +++ b/engine/Library/Smarty/sysplugins/smarty_internal_templatebase.php @@ -402,7 +402,7 @@ public function isCached($template = null, $cache_id = null, $compile_id = null, * creates a data object * * @param object $parent next higher level of Smarty variables - * @returns Smarty_Data data object + * @return Smarty_Data data object */ public function createData($parent = null) { diff --git a/engine/Library/Smarty/sysplugins/smarty_internal_templatelexer.php b/engine/Library/Smarty/sysplugins/smarty_internal_templatelexer.php index 5285f6392b6..00241b0d22c 100644 --- a/engine/Library/Smarty/sysplugins/smarty_internal_templatelexer.php +++ b/engine/Library/Smarty/sysplugins/smarty_internal_templatelexer.php @@ -916,7 +916,7 @@ function yylex3() $yy_global_pattern = "/\G(".$this->ldel."\\s*literal\\s*".$this->rdel.")|\G(".$this->ldel."\\s*\/literal\\s*".$this->rdel.")|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(<%)|\G(%>)|\G([\S\s])/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, 0, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { @@ -1046,7 +1046,7 @@ function yylex4() $yy_global_pattern = "/\G(".$this->ldel."\\s{1,}\/)|\G(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|\G(".$this->ldel."\\s*for\\s+)|\G(".$this->ldel."\\s*foreach(?![^\s]))|\G(".$this->ldel."\\s{1,})|\G(".$this->ldel."\/)|\G(".$this->ldel.")|\G(\")|\G(`\\$)|\G(\\$[0-9]*[a-zA-Z_]\\w*)|\G(\\$)|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(".$this->ldel."|\\$|`\\$|\")))|\G([\S\s])/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, 0, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { diff --git a/engine/Library/Zend/Auth/Adapter/DbTable.php b/engine/Library/Zend/Auth/Adapter/DbTable.php index 5bc6fab7e66..8b39e8b950d 100644 --- a/engine/Library/Zend/Auth/Adapter/DbTable.php +++ b/engine/Library/Zend/Auth/Adapter/DbTable.php @@ -297,7 +297,7 @@ public function getDbSelect() * @param string|array $returnColumns * @param string|array $omitColumns * - * @return stdClass|bool + * @return stdClass|false */ public function getResultRowObject($returnColumns = null, $omitColumns = null) { @@ -308,15 +308,16 @@ public function getResultRowObject($returnColumns = null, $omitColumns = null) $returnObject = new stdClass(); if ($returnColumns !== null) { - $availableColumns = array_keys($this->_resultRow); foreach ((array) $returnColumns as $returnColumn) { - if (in_array($returnColumn, $availableColumns)) { + if (array_key_exists($returnColumn, $this->_resultRow)) { $returnObject->{$returnColumn} = $this->_resultRow[$returnColumn]; } } return $returnObject; - } elseif ($omitColumns !== null) { + } + + if ($omitColumns !== null) { $omitColumns = (array) $omitColumns; foreach ($this->_resultRow as $resultColumn => $resultValue) { if (!in_array($resultColumn, $omitColumns)) { diff --git a/engine/Library/Zend/Config.php b/engine/Library/Zend/Config.php index 33f78e6ef89..90446353788 100644 --- a/engine/Library/Zend/Config.php +++ b/engine/Library/Zend/Config.php @@ -243,6 +243,7 @@ public function __unset($name) * * @return int */ + #[\ReturnTypeWillChange] public function count() { return $this->_count; @@ -253,6 +254,7 @@ public function count() * * @return mixed */ + #[\ReturnTypeWillChange] public function current() { $this->_skipNextIteration = false; @@ -264,6 +266,7 @@ public function current() * * @return mixed */ + #[\ReturnTypeWillChange] public function key() { return key($this->_data); @@ -273,6 +276,7 @@ public function key() * Defined by Iterator interface * */ + #[\ReturnTypeWillChange] public function next() { if ($this->_skipNextIteration) { @@ -287,6 +291,7 @@ public function next() * Defined by Iterator interface * */ + #[\ReturnTypeWillChange] public function rewind() { $this->_skipNextIteration = false; @@ -299,6 +304,7 @@ public function rewind() * * @return boolean */ + #[\ReturnTypeWillChange] public function valid() { return $this->_index < $this->_count; @@ -478,4 +484,4 @@ protected function _arrayMergeRecursive($firstArray, $secondArray) return $firstArray; } -} \ No newline at end of file +} diff --git a/engine/Library/Zend/Db/Table/Row/Abstract.php b/engine/Library/Zend/Db/Table/Row/Abstract.php index 245f117546c..36fce697b2b 100644 --- a/engine/Library/Zend/Db/Table/Row/Abstract.php +++ b/engine/Library/Zend/Db/Table/Row/Abstract.php @@ -256,6 +256,7 @@ public function __wakeup() * @param string $offset * @return boolean */ + #[\ReturnTypeWillChange] public function offsetExists($offset) { return $this->__isset($offset); @@ -268,6 +269,7 @@ public function offsetExists($offset) * @param string $offset * @return string */ + #[\ReturnTypeWillChange] public function offsetGet($offset) { return $this->__get($offset); @@ -280,6 +282,7 @@ public function offsetGet($offset) * @param string $offset * @param mixed $value */ + #[\ReturnTypeWillChange] public function offsetSet($offset, $value) { $this->__set($offset, $value); @@ -291,6 +294,7 @@ public function offsetSet($offset, $value) * * @param string $offset */ + #[\ReturnTypeWillChange] public function offsetUnset($offset) { return $this->__unset($offset); @@ -629,6 +633,7 @@ public function delete() return $result; } + #[\ReturnTypeWillChange] public function getIterator() { return new ArrayIterator((array) $this->_data); diff --git a/engine/Library/Zend/Http/Response.php b/engine/Library/Zend/Http/Response.php index c195fa76ecf..b6950101b28 100644 --- a/engine/Library/Zend/Http/Response.php +++ b/engine/Library/Zend/Http/Response.php @@ -252,7 +252,7 @@ public function getBody() $body = ''; // Decode the body if it was transfer-encoded - switch (strtolower($this->getHeader('transfer-encoding'))) { + switch (strtolower($this->getHeader('transfer-encoding') ?? '')) { // Handle chunked body case 'chunked': @@ -267,7 +267,7 @@ public function getBody() } // Decode any content-encoding (gzip or deflate) if needed - switch (strtolower($this->getHeader('content-encoding'))) { + switch (strtolower($this->getHeader('content-encoding') ?? '')) { // Handle gzip encoding case 'gzip': diff --git a/engine/Library/Zend/Mail.php b/engine/Library/Zend/Mail.php index 5e292560bc5..f552001a2f1 100644 --- a/engine/Library/Zend/Mail.php +++ b/engine/Library/Zend/Mail.php @@ -1205,6 +1205,9 @@ protected function _filterEmail($email) */ protected function _filterName($name) { + if (empty($name)) { + return ''; + } $rule = array("\r" => '', "\n" => '', "\t" => '', diff --git a/engine/Shopware/Components/Auth/Adapter/Default.php b/engine/Shopware/Components/Auth/Adapter/Default.php index 0f20ec442a3..f75c202d24c 100644 --- a/engine/Shopware/Components/Auth/Adapter/Default.php +++ b/engine/Shopware/Components/Auth/Adapter/Default.php @@ -225,6 +225,9 @@ protected function updateExpiry() } $user = $this->getResultRowObject(); + if (!\is_object($user)) { + return; + } $this->_zendDb->update( $this->_tableName, diff --git a/engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php index 077c13b2ca2..6c3620f8d8e 100644 --- a/engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php @@ -865,11 +865,11 @@ private function addSurrogateControl(Response $response) private function hasSurrogateEsiCapability(Request $request): bool { $value = $request->getHeader('Surrogate-Capability'); - if ($value === false) { + if (empty($value)) { return false; } - return strpos($value, 'ESI/1.0') !== false; + return str_contains($value, 'ESI/1.0'); } /** diff --git a/engine/Shopware/Plugins/Default/Core/System/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/System/Bootstrap.php index f9b56d3f609..57ebf7478c7 100644 --- a/engine/Shopware/Plugins/Default/Core/System/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Core/System/Bootstrap.php @@ -53,6 +53,8 @@ public function install() /** * Listener method of the Enlight_Controller_Front_DispatchLoopShutdown event. * If the request is from a Bot, discard the session + * + * @return void */ public function onDispatchLoopShutdown(Enlight_Controller_EventArgs $args) { @@ -67,7 +69,7 @@ public function onDispatchLoopShutdown(Enlight_Controller_EventArgs $args) /** @var Shopware_Plugins_Frontend_Statistics_Bootstrap $plugin */ $plugin = Shopware()->Plugins()->Frontend()->Statistics(); - if ($plugin->checkIsBot($args->getRequest()->getHeader('USER_AGENT'))) { + if ($plugin->checkIsBot($args->getRequest()->getHeader('USER_AGENT') ?: '')) { $this->get('session')->invalidate(); } } @@ -97,7 +99,7 @@ public function onInitResourceSystem(Enlight_Event_EventArgs $args) if ($request !== null && Shopware()->Session()->get('Bot') === null) { /** @var Shopware_Plugins_Frontend_Statistics_Bootstrap $plugin */ $plugin = Shopware()->Plugins()->Frontend()->Statistics(); - Shopware()->Session()->set('Bot', $plugin->checkIsBot($request->getHeader('USER_AGENT'))); + Shopware()->Session()->set('Bot', $plugin->checkIsBot($request->getHeader('USER_AGENT') ?: '')); } $system->sBotSession = Shopware()->Session()->get('Bot'); } From edef67f05f69b4f4883d6cc7e1c689fe759c5b98 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Tue, 27 Jun 2023 10:59:38 +0200 Subject: [PATCH 420/730] fix(SW-27005): Fix notices and warnings in Shopware bundle classes --- .phpstan-baseline.neon | 50 ------------------ .../Form/Account/AddressFormType.php | 2 +- .../StoreFrontCustomerGreetingService.php | 50 +++++++++--------- ...eFrontCustomerGreetingServiceInterface.php | 2 +- .../Repository/Reader/OrderReader.php | 4 +- .../CookieBundle/Services/CookieHandler.php | 2 +- .../Indexing/CustomerOrderHydrator.php | 44 +++++++++------- .../Product/ProductProvider.php | 11 ++-- .../ArticleSliderComponentHandler.php | 8 +-- .../Bundle/MailBundle/Service/LogService.php | 3 ++ .../Service/PluginLocalService.php | 4 +- .../Struct/StructHydrator.php | 30 +++++------ .../SearchTerm/TermHelper.php | 3 ++ .../Provider/StaticUrlProvider.php | 24 +-------- .../SitemapBundle/Service/LinkFilter.php | 51 +++++++++++++++++++ .../Gateway/DBAL/ConfiguratorGateway.php | 3 ++ .../Gateway/DBAL/CustomFacetGateway.php | 2 +- .../Gateway/DBAL/CustomSortingGateway.php | 2 +- .../Service/Core/CheapestPriceService.php | 2 +- .../Service/Core/HrefLangService.php | 4 ++ 20 files changed, 149 insertions(+), 152 deletions(-) create mode 100644 engine/Shopware/Bundle/SitemapBundle/Service/LinkFilter.php diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index a3c4d67a546..2f0aab6ff87 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -4005,36 +4005,6 @@ parameters: count: 1 path: engine/Shopware/Bundle/AccountBundle/Service/RegisterService.php - - - message: "#^Access to an undefined property Enlight_Components_Session_Namespace\\:\\:\\$sOneTimeAccount\\.$#" - count: 1 - path: engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingService.php - - - - message: "#^Access to an undefined property Enlight_Components_Session_Namespace\\:\\:\\$userInfo\\.$#" - count: 1 - path: engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingService.php - - - - message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\StoreFrontCustomerGreetingService\\:\\:fetch\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingService.php - - - - message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\StoreFrontCustomerGreetingService\\:\\:fetchUserInfo\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingService.php - - - - message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\StoreFrontCustomerGreetingService\\:\\:fetchUserInfo\\(\\) should return array\\|null but returns array\\\\|false\\.$#" - count: 1 - path: engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingService.php - - - - message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\StoreFrontCustomerGreetingServiceInterface\\:\\:fetch\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingServiceInterface.php - - message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Type\\\\SalutationType\\:\\:configureOptions\\(\\) has no return type specified\\.$#" count: 1 @@ -5475,26 +5445,6 @@ parameters: count: 1 path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrderGateway.php - - - message: "#^Method Shopware\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\Indexing\\\\CustomerOrderHydrator\\:\\:explodeAndFilter\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrderHydrator.php - - - - message: "#^Method Shopware\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\Indexing\\\\CustomerOrderHydrator\\:\\:explodeAndFilter\\(\\) has parameter \\$value with no type specified\\.$#" - count: 1 - path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrderHydrator.php - - - - message: "#^Method Shopware\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\Indexing\\\\CustomerOrderHydrator\\:\\:hydrate\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrderHydrator.php - - - - message: "#^Method Shopware\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\Indexing\\\\CustomerOrderHydrator\\:\\:hydrate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrderHydrator.php - - message: "#^Method Shopware\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\Indexing\\\\SearchIndexer\\:\\:buildData\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 diff --git a/engine/Shopware/Bundle/AccountBundle/Form/Account/AddressFormType.php b/engine/Shopware/Bundle/AccountBundle/Form/Account/AddressFormType.php index 23cb58d89ad..9ca6c3527e2 100644 --- a/engine/Shopware/Bundle/AccountBundle/Form/Account/AddressFormType.php +++ b/engine/Shopware/Bundle/AccountBundle/Form/Account/AddressFormType.php @@ -87,7 +87,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { $data = $event->getData(); array_walk_recursive($data, function (&$item) { - $item = strip_tags($item); + $item = strip_tags((string) $item); }); $event->setData($data); }); diff --git a/engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingService.php b/engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingService.php index 5f6cfdd4154..4c6e7e5cb2e 100644 --- a/engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingService.php +++ b/engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingService.php @@ -25,30 +25,22 @@ namespace Shopware\Bundle\AccountBundle\Service; use Doctrine\DBAL\Connection; -use Enlight_Components_Session_Namespace; -use Shopware_Components_Config; +use Enlight_Components_Session_Namespace as Session; +use Shopware\Models\Customer\Customer; +use Shopware_Components_Config as Config; class StoreFrontCustomerGreetingService implements StoreFrontCustomerGreetingServiceInterface { - /** - * @var Enlight_Components_Session_Namespace - */ - private $session; + private Session $session; - /** - * @var Connection - */ - private $connection; + private Connection $connection; - /** - * @var Shopware_Components_Config - */ - private $config; + private Config $config; public function __construct( - Enlight_Components_Session_Namespace $session, + Session $session, Connection $connection, - Shopware_Components_Config $config + Config $config ) { $this->session = $session; $this->connection = $connection; @@ -63,26 +55,26 @@ public function fetch() if (!$this->config->get('useSltCookie')) { return null; } - if ($this->session->sOneTimeAccount) { + if ($this->session->get('sOneTimeAccount')) { return null; } - if (!isset($this->session->userInfo)) { - $this->session->userInfo = $this->fetchUserInfo(); + if (!$this->session->get('userInfo')) { + $this->session->set('userInfo', $this->fetchCustomerInfo()); } - if ($this->session->userInfo['accountmode'] == 1) { - $this->session->sOneTimeAccount = true; - $this->session->userInfo = null; + if ($this->session->get('userInfo') && (int) $this->session->get('userInfo')['accountmode'] === Customer::ACCOUNT_MODE_FAST_LOGIN) { + $this->session->set('sOneTimeAccount', true); + $this->session->set('userInfo', null); } - return $this->session->userInfo; + return $this->session->get('userInfo'); } /** - * @return array|null + * @return array|null */ - private function fetchUserInfo() + private function fetchCustomerInfo(): ?array { $userId = $this->session->offsetGet('sUserId'); if (!$userId) { @@ -93,9 +85,13 @@ private function fetchUserInfo() return null; } - return $this->connection->fetchAssoc( - 'SELECT firstname, lastname, email, salutation, title, birthday, accountmode FROM s_user WHERE id = :id', + $customerInfo = $this->connection->fetchAssociative( + 'SELECT firstname, lastname, email, salutation, title, birthday, accountmode + FROM s_user + WHERE id = :id', [':id' => $userId] ); + + return $customerInfo ?: null; } } diff --git a/engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingServiceInterface.php b/engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingServiceInterface.php index 9a4f6c254eb..7606a8091b1 100644 --- a/engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingServiceInterface.php +++ b/engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingServiceInterface.php @@ -30,7 +30,7 @@ interface StoreFrontCustomerGreetingServiceInterface * Returns the customer information for the header greeting "hi, max" * In case that the slt configuration is disabled, or no customer can be detected, the function returns null. * - * @return array|null + * @return array|null */ public function fetch(); } diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/OrderReader.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/OrderReader.php index 62358e13fb8..6a7f25d65ec 100644 --- a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/OrderReader.php +++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/OrderReader.php @@ -52,8 +52,8 @@ public function getList($identifiers) foreach ($orders as &$order) { $order['orderStateName'] = $namespace->get($order['orderStateKey']); $order['orderDocuments'] = $this->getOrderDocuments($documents, $order); - $order['supplierId'] = explode(',', $order['supplierId']); - $order['articleNumber'] = explode(',', $order['articleNumber']); + $order['supplierId'] = explode(',', $order['supplierId'] ?? ''); + $order['articleNumber'] = explode(',', $order['articleNumber'] ?? ''); } return $orders; diff --git a/engine/Shopware/Bundle/CookieBundle/Services/CookieHandler.php b/engine/Shopware/Bundle/CookieBundle/Services/CookieHandler.php index 99a7ffe7c77..96233d4facb 100644 --- a/engine/Shopware/Bundle/CookieBundle/Services/CookieHandler.php +++ b/engine/Shopware/Bundle/CookieBundle/Services/CookieHandler.php @@ -69,7 +69,7 @@ public function isCookieAllowedByPreferences(string $cookieName, array $preferen return false; } - foreach ($preferences['groups'] as $cookieGroup) { + foreach ($preferences['groups'] ?? [] as $cookieGroup) { foreach ($cookieGroup['cookies'] as $cookie) { if ($cookie['name'] !== $foundCookie->getName()) { continue; diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrderHydrator.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrderHydrator.php index 3cf3e4b8ace..e58a9074b1b 100644 --- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrderHydrator.php +++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrderHydrator.php @@ -1,4 +1,6 @@ $data + * + * @return CustomerOrder + */ public function hydrate(array $data) { $struct = new CustomerOrder(); @@ -36,34 +43,37 @@ public function hydrate(array $data) return $struct; } - $struct->setOrderCount((int) $data['count_orders']); - $struct->setTotalAmount((float) $data['invoice_amount_sum']); - $struct->setAvgAmount((float) $data['invoice_amount_avg']); - $struct->setMinAmount((float) $data['invoice_amount_min']); - $struct->setMaxAmount((float) $data['invoice_amount_max']); - $struct->setAvgProductPrice((float) $data['product_avg']); - $struct->setFirstOrderTime(new DateTime($data['first_order_time'])); - $struct->setLastOrderTime(new DateTime($data['last_order_time'])); - $struct->setPayments($this->explodeAndFilter($data['selected_payments'])); - $struct->setShops($this->explodeAndFilter($data['ordered_in_shops'])); - $struct->setDevices($this->explodeAndFilter($data['ordered_with_devices'])); - $struct->setDispatches($this->explodeAndFilter($data['selected_dispachtes'])); - $struct->setWeekdays($this->explodeAndFilter($data['weekdays'])); + $struct->setOrderCount((int) ($data['count_orders'] ?? 0)); + $struct->setTotalAmount((float) ($data['invoice_amount_sum'] ?? 0.0)); + $struct->setAvgAmount((float) ($data['invoice_amount_avg'] ?? 0.0)); + $struct->setMinAmount((float) ($data['invoice_amount_min'] ?? 0.0)); + $struct->setMaxAmount((float) ($data['invoice_amount_max'] ?? 0.0)); + $struct->setAvgProductPrice((float) ($data['product_avg'] ?? 0.0)); + $struct->setFirstOrderTime(isset($data['first_order_time']) ? new DateTime($data['first_order_time']) : null); + $struct->setLastOrderTime(isset($data['last_order_time']) ? new DateTime($data['last_order_time']) : null); + $struct->setPayments(array_map('\intval', $this->explodeAndFilter($data['selected_payments'] ?? ''))); + $struct->setShops(array_map('\intval', $this->explodeAndFilter($data['ordered_in_shops'] ?? ''))); + $struct->setDevices($this->explodeAndFilter($data['ordered_with_devices'] ?? '')); + $struct->setDispatches(array_map('\intval', $this->explodeAndFilter($data['selected_dispachtes'] ?? ''))); + $struct->setWeekdays($this->explodeAndFilter($data['weekdays'] ?? '')); if (\array_key_exists('product_numbers', $data)) { - $struct->setProducts($this->explodeAndFilter($data['product_numbers'])); + $struct->setProducts($this->explodeAndFilter($data['product_numbers'] ?? '')); } if (\array_key_exists('category_ids', $data)) { - $struct->setCategories($this->explodeAndFilter($data['category_ids'])); + $struct->setCategories(array_map('\intval', $this->explodeAndFilter($data['category_ids'] ?? ''))); } if (\array_key_exists('manufacturer_ids', $data)) { - $struct->setManufacturers($this->explodeAndFilter($data['manufacturer_ids'])); + $struct->setManufacturers(array_map('\intval', $this->explodeAndFilter($data['manufacturer_ids'] ?? ''))); } return $struct; } - private function explodeAndFilter($value) + /** + * @return array + */ + private function explodeAndFilter(string $value): array { return array_filter(explode(',', $value)); } diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductProvider.php b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductProvider.php index bf4c45b095e..7b590552ed1 100644 --- a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductProvider.php +++ b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductProvider.php @@ -368,16 +368,13 @@ private function getCategories($products): array ->where('mapping.articleID IN (:ids)') ->setParameter(':ids', $ids, Connection::PARAM_INT_ARRAY); - $data = $query->execute()->fetchAll(PDO::FETCH_ASSOC); + $data = $query->execute()->fetchAllAssociative(); $result = []; foreach ($data as $row) { $productId = (int) $row['productId']; - $categories = []; - if (isset($result[$productId])) { - $categories = $result[$productId]; - } - $temp = explode('|', $row['path']); + $categories = $result[$productId] ?? []; + $temp = explode('|', $row['path'] ?? ''); $temp[] = $row['id']; $result[$productId] = array_merge($categories, $temp); @@ -470,7 +467,7 @@ private function getCalculatedPrices(Shop $shop, array $products, array $priceRu $customerGroup = $context->getCurrentCustomerGroup()->getKey(); $key = $customerGroup . '_' . $context->getCurrency()->getId(); - $rule = $rules[$context->getFallbackCustomerGroup()->getKey()]; + $rule = $rules[$context->getFallbackCustomerGroup()->getKey()] ?? null; if (isset($rules[$customerGroup])) { $rule = $rules[$customerGroup]; } diff --git a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ArticleSliderComponentHandler.php b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ArticleSliderComponentHandler.php index fa36e1a13d4..aecc5fa483b 100644 --- a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ArticleSliderComponentHandler.php +++ b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ArticleSliderComponentHandler.php @@ -121,7 +121,7 @@ public function prepare(PrepareDataCollection $collection, Element $element, Sho break; case self::TYPE_STATIC_PRODUCT: - $products = $element->getConfig()->get(self::SELECTED_PRODUCTS, ''); + $products = $element->getConfig()->get(self::SELECTED_PRODUCTS, '') ?? ''; $productNumbers = array_filter(explode('|', $products)); if (empty($productNumbers)) { $productNumbers = []; @@ -130,7 +130,7 @@ public function prepare(PrepareDataCollection $collection, Element $element, Sho $collection->getBatchRequest()->setProductNumbers($key, $productNumbers); break; case self::TYPE_STATIC_VARIANT: - $productVariants = $element->getConfig()->get(self::SELECTED_VARIANTS, ''); + $productVariants = $element->getConfig()->get(self::SELECTED_VARIANTS, '') ?? ''; $productNumbers = array_filter(explode('|', $productVariants)); if (empty($productNumbers)) { $productNumbers = []; @@ -161,7 +161,7 @@ public function handle(ResolvedDataCollection $collection, Element $element, Sho break; case self::TYPE_STATIC_PRODUCT: - $products = $element->getConfig()->get(self::SELECTED_PRODUCTS, ''); + $products = $element->getConfig()->get(self::SELECTED_PRODUCTS, '') ?? ''; $productNumbers = array_filter(explode('|', $products)); $listProducts = $collection->getBatchResult()->get($key); @@ -176,7 +176,7 @@ public function handle(ResolvedDataCollection $collection, Element $element, Sho $element->getData()->set('products', $products); break; case self::TYPE_STATIC_VARIANT: - $products = $element->getConfig()->get(self::SELECTED_VARIANTS, ''); + $products = $element->getConfig()->get(self::SELECTED_VARIANTS, '') ?? ''; $productNumbers = array_filter(explode('|', $products)); $listProducts = $collection->getBatchResult()->get($key); $listProducts = $this->additionalTextService->buildAdditionalTextLists($listProducts, $context); diff --git a/engine/Shopware/Bundle/MailBundle/Service/LogService.php b/engine/Shopware/Bundle/MailBundle/Service/LogService.php index 8d04691a6ac..2969a6f97aa 100644 --- a/engine/Shopware/Bundle/MailBundle/Service/LogService.php +++ b/engine/Shopware/Bundle/MailBundle/Service/LogService.php @@ -159,6 +159,9 @@ private function loadContacts(): array } $recipients = array_unique(array_filter(array_map('trim', $recipients))); + if (empty($recipients)) { + return []; + } $sql = 'SELECT LOWER(mail_address), id FROM s_mail_log_contact WHERE mail_address IN (:addresses)'; $foundRecipients = $this->connection->executeQuery($sql, ['addresses' => $recipients])->fetchAll(PDO::FETCH_KEY_PAIR); diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginLocalService.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginLocalService.php index 4d09406cf80..0b67874b5ab 100644 --- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginLocalService.php +++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginLocalService.php @@ -162,7 +162,7 @@ private function iteratePlugins(array $plugins, BaseRequest $context): array $row['iconPath'] = null; } - $translations = json_decode($row['translations'], true); + $translations = json_decode($row['translations'] ?? '', true); if (isset($translations[$locale]['label'])) { $row['label'] = $translations[$locale]['label']; @@ -265,7 +265,7 @@ private function parseChangeLog(string $html): string } $dom = new DOMDocument(); - $dom->loadHTML(mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8')); + $dom->loadHTML(htmlentities($html)); $nodes = (new DOMXPath($dom))->query("//@*[local-name() != 'href']"); if ($nodes === false) { diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/StructHydrator.php b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/StructHydrator.php index b491cfe477e..2d81960458b 100644 --- a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/StructHydrator.php +++ b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/StructHydrator.php @@ -333,17 +333,17 @@ public function hydrateCategory($data) */ public function assignLocalData(PluginStruct $plugin, $data) { - $plugin->setId((int) $data['id']); + $plugin->setId((int) ($data['id'] ?? 0)); $plugin->setTechnicalName($data['name']); - $plugin->setLabel($data['label']); - $plugin->setActive((bool) $data['active']); - $plugin->setVersion($data['version']); - $plugin->setCapabilityActivate((bool) $data['capability_enable']); - $plugin->setCapabilityUpdate((bool) $data['capability_update']); - $plugin->setCapabilityInstall((bool) $data['capability_install']); - $plugin->setCapabilitySecureUninstall((bool) $data['capability_secure_uninstall']); - $plugin->setLocalUpdateAvailable($data['update_version'] !== null); - $plugin->setLink($data['link']); + $plugin->setLabel($data['label'] ?? ''); + $plugin->setActive((bool) ($data['active'] ?? false)); + $plugin->setVersion($data['version'] ?? '0.0.1'); + $plugin->setCapabilityActivate((bool) ($data['capability_enable'] ?? false)); + $plugin->setCapabilityUpdate((bool) ($data['capability_update'] ?? false)); + $plugin->setCapabilityInstall((bool) ($data['capability_install'] ?? false)); + $plugin->setCapabilitySecureUninstall((bool) ($data['capability_secure_uninstall'] ?? false)); + $plugin->setLocalUpdateAvailable(isset($data['update_version'])); + $plugin->setLink($data['link'] ?? ''); if (\array_key_exists('redirectToStore', $data)) { $plugin->setRedirectToStore((bool) $data['redirectToStore']); @@ -353,11 +353,11 @@ public function assignLocalData(PluginStruct $plugin, $data) $plugin->setLowestPrice((float) $data['lowestPriceValue']); } - $plugin->setSource($data['source']); - $plugin->setFormId($data['form_id']); - $plugin->setLocalIcon($data['iconPath']); - $plugin->setLocalDescription($data['description']); - $plugin->setInSafeMode((bool) $data['in_safe_mode']); + $plugin->setSource($data['source'] ?? ''); + $plugin->setFormId($data['form_id'] ?? 0); + $plugin->setLocalIcon($data['iconPath'] ?? ''); + $plugin->setLocalDescription($data['description'] ?? ''); + $plugin->setInSafeMode((bool) ($data['in_safe_mode'] ?? false)); if (isset($data['installation_date']) && !empty($data['installation_date'])) { $date = new DateTime($data['installation_date']); diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/TermHelper.php b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/TermHelper.php index 6e1b4a39a73..1a879dda17b 100644 --- a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/TermHelper.php +++ b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/TermHelper.php @@ -71,6 +71,9 @@ public function __construct($config, $useBadWords = true, $replaceUmlauts = true */ public function splitTerm($string) { + if (empty($string)) { + return []; + } if ($this->replaceUmlauts) { $string = str_replace( ['Ü', 'ü', 'ä', 'Ä', 'ö', 'Ö', 'ß'], diff --git a/engine/Shopware/Bundle/SitemapBundle/Provider/StaticUrlProvider.php b/engine/Shopware/Bundle/SitemapBundle/Provider/StaticUrlProvider.php index 53f375234e8..8d0fbb4ce29 100644 --- a/engine/Shopware/Bundle/SitemapBundle/Provider/StaticUrlProvider.php +++ b/engine/Shopware/Bundle/SitemapBundle/Provider/StaticUrlProvider.php @@ -27,6 +27,7 @@ use DateTime; use Doctrine\DBAL\Driver\Connection as ConnectionInterface; use PDO; +use Shopware\Bundle\SitemapBundle\Service\LinkFilter; use Shopware\Bundle\SitemapBundle\Struct\Url; use Shopware\Bundle\SitemapBundle\UrlProviderInterface; use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface; @@ -66,7 +67,7 @@ public function getUrls(Context $routingContext, ShopContextInterface $shopConte 'sCustom' => $site['id'], ]; - if (!$this->filterLink($site['link'], $site['urlParams'])) { + if (!LinkFilter::filterLink($site['link'], $site['urlParams'])) { unset($sites[$key]); continue; } @@ -151,25 +152,4 @@ private function getSitesByShopId(int $shopId): array return array_values($sites); } - - /** - * Helper function to filter predefined links, which should not be in the sitemap (external links, sitemap links itself) - * Returns false, if the link is not allowed - * - * @param array $userParams - */ - private function filterLink(?string $link, array &$userParams): bool - { - if (empty($link)) { - return true; - } - $parsedUserParams = (string) parse_url($link, PHP_URL_QUERY); - parse_str($parsedUserParams, $userParams); - $blacklist = ['', 'sitemap', 'sitemapXml']; - if (\in_array($userParams['sViewport'], $blacklist, true)) { - return false; - } - - return true; - } } diff --git a/engine/Shopware/Bundle/SitemapBundle/Service/LinkFilter.php b/engine/Shopware/Bundle/SitemapBundle/Service/LinkFilter.php new file mode 100644 index 00000000000..65bec0ab477 --- /dev/null +++ b/engine/Shopware/Bundle/SitemapBundle/Service/LinkFilter.php @@ -0,0 +1,51 @@ + $userParams + */ + public static function filterLink(?string $link, array &$userParams = []): bool + { + if (empty($link)) { + return true; + } + $parsedUserParams = (string) parse_url($link, PHP_URL_QUERY); + parse_str($parsedUserParams, $userParams); + $blacklist = ['', 'sitemap', 'sitemapXml']; + if (\in_array($userParams['sViewport'] ?? [], $blacklist, true)) { + return false; + } + + return true; + } +} diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ConfiguratorGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ConfiguratorGateway.php index 319ab1a944d..4e2c4e0f9c2 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ConfiguratorGateway.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ConfiguratorGateway.php @@ -195,6 +195,9 @@ public function getAvailableConfigurations(BaseProduct $product): array $result = []; foreach ($data as $row) { + if (empty($row)) { + continue; + } $rowIds = array_map('\intval', explode('|', $row)); foreach ($rowIds as $optionId) { diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomFacetGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomFacetGateway.php index 36814c08047..773ddbf9f12 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomFacetGateway.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomFacetGateway.php @@ -200,7 +200,7 @@ private function getCategoryMapping(array $categoryIds): array return array_map( function ($ids) use ($allFacetIds) { - $ids = array_filter(explode('|', $ids)); + $ids = array_filter(explode('|', $ids ?? '')); if (!empty($ids)) { return array_map('\intval', $ids); diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomSortingGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomSortingGateway.php index b5a426cb63b..4edc4bb6d9c 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomSortingGateway.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomSortingGateway.php @@ -194,7 +194,7 @@ private function getCategoryMapping(array $categoryIds): array return array_map( function ($ids) use ($allSortingIds) { - $ids = array_filter(explode('|', $ids)); + $ids = array_filter(explode('|', $ids ?? '')); if (!empty($ids)) { return array_map('\intval', $ids); diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CheapestPriceService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CheapestPriceService.php index e89bfc48017..53a5d5fd495 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CheapestPriceService.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CheapestPriceService.php @@ -114,7 +114,7 @@ private function calculatePriceGroupDiscounts(array $products, array $prices, Sh continue; } - $price = $prices[$product->getNumber()]; + $price = $prices[$product->getNumber()] ?? null; if (!$price instanceof PriceRule) { continue; diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/HrefLangService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/HrefLangService.php index a6948b58e10..8a2bb466735 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/HrefLangService.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/HrefLangService.php @@ -218,6 +218,10 @@ private function isUrlHome(array $parameters): bool return true; } + if (!isset($parameters['controller'], $parameters['action'])) { + return false; + } + if ($parameters['controller'] === 'index' && $parameters['action'] === 'index') { return true; } From 2e6eb4535a7503b34342c187face679732156579 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Tue, 27 Jun 2023 14:52:09 +0200 Subject: [PATCH 421/730] fix(SW-27005): Fix notices and warnings in default core plugins --- .phpstan-baseline.neon | 130 ------------------ .../Default/Backend/Auth/Bootstrap.php | 2 +- .../Default/Backend/SwagUpdate/Bootstrap.php | 2 + .../Default/Core/ErrorHandler/Bootstrap.php | 4 +- .../Default/Core/HttpCache/Bootstrap.php | 82 ++++++----- .../Default/Core/HttpCache/CacheControl.php | 2 +- .../Core/MarketingAggregate/Bootstrap.php | 2 +- .../Default/Core/PaymentMethods/Bootstrap.php | 18 ++- .../Components/DebitPaymentMethod.php | 2 +- .../Components/GenericPaymentMethod.php | 3 +- .../Components/SepaPaymentMethod.php | 15 +- .../Default/Core/RestApi/Bootstrap.php | 6 +- .../Frontend/Notification/Bootstrap.php | 2 +- 13 files changed, 84 insertions(+), 186 deletions(-) diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index 2f0aab6ff87..cf56d1895ad 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -34065,11 +34065,6 @@ parameters: count: 1 path: engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php - - - message: "#^Method Shopware_Plugins_Backend_SwagUpdate_Bootstrap\\:\\:onBackendIndexPostDispatch\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Bootstrap.php - - message: "#^Class ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Archive\\\\Adapter implements generic interface SeekableIterator but does not specify its types\\: TKey, TValue$#" count: 1 @@ -34535,26 +34530,6 @@ parameters: count: 1 path: engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php - - - message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:addContextCookie\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - - - message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:addSurrogateControl\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - - - message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:disableControllerCache\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - - - message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:enableControllerCache\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:enableControllerCache\\(\\) has parameter \\$cacheIds with no value type specified in iterable type array\\.$#" count: 1 @@ -34565,91 +34540,21 @@ parameters: count: 1 path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - - message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:getResponseCookie\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - - - message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:installForm\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - - - message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:onClearCache\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - - - message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:onClearHttpCache\\(\\) should return string but return statement is missing\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - - - message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:onInvalidateCacheId\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - - - message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:onPostDispatch\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - - - message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:onPostPersist\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - - - message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:onPreDispatch\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - - - message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:postFlush\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:renderEsiTag\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#" count: 1 path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - - message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:setCacheHeaders\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - - - message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:setCacheIdHeader\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:setCacheIdHeader\\(\\) has parameter \\$cacheIds with no value type specified in iterable type array\\.$#" count: 1 path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - - message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:setNoCacheCookie\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - - - message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:setNoCacheTag\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - message: "#^Negated boolean expression is always true\\.$#" count: 1 path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - - message: "#^Parameter \\#2 \\$cacheId of method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:invalidateWithBANRequest\\(\\) expects string, string\\|null given\\.$#" - count: 2 - path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php - - message: "#^Parameter \\#4 \\$active of method Shopware_Components_Plugin_Bootstrap\\:\\:createCronJob\\(\\) expects int, true given\\.$#" count: 1 @@ -34930,31 +34835,11 @@ parameters: count: 2 path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php - - - message: "#^Method Shopware_Plugins_Core_PaymentMethods_Bootstrap\\:\\:addPaths\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php - - message: "#^Method Shopware_Plugins_Core_PaymentMethods_Bootstrap\\:\\:addPaymentClass\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php - - - message: "#^Method Shopware_Plugins_Core_PaymentMethods_Bootstrap\\:\\:onBackendCustomerPostDispatch\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php - - - - message: "#^Method Shopware_Plugins_Core_PaymentMethods_Bootstrap\\:\\:onBackendOrderPostDispatch\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php - - - - message: "#^Method Shopware_Plugins_Core_PaymentMethods_Bootstrap\\:\\:subscribeEvents\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php - - message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\BasePaymentMethod\\:\\:getCurrentPaymentDataAsArray\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -35320,21 +35205,6 @@ parameters: count: 1 path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php - - - message: "#^Method Shopware_Plugins_Core_RestApi_Bootstrap\\:\\:onDispatchLoopStartup\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php - - - - message: "#^Method Shopware_Plugins_Core_RestApi_Bootstrap\\:\\:onFrontPreDispatch\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php - - - - message: "#^Method Shopware_Plugins_Core_RestApi_Bootstrap\\:\\:onInitResourceAuth\\(\\) should return Zend_Auth\\|null but empty return statement found\\.$#" - count: 1 - path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php - - message: "#^Parameter \\#1 \\$encodedValue of static method Zend_Json\\:\\:decode\\(\\) expects string, string\\|false given\\.$#" count: 1 diff --git a/engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php b/engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php index 0db758ae65c..91f7e6d76fc 100644 --- a/engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php @@ -256,7 +256,7 @@ public function checkAuth() } if (!$this->isAllowed($test)) { - throw new Enlight_Controller_Exception($test['errorMessage'] ?: 'Permission denied', 401); + throw new Enlight_Controller_Exception($test['errorMessage'] ?? 'Permission denied', 401); } return $auth; diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Bootstrap.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Bootstrap.php index 12e45e3aa35..27a6111c88a 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Bootstrap.php @@ -74,6 +74,8 @@ public function afterInit() /** * When index backend module was loaded, add our snippet- and template-directory * Also extend the template + * + * @return void */ public function onBackendIndexPostDispatch(Enlight_Controller_ActionEventArgs $args) { diff --git a/engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php index 70efc1d0dbf..85fc36ca608 100644 --- a/engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php @@ -181,8 +181,8 @@ public function errorHandler($errno, $errstr, $errfile, $errline) return; } - // Ignore access to not initialized variables in smarty templates - if ($errno === E_NOTICE && stripos($errfile, '/var/cache/') !== false && stripos($errfile, '/templates/') !== false) { + // Ignore access to not initialized variables in smarty templates. Since PHP 8.0 those are warnings + if (\in_array($errno, [E_NOTICE, E_WARNING], true) && str_contains($errfile, '/var/cache/') && str_contains($errfile, '/templates/')) { return; } diff --git a/engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php index 6c3620f8d8e..d556b6d7a6e 100644 --- a/engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php @@ -215,8 +215,6 @@ public function getCapabilities() * Enable plugin method * Although plugin is flagged as capability: enable => false, * it can still be enabled/disabled programmatically - * - * @return bool */ public function enable() { @@ -227,8 +225,6 @@ public function enable() * Disable plugin method * Although plugin is flagged as capability: enable => false, * it can still be enabled/disabled programmatically - * - * @return bool */ public function disable() { @@ -237,6 +233,8 @@ public function disable() /** * Install config-form + * + * @return void */ public function installForm() { @@ -308,8 +306,8 @@ public function installForm() */ public function getProxyUrl(?Request $request = null) { - $proxyUrl = trim($this->Config()->get('proxy')); - if (!empty($proxyUrl)) { + $proxyUrl = trim((string) $this->Config()->get('proxy', '')); + if ($proxyUrl !== '') { return $proxyUrl; } @@ -320,11 +318,7 @@ public function getProxyUrl(?Request $request = null) . $request->getBaseUrl() . '/'; } - $em = $this->get(ModelManager::class); - $repository = $em->getRepository(Shop::class); - - $shop = $repository->findOneBy(['default' => true]); - + $shop = $this->get(ModelManager::class)->getRepository(Shop::class)->findOneBy(['default' => true]); if (!$shop->getHost()) { return null; } @@ -339,6 +333,8 @@ public function getProxyUrl(?Request $request = null) /** * Do http caching jobs + * + * @return void */ public function onPreDispatch(Enlight_Controller_ActionEventArgs $args) { @@ -394,6 +390,8 @@ public function renderEsiTag(Enlight_Controller_Request_RequestHttp $request, ar /** * On post dispatch we try to find affected articleIds displayed during this request + * + * @return void */ public function onPostDispatch(Enlight_Controller_ActionEventArgs $args) { @@ -439,6 +437,8 @@ public function onClearHttpCache(Shopware_Components_Cron_CronJob $job) if ($this->clearCache()) { return "Cleared HTTP-Cache\n"; } + + return ''; } /** @@ -450,6 +450,8 @@ public function onClearHttpCache(Shopware_Components_Cron_CronJob $job) * * Shopware()->Events()->notify('Shopware_Plugins_HttpCache_ClearCache'); * + * + * @return void */ public function onClearCache(Enlight_Event_EventArgs $args) { @@ -470,6 +472,8 @@ public function onClearCache(Enlight_Event_EventArgs $args) * array('cacheId' => 'a123') * ); * + * + * @return void */ public function onInvalidateCacheId(Enlight_Event_EventArgs $args) { @@ -486,6 +490,8 @@ public function onInvalidateCacheId(Enlight_Event_EventArgs $args) /** * Sets the Shopware cache headers + * + * @return bool */ public function setCacheHeaders() { @@ -525,7 +531,9 @@ public function setCacheHeaders() } /** - * This methods sets the nocache-cookie if actions in the shop are triggered + * This method sets the nocache-cookie if actions in the shop are triggered + * + * @return void */ public function setNoCacheCookie() { @@ -550,6 +558,8 @@ public function setNoCacheCookie() * * @param string $newTag * @param bool $remove + * + * @return void */ public function setNoCacheTag($newTag, $remove = false) { @@ -590,6 +600,8 @@ public function setNoCacheTag($newTag, $remove = false) * Helper function to flag the request with cacheIds to invalidate the caching. * * @param array $cacheIds + * + * @return void */ public function setCacheIdHeader($cacheIds = []) { @@ -609,6 +621,8 @@ public function setCacheIdHeader($cacheIds = []) /** * Execute cache invalidation after Doctrine flush + * + * @return void */ public function postFlush(EventArgs $eventArgs) { @@ -621,6 +635,8 @@ public function postFlush(EventArgs $eventArgs) /** * Cache invalidation based on model events + * + * @return void */ public function onPostPersist(Enlight_Event_EventArgs $eventArgs) { @@ -697,6 +713,8 @@ public function onPostPersist(Enlight_Event_EventArgs $eventArgs) * * @param int $cacheTime * @param array $cacheIds + * + * @return void */ public function enableControllerCache($cacheTime = 3600, $cacheIds = []) { @@ -706,13 +724,15 @@ public function enableControllerCache($cacheTime = 3600, $cacheIds = []) /** * Helper function to disable the http cache for a single shopware controller + * + * @return void */ public function disableControllerCache() { $this->response->headers->set('cache-control', 'private', true); } - private function getResponseCookie(Response $response) + private function getResponseCookie(Response $response): ?string { $cookies = $response->getCookies(); foreach ($cookies as $cookie) { @@ -726,10 +746,8 @@ private function getResponseCookie(Response $response) /** * Clears the cache - * - * @return bool */ - private function clearCache() + private function clearCache(): bool { return $this->invalidate(); } @@ -739,12 +757,8 @@ private function clearCache() * * This sends a http-ban-request to the proxyUrl containing * the $cacheId in the x-shopware-invalidates http-header - * - * @param string $cacheId - * - * @return bool */ - private function invalidateCacheId($cacheId) + private function invalidateCacheId(string $cacheId): bool { if (!$this->Config()->get('proxyPrune')) { return false; @@ -757,14 +771,14 @@ private function invalidateCacheId($cacheId) * Will send BAN requests to all configured reverse proxies. If cacheId is provided, * the corresponding headers will be set. * - * @param string $cacheId If set, only pages including these cacheIds will be invalidated + * @param string|null $cacheId If set, only pages including these cacheIds will be invalidated * * @return bool True will be returned, if *all* operations succeeded */ - private function invalidate($cacheId = null) + private function invalidate(?string $cacheId = null): bool { - $proxyUrl = trim($this->Config()->get('proxy')); - if (!empty($proxyUrl)) { + $proxyUrl = trim((string) $this->Config()->get('proxy', '')); + if ($proxyUrl !== '') { return $this->invalidateWithBANRequest($proxyUrl, $cacheId); } @@ -782,12 +796,9 @@ private function invalidate($cacheId = null) } /** - * @param string $urls Comma separated URLs - * @param string $cacheId - * - * @return bool + * @param string $urls Comma separated URLs */ - private function invalidateWithBANRequest($urls, $cacheId) + private function invalidateWithBANRequest(string $urls, ?string $cacheId): bool { // Expand + trim proxies (comma separated) $urls = array_map( @@ -823,12 +834,7 @@ private function invalidateWithBANRequest($urls, $cacheId) return $success; } - /** - * @param string $cacheId - * - * @return bool - */ - private function invalidateWithStore($cacheId = null) + private function invalidateWithStore(?string $cacheId = null): bool { /** @var HttpCache $httpCache */ $httpCache = $this->get('httpcache'); @@ -850,7 +856,7 @@ private function invalidateWithStore($cacheId = null) * * @param Response $response A Response instance */ - private function addSurrogateControl(Response $response) + private function addSurrogateControl(Response $response): void { $response->headers->set('Surrogate-Control', 'content="ESI/1.0"', true); } @@ -875,7 +881,7 @@ private function hasSurrogateEsiCapability(Request $request): bool /** * Add context cookie */ - private function addContextCookie(Request $request, Response $response) + private function addContextCookie(Request $request, Response $response): void { /** @var CacheControl $cacheControl */ $cacheControl = $this->get('http_cache.cache_control'); diff --git a/engine/Shopware/Plugins/Default/Core/HttpCache/CacheControl.php b/engine/Shopware/Plugins/Default/Core/HttpCache/CacheControl.php index feef909b908..9f9a96545fd 100644 --- a/engine/Shopware/Plugins/Default/Core/HttpCache/CacheControl.php +++ b/engine/Shopware/Plugins/Default/Core/HttpCache/CacheControl.php @@ -178,7 +178,7 @@ public function useNoCacheControl(Request $request, Response $response, $shopId) public function getNoCacheTagsForRequest(Request $request, $shopId) { $tags = []; - $autoAdmin = $this->config['admin']; + $autoAdmin = $this->config['admin'] ?? null; if (!empty($autoAdmin)) { $tags[] = 'admin-' . $shopId; diff --git a/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php index 34afab242de..a1d04c09a7b 100644 --- a/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php @@ -372,7 +372,7 @@ public function incrementTopSeller(Enlight_Event_EventArgs $arguments) $details = $arguments->getDetails(); foreach ($details as $article) { - if ($article['modus'] != 0 || empty($article['articleID'])) { + if (($article['modus'] ?? null) != 0 || empty($article['articleID'])) { continue; } diff --git a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php index 164f668d4cb..1e5776c0a83 100644 --- a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php @@ -22,6 +22,10 @@ * our trademarks remain entirely with us. */ +use ShopwarePlugin\PaymentMethods\Components\DebitPaymentMethod; +use ShopwarePlugin\PaymentMethods\Components\GenericPaymentMethod; +use ShopwarePlugin\PaymentMethods\Components\SepaPaymentMethod; + class Shopware_Plugins_Core_PaymentMethods_Bootstrap extends Shopware_Components_Plugin_Bootstrap { /** @@ -96,15 +100,17 @@ public function addPaymentClass(Enlight_Event_EventArgs $args) $this->Application()->Loader()->registerNamespace('ShopwarePlugin\PaymentMethods\Components', __DIR__ . '/Components/'); - $dirs['debit'] = 'ShopwarePlugin\PaymentMethods\Components\DebitPaymentMethod'; - $dirs['sepa'] = 'ShopwarePlugin\PaymentMethods\Components\SepaPaymentMethod'; - $dirs['default'] = 'ShopwarePlugin\PaymentMethods\Components\GenericPaymentMethod'; + $dirs['debit'] = DebitPaymentMethod::class; + $dirs['sepa'] = SepaPaymentMethod::class; + $dirs['default'] = GenericPaymentMethod::class; return $dirs; } /** * Add View path to Smarty + * + * @return void */ public function addPaths(Enlight_Event_EventArgs $arguments) { @@ -117,6 +123,8 @@ public function addPaths(Enlight_Event_EventArgs $arguments) /** * Called when the BackendOrderPostDispatch Event is triggered + * + * @return void */ public function onBackendOrderPostDispatch(Enlight_Event_EventArgs $args) { @@ -137,6 +145,8 @@ public function onBackendOrderPostDispatch(Enlight_Event_EventArgs $args) /** * Called when the BackendCustomerPostDispatch Event is triggered + * + * @return void */ public function onBackendCustomerPostDispatch(Enlight_Event_EventArgs $args) { @@ -159,7 +169,7 @@ public function onBackendCustomerPostDispatch(Enlight_Event_EventArgs $args) /** * Registers all necessary events and hooks. */ - private function subscribeEvents() + private function subscribeEvents(): void { $this->subscribeEvent( 'Shopware_Modules_Admin_InitiatePaymentClass_AddClass', diff --git a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php index 3a684601588..e72e3a204d7 100644 --- a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php +++ b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php @@ -53,7 +53,7 @@ public function validate($paymentData) ]; foreach ($fields as $field) { - $value = $paymentData[$field] ?: ''; + $value = $paymentData[$field] ?? ''; $value = trim($value); if (empty($value)) { diff --git a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php index 2abc5fd11c5..f68a18ffcf7 100644 --- a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php +++ b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php @@ -27,6 +27,7 @@ use DateTime; use Enlight_Controller_Request_Request; use Shopware\Models\Customer\Customer; +use Shopware\Models\Order\Order; /** * Used for all payment methods that require no specific logic @@ -65,7 +66,7 @@ public function createPaymentInstance($orderId, $userId, $paymentId) { $orderAmount = Shopware()->Models()->createQueryBuilder() ->select('orders.invoiceAmount') - ->from('Shopware\Models\Order\Order', 'orders') + ->from(Order::class, 'orders') ->where('orders.id = ?1') ->setParameter(1, $orderId) ->getQuery() diff --git a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php index 6f6fa5193f8..0589a41842d 100644 --- a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php +++ b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php @@ -52,13 +52,13 @@ public function validate($paymentData) $sErrorFlag = []; $sErrorMessages = []; - if (!$paymentData['sSepaIban'] || trim($paymentData['sSepaIban']) === '') { + if (empty($paymentData['sSepaIban']) || trim($paymentData['sSepaIban']) === '') { $sErrorFlag['sSepaIban'] = true; } - if (Shopware()->Config()->get('sepaShowBic') && Shopware()->Config()->get('sepaRequireBic') && (!$paymentData['sSepaBic'] || trim($paymentData['sSepaBic']) === '')) { + if (Shopware()->Config()->get('sepaShowBic') && Shopware()->Config()->get('sepaRequireBic') && (empty($paymentData['sSepaBic']) || trim($paymentData['sSepaBic']) === '')) { $sErrorFlag['sSepaBic'] = true; } - if (Shopware()->Config()->get('sepaShowBankName') && Shopware()->Config()->get('sepaRequireBankName') && (!$paymentData['sSepaBankName'] || trim($paymentData['sSepaBankName']) === '')) { + if (Shopware()->Config()->get('sepaShowBankName') && Shopware()->Config()->get('sepaRequireBankName') && (empty($paymentData['sSepaBankName']) || trim($paymentData['sSepaBankName']) === '')) { $sErrorFlag['sSepaBankName'] = true; } @@ -71,7 +71,7 @@ public function validate($paymentData) $sErrorMessages[] = Shopware()->Snippets()->getNamespace('frontend/account/internalMessages')->get('ErrorFillIn', 'Please fill in all red fields'); } - if ($paymentData['sSepaIban'] && !$this->validateIBAN((string) $paymentData['sSepaIban'])) { + if (isset($paymentData['sSepaIban']) && !$this->validateIBAN((string) $paymentData['sSepaIban'])) { $sErrorMessages[] = Shopware()->Snippets()->getNamespace('frontend/plugins/payment/sepa')->get('ErrorIBAN', 'Invalid IBAN'); $sErrorFlag['sSepaIban'] = true; } @@ -171,7 +171,12 @@ public function createPaymentInstance($orderId, $userId, $paymentId) ->find($userId)->getDefaultBillingAddress(); $paymentData = $this->getCurrentPaymentDataAsArray($userId); if (!\is_array($paymentData)) { - $paymentData = []; + $paymentData = [ + 'sSepaUseBillingData' => null, + 'sSepaBankName' => null, + 'sSepaBic' => null, + 'sSepaIban' => null, + ]; } $date = new DateTime(); diff --git a/engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php index 5fe396f0682..418f5d3de77 100644 --- a/engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php @@ -77,6 +77,8 @@ public function afterInit() /** * Listener method for the Enlight_Controller_Front_DispatchLoopStartup event. + * + * @return void */ public function onDispatchLoopStartup(Enlight_Controller_EventArgs $args) { @@ -95,6 +97,8 @@ public function onDispatchLoopStartup(Enlight_Controller_EventArgs $args) /** * This pre-dispatch event-hook checks permissions + * + * @return void */ public function onFrontPreDispatch(Enlight_Controller_EventArgs $args) { @@ -160,7 +164,7 @@ public function onFrontPreDispatch(Enlight_Controller_EventArgs $args) public function onInitResourceAuth(Enlight_Event_EventArgs $args) { if (!$this->isApiCall) { - return; + return null; } $adapter = new Zend_Auth_Adapter_Http([ diff --git a/engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php b/engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php index 2900a9e8db3..9b85d8ebb45 100644 --- a/engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php @@ -129,7 +129,7 @@ public function onPostDispatch(Enlight_Event_EventArgs $args) $view->assign('ShowNotification', true); $sNotificationArticleWaitingForOptInApprovement = $session->get('sNotifcationArticleWaitingForOptInApprovement', []); - $view->assign('WaitingForOptInApprovement', $sNotificationArticleWaitingForOptInApprovement[$sArticle['ordernumber']]); + $view->assign('WaitingForOptInApprovement', $sNotificationArticleWaitingForOptInApprovement[$sArticle['ordernumber']] ?? null); } /** From 21360444c95299d76ca7564e230fe3cecdda7f21 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Tue, 27 Jun 2023 15:32:33 +0200 Subject: [PATCH 422/730] fix(SW-27005): Fix notices and warnings in models --- engine/Shopware/Models/Article/Repository.php | 2 +- engine/Shopware/Models/Document/Order.php | 4 ++-- engine/Shopware/Models/Mail/LogRepository.php | 8 +++----- engine/Shopware/Models/Shop/DetachedShop.php | 4 ++++ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/engine/Shopware/Models/Article/Repository.php b/engine/Shopware/Models/Article/Repository.php index 553d0f82822..d2de3130efe 100644 --- a/engine/Shopware/Models/Article/Repository.php +++ b/engine/Shopware/Models/Article/Repository.php @@ -1994,7 +1994,7 @@ public function getSupplierListQueryBuilder($filter, array $orderBy) $builder->leftJoin('supplier.articles', 'articles'); $builder->groupBy('supplier.id'); - if (\is_array($filter) && ($filter[0]['property'] === 'name')) { + if (\is_array($filter) && \array_key_exists(0, $filter) && ($filter[0]['property'] === 'name')) { // filter the displayed columns with the passed filter $builder ->where('supplier.name LIKE ?1') // Search only the beginning of the customer number. diff --git a/engine/Shopware/Models/Document/Order.php b/engine/Shopware/Models/Document/Order.php index 1eb6dcd89c7..788532c52e0 100644 --- a/engine/Shopware/Models/Document/Order.php +++ b/engine/Shopware/Models/Document/Order.php @@ -201,7 +201,7 @@ class Shopware_Models_Document_Order extends Enlight_Class implements Enlight_Ho public function __construct($id, $config = []) { // Test-data for preview mode - if ((bool) $config['_preview'] === true && (bool) $config['_previewSample'] === true) { + if ($config['_preview'] && ($config['_previewSample'] ?? null)) { $array = $this->getDemoData(); $array['_order']->language = 1; @@ -216,7 +216,7 @@ public function __construct($id, $config = []) $this->_id = $id; $this->_config = $config; $this->_summaryNet = (bool) ($config['summaryNet'] ?? false); - $this->_shippingCostsAsPosition = (bool) $config['shippingCostsAsPosition']; + $this->_shippingCostsAsPosition = (bool) ($config['shippingCostsAsPosition'] ?? false); $this->getOrder(); diff --git a/engine/Shopware/Models/Mail/LogRepository.php b/engine/Shopware/Models/Mail/LogRepository.php index cb1cf920de0..733d95d872c 100644 --- a/engine/Shopware/Models/Mail/LogRepository.php +++ b/engine/Shopware/Models/Mail/LogRepository.php @@ -28,8 +28,8 @@ use DateTimeInterface; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Mapping\ClassMetadata; -use Doctrine\ORM\QueryBuilder; use Shopware\Components\Model\ModelRepository; +use Shopware\Components\Model\QueryBuilder; /** * @extends ModelRepository @@ -100,9 +100,7 @@ public function getDeleteByDateQueryBuilder(?DateTimeInterface $since, ?DateTime protected function addDateConstraint(QueryBuilder $qb, ?DateTimeInterface $since, ?DateTimeInterface $until): void { $qb->andWhere('log.sentAt BETWEEN :since AND :until') - ->setParameters([ - 'since' => $since ?: $this->minDate, - 'until' => $until ?: $this->maxDate, - ]); + ->setParameter('since', $since ?: $this->minDate) + ->setParameter('until', $until ?: $this->maxDate); } } diff --git a/engine/Shopware/Models/Shop/DetachedShop.php b/engine/Shopware/Models/Shop/DetachedShop.php index 966a65cd4e2..0df8d35a4ef 100644 --- a/engine/Shopware/Models/Shop/DetachedShop.php +++ b/engine/Shopware/Models/Shop/DetachedShop.php @@ -41,6 +41,10 @@ public static function createFromShop(Shop $shop) $self = new self(); foreach ($shop as $field => $value) { + if (\in_array($field, ['__initializer__', '__cloner__', '__isInitialized__'], true)) { + /* skip properties from Doctrine proxies @see \Doctrine\Common\Proxy\ProxyGenerator */ + continue; + } $self->{$field} = $value; } From 1c9f000843bf5a2bb957f787d84d7edf51534435 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Tue, 27 Jun 2023 15:34:35 +0200 Subject: [PATCH 423/730] fix(SW-27005): Fix notices and warnings in core classes --- .phpstan-baseline.neon | 5 - engine/Shopware/Core/sAdmin.php | 83 +++++++------- engine/Shopware/Core/sArticles.php | 21 ++-- engine/Shopware/Core/sArticlesComparisons.php | 46 ++++---- engine/Shopware/Core/sBasket.php | 44 ++++---- engine/Shopware/Core/sCategories.php | 2 +- engine/Shopware/Core/sCore.php | 2 +- engine/Shopware/Core/sExport.php | 13 ++- engine/Shopware/Core/sOrder.php | 104 +++++++++--------- 9 files changed, 164 insertions(+), 156 deletions(-) diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index cf56d1895ad..800ff22d604 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -26340,11 +26340,6 @@ parameters: count: 1 path: engine/Shopware/Core/sCore.php - - - message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, string\\|null given\\.$#" - count: 1 - path: engine/Shopware/Core/sCore.php - - message: "#^Method sExport\\:\\:_decode_line\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 diff --git a/engine/Shopware/Core/sAdmin.php b/engine/Shopware/Core/sAdmin.php index 797b289526a..6fc34573e9c 100644 --- a/engine/Shopware/Core/sAdmin.php +++ b/engine/Shopware/Core/sAdmin.php @@ -244,22 +244,25 @@ public function sGetPaymentMeanById($id, $user = false) $sEsd = $this->moduleManager->Basket()->sCheckForESD(); $isMobile = $this->front->Request()->getDeviceType() === 'mobile'; - if (!\is_array($user)) { - $user = []; + $customer = $user; + if (!\is_array($customer)) { + $customer = []; } + $paymentId = $data['id'] ?? null; + // Check for risk management // If rules match, reset to default payment mean if this payment mean was not // set by shop owner // Hide payment means which are not active - if (!$data['active'] && $data['id'] != $user['additional']['user']['paymentpreset']) { + if (empty($data['active']) && $paymentId != ($customer['additional']['user']['paymentpreset'] ?? null)) { $resetPayment = $this->config->get('sPAYMENTDEFAULT'); } // If esd - order, hide payment means which // are not available for esd - if (!$data['esdactive'] && $sEsd) { + if (empty($data['esdactive']) && $sEsd) { $resetPayment = $this->config->get('sPAYMENTDEFAULT'); } @@ -270,13 +273,13 @@ public function sGetPaymentMeanById($id, $user = false) // Check additional rules if ( - $this->sManageRisks($data['id'], null, $user) - && $data['id'] != $user['additional']['user']['paymentpreset'] + $this->sManageRisks($paymentId, null, $customer) + && $paymentId != ($customer['additional']['user']['paymentpreset'] ?? null) ) { $resetPayment = $this->config->get('sPAYMENTDEFAULT'); } - if (!empty($user['additional']['countryShipping']['id'])) { + if (!empty($customer['additional']['countryShipping']['id'])) { $sql = ' SELECT 1 FROM s_core_paymentmeans p @@ -303,7 +306,7 @@ public function sGetPaymentMeanById($id, $user = false) $sql, [ $this->contextService->getShopContext()->getShop()->getId(), - $user['additional']['countryShipping']['id'], + $customer['additional']['countryShipping']['id'], $id, ] ); @@ -312,7 +315,7 @@ public function sGetPaymentMeanById($id, $user = false) } } - if ($resetPayment && $user['additional']['user']['id']) { + if ($resetPayment && ($customer['additional']['user']['id'] ?? null)) { $this->eventManager->notify( 'Shopware_Modules_Admin_Payment_Fallback', $data @@ -321,14 +324,14 @@ public function sGetPaymentMeanById($id, $user = false) $this->db->update( 's_user', ['paymentID' => $resetPayment], - ['id = ?' => $user['additional']['user']['id']] + ['id = ?' => $customer['additional']['user']['id']] ); $data = ['id' => $resetPayment]; } - if (isset($data['id'])) { + if (isset($paymentId)) { $data = Shopware()->Container()->get(PaymentGatewayInterface::class) - ->getList([$data['id']], $this->contextService->getShopContext()); + ->getList([$paymentId], $this->contextService->getShopContext()); if (!empty($data)) { $data = Shopware()->Container()->get(LegacyStructConverter::class) @@ -336,13 +339,11 @@ public function sGetPaymentMeanById($id, $user = false) } } - $data = $this->eventManager->filter( + return $this->eventManager->filter( 'Shopware_Modules_Admin_GetPaymentMeanById_DataFilter', $data, - ['subject' => $this, 'id' => $id, 'user' => $user] + ['subject' => $this, 'id' => $id, 'user' => $customer] ); - - return $data; } /** @@ -361,7 +362,7 @@ public function sGetPaymentMeans() $sEsd = $this->moduleManager->Basket()->sCheckForESD(); - $countryID = (int) $user['additional']['countryShipping']['id']; + $countryID = (int) ($user['additional']['countryShipping']['id'] ?? 0); $subShopID = (int) $this->contextService->getShopContext()->getShop()->getId(); if (empty($countryID)) { $countryID = $this->db->fetchOne( @@ -418,7 +419,7 @@ public function sGetPaymentMeans() foreach ($paymentMethods as $payKey => $payValue) { // Hide payment means which are not active - if (empty($payValue['active']) && $payValue['id'] != $user['additional']['user']['paymentpreset']) { + if (empty($payValue['active']) && $payValue['id'] != ($user['additional']['user']['paymentpreset'] ?? 0)) { unset($paymentMethods[$payKey]); continue; } @@ -438,7 +439,7 @@ public function sGetPaymentMeans() // Check additional rules if ( $this->sManageRisks($payValue['id'], null, $user) - && $payValue['id'] != $user['additional']['user']['paymentpreset'] + && $payValue['id'] != ($user['additional']['user']['paymentpreset'] ?? 0) ) { unset($paymentMethods[$payKey]); } @@ -466,7 +467,7 @@ public function sGetPaymentMeans() /** * Loads the system class of the specified payment mean * - * @param array $paymentData Array with payment data + * @param array|null $paymentData Array with payment data * * @throws Enlight_Exception If no payment classes were loaded * @@ -477,10 +478,12 @@ public function sInitiatePaymentClass($paymentData) /** @var array $dirs */ $dirs = []; - if (str_ends_with($paymentData['class'], '.php')) { - $index = substr($paymentData['class'], 0, (int) strpos($paymentData['class'], '.php')); - } else { - $index = $paymentData['class']; + if (\is_array($paymentData)) { + if (str_ends_with($paymentData['class'], '.php')) { + $index = substr($paymentData['class'], 0, (int) strpos($paymentData['class'], '.php')); + } else { + $index = $paymentData['class']; + } } $dirs = $this->eventManager->filter( @@ -489,7 +492,7 @@ public function sInitiatePaymentClass($paymentData) ['subject' => $this] ); - $class = \array_key_exists($index, $dirs) ? $dirs[$index] : $dirs['default']; + $class = isset($index) && \array_key_exists($index, $dirs) ? $dirs[$index] : $dirs['default']; if (!$class) { throw new Enlight_Exception('sValidateStep3 #02: Payment classes dir not loaded'); } @@ -741,7 +744,7 @@ public function sLogin($ignoreAccountMode = false) $sErrorMessages = null; // If fields are not set, markup these fields - $email = strtolower($this->front->Request()->getPost('email')); + $email = strtolower($this->front->Request()->getPost('email', '')); if (empty($email)) { $sErrorFlag['email'] = true; } @@ -964,7 +967,7 @@ public function sGetCountryTranslation($country = []) if ($translationData[$country['id']]['countryname']) { $country['countryname'] = $translationData[$country['id']]['countryname']; } - if ($translationData[$country['id']]['notice']) { + if (isset($translationData[$country['id']]['notice'])) { $country['notice'] = $translationData[$country['id']]['notice']; } @@ -998,13 +1001,13 @@ public function sGetDispatchTranslation($dispatch = []) } // Pass (possible) translation to country - if ($translationData[$dispatch['id']]['dispatch_name']) { + if (isset($translationData[$dispatch['id']]['dispatch_name'])) { $dispatch['name'] = $translationData[$dispatch['id']]['dispatch_name']; } - if ($translationData[$dispatch['id']]['dispatch_description']) { + if (isset($translationData[$dispatch['id']]['dispatch_description'])) { $dispatch['description'] = $translationData[$dispatch['id']]['dispatch_description']; } - if ($translationData[$dispatch['id']]['dispatch_status_link']) { + if (isset($translationData[$dispatch['id']]['dispatch_status_link'])) { $dispatch['status_link'] = $translationData[$dispatch['id']]['dispatch_status_link']; } @@ -1512,7 +1515,7 @@ public function sGetUserData() if ( $this->session->offsetGet('sCountry') - && $this->session->offsetGet('sCountry') != $register['billing']['country'] + && $this->session->offsetGet('sCountry') != ($register['billing']['country'] ?? 0) ) { $register['billing']['country'] = (int) $this->session->offsetGet('sCountry'); $this->session->offsetSet('sRegister', $register); @@ -1520,7 +1523,7 @@ public function sGetUserData() $userData['additional']['country'] = $this->db->fetchRow( $countryQuery, - [(int) $register['billing']['country']] + [(int) ($register['billing']['country'] ?? 0)] ); $userData['additional']['country'] = $userData['additional']['country'] ?: []; $userData['additional']['countryShipping'] = $userData['additional']['country']; @@ -1861,6 +1864,10 @@ public function sRiskBILLINGLANDISNOT($user, $order, $value) */ public function sRiskNEWCUSTOMER($user, $order, $value) { + if (!isset($user['additional']['user'])) { + return true; + } + return date('Y-m-d') == $user['additional']['user']['firstlogin'] || !$user['additional']['user']['firstlogin']; } @@ -2339,8 +2346,8 @@ public function sNewsletterSubscription($email, $unsubscribe = false, $groupID = ]; } - if (preg_match(PersonalFormType::DOMAIN_NAME_REGEX, $this->front->Request()->getPost('firstname')) === 1 - || preg_match(PersonalFormType::DOMAIN_NAME_REGEX, $this->front->Request()->getPost('lastname')) === 1) { + if (preg_match(PersonalFormType::DOMAIN_NAME_REGEX, $this->front->Request()->getPost('firstname', '')) === 1 + || preg_match(PersonalFormType::DOMAIN_NAME_REGEX, $this->front->Request()->getPost('lastname', '')) === 1) { return [ 'code' => 10, 'message' => $this->snippetManager->getNamespace('frontend/account/internalMessages') @@ -2724,7 +2731,7 @@ public function sGetPremiumDispatches($countryID = null, $paymentID = null, $sta $sqlBasket = []; foreach ($basket as $key => $value) { - $sqlBasket[] = $this->connection->quote($value) . " as `$key`"; + $sqlBasket[] = $this->connection->quote($value ?? '') . " as `$key`"; } $sqlBasket = implode(',', $sqlBasket); @@ -2897,7 +2904,7 @@ public function sGetPremiumDispatchSurcharge($basket, $type = 2) } $sql_basket = []; foreach ($basket as $key => $value) { - $sql_basket[] = $this->db->quote($value) . " as `$key`"; + $sql_basket[] = $this->db->quote($value ?? '') . " as `$key`"; } $sql_basket = implode(', ', $sql_basket); @@ -3016,7 +3023,7 @@ public function sGetPremiumShippingcosts($country = null) } $this->db->delete('s_order_basket', [ - 'sessionID = ?' => $this->session->offsetGet('sessionId'), + 'sessionID = ?' => $this->session->get('sessionId'), 'modus IN (?)' => [3, 4], 'ordernumber IN (?)' => array_merge(...[ $this->cartOrderNumberProvider->getAll(CartOrderNumberProviderInterface::PAYMENT_ABSOLUTE), @@ -3572,7 +3579,7 @@ private function failedLoginUser(string $addScopeSql, string $email, ?array $sEr $getUser = $this->db->fetchRow($sql, [$email]); // If the verification process is active, the customer has an email sent date, but no confirm date - if ($getUser['doubleOptinRegister'] && $getUser['doubleOptinEmailSentDate'] !== null && $getUser['doubleOptinConfirmDate'] === null) { + if ($getUser && $getUser['doubleOptinRegister'] && $getUser['doubleOptinEmailSentDate'] !== null && $getUser['doubleOptinConfirmDate'] === null) { $hash = $this->optInLoginService->refreshOptInHashForUser( (int) $getUser['id'], (int) $getUser['register_opt_in_id'], diff --git a/engine/Shopware/Core/sArticles.php b/engine/Shopware/Core/sArticles.php index f305a3dc77b..d35147656cf 100644 --- a/engine/Shopware/Core/sArticles.php +++ b/engine/Shopware/Core/sArticles.php @@ -1831,7 +1831,6 @@ public function sGetTranslation($data, $id, $object, $language = null) public function sGetConfiguratorImage($sArticle, $sCombination = '') { if (!empty($sArticle['sConfigurator']) || !empty($sCombination)) { - $foundImage = false; $configuratorImages = false; $mainKey = 0; @@ -1839,22 +1838,23 @@ public function sGetConfiguratorImage($sArticle, $sCombination = '') if (!empty($sArticle['image']['res']['description'])) { $sArticle['image']['description'] = $sArticle['image']['res']['description']; } - $sArticle['image']['relations'] = $sArticle['image']['res']['relations']; - foreach ($sArticle['sConfigurator'] as $key => $group) { - foreach ($group['values'] as $key2 => $option) { - $groupVal = $group['groupnameOrig'] ? $group['groupnameOrig'] : $group['groupname']; + $sArticle['image']['relations'] = $sArticle['image']['res']['relations'] ?? null; + foreach ($sArticle['sConfigurator'] as $group) { + foreach ($group['values'] as $option) { + $groupVal = $group['groupnameOrig'] ?? $group['groupname']; $groupVal = str_replace(['/', ' '], '', $groupVal); - $optionVal = $option['optionnameOrig'] ? $option['optionnameOrig'] : $option['optionname']; + $optionVal = $option['optionnameOrig'] ?? $option['optionname']; $optionVal = str_replace(['/', ' '], '', $optionVal); if (!empty($option['selected'])) { $replacedOptionVal = str_replace(' ', '', $optionVal); - $referenceImages[strtolower($groupVal . ':' . $optionVal)] = true; + \assert(\is_string($replacedOptionVal)); + $referenceImages[strtolower(sprintf('%s:%s', $groupVal, $replacedOptionVal))] = true; } } } foreach (array_merge($sArticle['images'] ?? [], [\count($sArticle['images'] ?? []) => $sArticle['image']]) as $value) { - if (preg_match('/(.*){(.*)}/', $value['relations'])) { + if (preg_match('/(.*){(.*)}/', $value['relations'] ?? '')) { $configuratorImages = true; break; @@ -1940,7 +1940,8 @@ public function sGetConfiguratorImage($sArticle, $sCombination = '') if (!empty($sArticle['images'])) { foreach ($sArticle['images'] as $key => $image) { - if ($image['relations'] === '&{}' || $image['relations'] === '||{}') { + $relations = $image['relations'] ?? ''; + if ($relations === '&{}' || $relations === '||{}') { $sArticle['images'][$key]['relations'] = ''; } } @@ -2269,7 +2270,7 @@ private function getDataOfProductImage(?array $image, Album $productAlbum): arra $size = sprintf('%sx%s', $size, $size); } - if ($image['type'] === Media::TYPE_IMAGE || $image['media']['type'] === Media::TYPE_IMAGE) { + if (isset($image['type']) && $image['type'] === Media::TYPE_IMAGE || $image['media']['type'] === Media::TYPE_IMAGE) { $imageData['src'][$key] = $mediaService->getUrl('media/image/thumbnail/' . $image['path'] . '_' . $size . '.' . $image['extension']); if ($highDpiThumbnails) { diff --git a/engine/Shopware/Core/sArticlesComparisons.php b/engine/Shopware/Core/sArticlesComparisons.php index bcc4e81f546..7df8b28ff4a 100644 --- a/engine/Shopware/Core/sArticlesComparisons.php +++ b/engine/Shopware/Core/sArticlesComparisons.php @@ -107,7 +107,7 @@ public function sAddComparison($articleId) } // Check if this product is already noted - $checkForProduct = $this->db->fetchRow( + $checkForProduct = $this->db->fetchOne( 'SELECT id FROM s_order_comparisons WHERE sessionID=? AND articleID=?', [$this->session->offsetGet('sessionId'), $productId] ); @@ -122,31 +122,31 @@ public function sAddComparison($articleId) return 'max_reached'; } - if (!$checkForProduct['id']) { - $productName = $this->db->fetchOne( - 'SELECT s_articles.name AS articleName FROM s_articles WHERE id = ?', - [$productId] - ); + if ($checkForProduct !== false) { + return true; + } - if (!$productName) { - return false; - } + $productName = $this->db->fetchOne( + 'SELECT s_articles.name AS articleName FROM s_articles WHERE id = ?', + [$productId] + ); - $sql = ' - INSERT INTO s_order_comparisons (sessionID, userID, articlename, articleID, datum) - VALUES (?,?,?,?,now()) - '; + if (!$productName) { + return false; + } - $queryNewPrice = $this->db->executeUpdate($sql, [ - $this->session->offsetGet('sessionId'), - empty($this->session['sUserId']) ? 0 : $this->session['sUserId'], - $productName, - $productId, - ]); + $sql = 'INSERT INTO s_order_comparisons (sessionID, userID, articlename, articleID, datum) + VALUES (?,?,?,?,now())'; - if (!$queryNewPrice) { - throw new Enlight_Exception('sArticles##sAddComparison##01: Error in SQL-query'); - } + $queryNewPrice = $this->db->executeUpdate($sql, [ + $this->session->offsetGet('sessionId'), + empty($this->session['sUserId']) ? 0 : $this->session['sUserId'], + $productName, + $productId, + ]); + + if (!$queryNewPrice) { + throw new Enlight_Exception('sArticles##sAddComparison##01: Error in SQL-query'); } return true; @@ -294,7 +294,7 @@ public function sFillUpComparisonArticles($properties, $articles) foreach ($articles as $productKey => $product) { $productProperties = []; foreach ($properties as $propertyKey => $property) { - if (\is_array($product['sProperties']) && \array_key_exists($propertyKey, $product['sProperties'])) { + if (isset($product['sProperties']) && \is_array($product['sProperties']) && \array_key_exists($propertyKey, $product['sProperties'])) { $productProperties[$propertyKey] = $product['sProperties'][$propertyKey]; } else { $productProperties[$propertyKey] = null; diff --git a/engine/Shopware/Core/sBasket.php b/engine/Shopware/Core/sBasket.php index 2db3f21a869..988e21b6518 100644 --- a/engine/Shopware/Core/sBasket.php +++ b/engine/Shopware/Core/sBasket.php @@ -426,7 +426,7 @@ public function sInsertDiscount() $tax = 19; } - if (!$this->sSYSTEM->sUSERGROUPDATA['tax'] && $this->sSYSTEM->sUSERGROUPDATA['id']) { + if (empty($this->sSYSTEM->sUSERGROUPDATA['tax']) && $this->sSYSTEM->sUSERGROUPDATA['id']) { $discountNet = $discount; } else { $discountNet = round($discount / (100 + $tax) * 100, 3); @@ -754,7 +754,7 @@ public function sAddVoucher($voucherCode, $basket = '') return ['sErrorFlag' => true, 'sErrorMessages' => $sErrorMessages]; } - if ($voucherDetails['id']) { + if (!empty($voucherDetails['id'])) { // If we have voucher details, it's a reusable code // We need to check how many times it has already been used $usedVoucherCount = $this->db->fetchRow( @@ -784,10 +784,10 @@ public function sAddVoucher($voucherCode, $basket = '') ) ?: []; unset($voucherCodeDetails['voucherID']); $voucherDetails = array_merge($voucherCodeDetails, $voucherDetails); - $individualCode = $voucherDetails && $voucherDetails['description']; + $individualCode = $voucherDetails && ($voucherDetails['description'] ?? null); } } - $streams = array_filter(explode('|', $voucherDetails['customer_stream_ids'])); + $streams = array_filter(explode('|', $voucherDetails['customer_stream_ids'] ?? '')); if (!empty($streams)) { $context = $this->contextService->getShopContext(); @@ -809,7 +809,7 @@ public function sAddVoucher($voucherCode, $basket = '') // 3 - Voucher is reusable and has already been used to the limit if (!$voucherDetails || !$voucherCode - || ($voucherDetails['numberofunits'] <= $usedVoucherCount['vouchers'] && !$individualCode) + || (($voucherDetails['numberofunits'] ?? 0) <= ($usedVoucherCount['vouchers'] ?? 0) && !$individualCode) ) { $sErrorMessages[] = $this->snippetManager->getNamespace('frontend/basket/internalMessages')->get( 'VoucherFailureNotFound', @@ -875,7 +875,7 @@ public function sAddVoucher($voucherCode, $basket = '') $voucherDetails['value'] *= $factor; } - $basketValue = $amount['totalAmount'] / $factor; + $basketValue = ($amount['totalAmount'] ?? 0) / $factor; // Check if the basket's value is above the voucher's if ($basketValue < $voucherDetails['minimumcharge']) { $snippet = $this->snippetManager->getNamespace('frontend/basket/internalMessages')->get( @@ -1092,7 +1092,7 @@ public function sCheckMinimumCharge() if ($minimumOrder && !$this->sSYSTEM->sUSERGROUPDATA['minimumordersurcharge']) { $amount = $this->sGetAmount(); - if ($amount['totalAmount'] < ($minimumOrder * $factor)) { + if (($amount['totalAmount'] ?? 0) < ($minimumOrder * $factor)) { return $minimumOrder * $factor; } } @@ -1149,7 +1149,7 @@ public function sInsertSurcharge() $tax = 19; } - if (!$this->sSYSTEM->sUSERGROUPDATA['tax'] && $this->sSYSTEM->sUSERGROUPDATA['id']) { + if (empty($this->sSYSTEM->sUSERGROUPDATA['tax']) && $this->sSYSTEM->sUSERGROUPDATA['id']) { $discountNet = $minimumOrderSurcharge; } else { $discountNet = round($minimumOrderSurcharge / (100 + $tax) * 100, 3); @@ -1215,13 +1215,13 @@ public function sInsertSurcharge() } /** - * Add percentual surcharge + * Add percentage surcharge * Used only internally in sBasket::sGetBasket * * @throws \Enlight_Exception * @throws \Zend_Db_Adapter_Exception * - * @return false|void|null False on failure, null on success + * @return false|null False on failure, null on success */ public function sInsertSurchargePercent() { @@ -1287,7 +1287,7 @@ public function sInsertSurchargePercent() $tax = 19; } - if (!$this->sSYSTEM->sUSERGROUPDATA['tax'] && $this->sSYSTEM->sUSERGROUPDATA['id']) { + if (empty($this->sSYSTEM->sUSERGROUPDATA['tax']) && $this->sSYSTEM->sUSERGROUPDATA['id']) { $discountNet = $surcharge; } else { $discountNet = round($surcharge / (100 + $tax) * 100, 3); @@ -1796,7 +1796,7 @@ public function updateCartItems(array $cartItems) 'price' => $grossPrice, 'netprice' => $netPrice, 'currencyFactor' => $this->sSYSTEM->sCurrency['factor'], - 'articlename' => $additionalInfo['name'], + 'articlename' => $additionalInfo['name'] ?? null, ] ); @@ -2337,7 +2337,7 @@ private function checkIfProductIsInBasket($productId, $orderNumber, $sessionId) private function filterUsedVoucher($userId, $voucherDetails) { $sErrorMessages = []; - if ($userId && $voucherDetails['id']) { + if ($userId && !empty($voucherDetails['id'])) { $queryVoucher = $this->db->fetchAll( 'SELECT s_order_details.id AS id FROM s_order, s_order_details @@ -2721,7 +2721,7 @@ private function getBasketProducts(array $getProducts): array ->round($netprice, $tax, $quantity); // If basket comprised any discount, calculate brutto-value for the discount - if ($this->sSYSTEM->sUSERGROUPDATA['basketdiscount'] && $this->sCheckForDiscount()) { + if ($this->contextService->getShopContext()->getCurrentCustomerGroup()->getPercentageDiscount() && $this->sCheckForDiscount()) { $discount += ($getProducts[$key]['amountWithTax'] / 100 * $this->sSYSTEM->sUSERGROUPDATA['basketdiscount']); } } elseif ($getProducts[$key]['modus'] == CartPositionsMode::CUSTOMER_GROUP_DISCOUNT) { @@ -2737,7 +2737,7 @@ private function getBasketProducts(array $getProducts): array || $getProducts[$key]['modus'] == CartPositionsMode::SWAG_BUNDLE_DISCOUNT ) { $getProducts[$key]['amountWithTax'] = round(1 * ($price / 100 * (100 + $tax)), 2); - if ($this->sSYSTEM->sUSERGROUPDATA['basketdiscount'] && $this->sCheckForDiscount()) { + if (isset($this->sSYSTEM->sUSERGROUPDATA['basketdiscount']) && $this->sCheckForDiscount()) { $discount += ($getProducts[$key]['amountWithTax'] / 100 * $this->sSYSTEM->sUSERGROUPDATA['basketdiscount']); } } @@ -2951,22 +2951,22 @@ private function getAdditionalInfoForUpdateProduct(array $cartItems): void $additionalInfo = []; $quantity = $cartItem->getQuantity(); - if ($additionalInformation[$cartItem->getId()]) { + if (isset($additionalInformation[$cartItem->getId()])) { $additionalInfo = $additionalInformation[$cartItem->getId()]; } // Check if quantity matches minimum purchase - if (!$additionalInfo['minpurchase']) { + if (empty($additionalInfo['minpurchase'])) { $additionalInfo['minpurchase'] = 1; } - $additionalInfo['blocked_customer_groups'] = array_filter(explode('|', $additionalInfo['blocked_customer_groups'])); + $additionalInfo['blocked_customer_groups'] = array_filter(explode('|', $additionalInfo['blocked_customer_groups'] ?? '')); if ($quantity < $additionalInfo['minpurchase']) { $quantity = $additionalInfo['minpurchase']; } // Check if quantity matches the step requirements - if (!$additionalInfo['purchasesteps']) { + if (empty($additionalInfo['purchasesteps'])) { $additionalInfo['purchasesteps'] = 1; } @@ -2988,7 +2988,7 @@ private function getAdditionalInfoForUpdateProduct(array $cartItems): void $additionalInfo['purchaseunit'] = 1; } - if (isset($products[$additionalInfo['ordernumber']])) { + if (isset($additionalInfo['ordernumber']) && isset($products[$additionalInfo['ordernumber']])) { $additionalInfo['product'] = $products[$additionalInfo['ordernumber']]; $additionalInfo['name'] = $additionalInfo['product']->getName(); @@ -3048,7 +3048,7 @@ private function getPricesForItemUpdates(array $cartItems) /** @var CartItemStruct $cartItem */ foreach ($cartItems as $cartItem) { $quantity = $cartItem->getQuantity(); - $prices = $itemPrices[$cartItem->getId()]; + $prices = $itemPrices[$cartItem->getId()] ?? null; $additionalInfo = $cartItem->getAdditionalInfo(); $priceResult = []; @@ -3314,7 +3314,7 @@ private function getProductForAddProduct($id) private function getBasketQuantity(int $quantity, array $basketProduct, array $product): int { - $newQuantity = ($quantity + $basketProduct['quantity']) ?: 0; + $newQuantity = $quantity + ($basketProduct['quantity'] ?? 0); if ($product['laststock'] && $newQuantity > $product['instock']) { return (int) $product['instock']; diff --git a/engine/Shopware/Core/sCategories.php b/engine/Shopware/Core/sCategories.php index bf9aacf8de7..463f2b472fd 100644 --- a/engine/Shopware/Core/sCategories.php +++ b/engine/Shopware/Core/sCategories.php @@ -438,7 +438,7 @@ protected function mapCategoryTree($categories) $category['description'] = $category['name']; $category['link'] = $category['external'] ?: $url . $category['id']; $category['hidetop'] = $category['hideTop']; - if ($category['sub']) { + if (isset($category['sub'])) { $category['sub'] = $this->mapCategoryTree($category['sub']); } } diff --git a/engine/Shopware/Core/sCore.php b/engine/Shopware/Core/sCore.php index 03450355fe2..17d2db066fc 100644 --- a/engine/Shopware/Core/sCore.php +++ b/engine/Shopware/Core/sCore.php @@ -103,7 +103,7 @@ public function sBuildLink($sVariables) */ public function sRewriteLink($link = null, $title = null) { - $url = html_entity_decode(str_replace(',', '=', $link)); + $url = html_entity_decode(str_replace(',', '=', $link ?? '')); $query = (string) parse_url($url, PHP_URL_QUERY); parse_str($query, $queryArray); diff --git a/engine/Shopware/Core/sExport.php b/engine/Shopware/Core/sExport.php index b01c89b38b2..f29df3ac098 100644 --- a/engine/Shopware/Core/sExport.php +++ b/engine/Shopware/Core/sExport.php @@ -414,7 +414,7 @@ public function sHtmlEntities($string, $char_set = null) } /** - * @param string $string + * @param string|null $string * @param string $esc_type * @param string|null $char_set * @@ -426,14 +426,17 @@ public function sFormatString($string, $esc_type = '', $char_set = null) } /** - * @param string $string + * @param string|null $string * @param string $esc_type * @param string|null $char_set * - * @return mixed|string + * @return string */ public function sEscapeString($string, $esc_type = '', $char_set = null) { + if ($string === null) { + $string = ''; + } if (empty($esc_type)) { if (!empty($this->sSettings['formatID']) && $this->sSettings['formatID'] == 3) { $esc_type = 'html'; @@ -492,7 +495,7 @@ public function sEscapeString($string, $esc_type = '', $char_set = null) case 'quotes': // Escape unescaped single quotes - return preg_replace("%(? $basketRow['articlename'], - 'sMail' => $this->sUserData['additional']['user']['email'], + 'sMail' => $this->sUserData['additional']['user']['email'] ?? null, ]; $mail = Shopware()->TemplateMail()->createMail('sNOSERIALS', $context); @@ -395,7 +395,7 @@ public function sDeleteTemporaryOrder() */ public function sCreateTemporaryOrder() { - $this->sShippingData[CartKey::AMOUNT_NUMERIC] = $this->sShippingData[CartKey::AMOUNT_NUMERIC] ? $this->sShippingData[CartKey::AMOUNT_NUMERIC] : '0'; + $this->sShippingData[CartKey::AMOUNT_NUMERIC] = $this->sShippingData[CartKey::AMOUNT_NUMERIC] ?? '0'; if (!$this->sShippingcostsNumeric) { $this->sShippingcostsNumeric = 0.; } @@ -500,7 +500,7 @@ public function sCreateTemporaryOrder() if (!$basketRow['taxID']) { $basketRow['taxID'] = '0'; } - if (!$basketRow['releasedate']) { + if (empty($basketRow['releasedate'])) { $basketRow['releasedate'] = null; } @@ -508,7 +508,7 @@ public function sCreateTemporaryOrder() 'orderID' => $orderID, 'ordernumber' => 0, 'articleID' => $basketRow['articleID'], - 'articleDetailID' => $basketRow['additional_details']['articleDetailsID'], + 'articleDetailID' => $basketRow['additional_details']['articleDetailsID'] ?? null, 'articleordernumber' => $basketRow['ordernumber'], 'price' => $basketRow['priceNumeric'], 'quantity' => $basketRow['quantity'], @@ -541,10 +541,10 @@ public function sCreateTemporaryOrder() */ public function sSaveOrder() { - $this->sComment = stripslashes($this->sComment); + $this->sComment = stripslashes($this->sComment ?? ''); $this->sComment = stripcslashes($this->sComment); - $this->sShippingData[CartKey::AMOUNT_NUMERIC] = $this->sShippingData[CartKey::AMOUNT_NUMERIC] ?: '0'; + $this->sShippingData[CartKey::AMOUNT_NUMERIC] = $this->sShippingData[CartKey::AMOUNT_NUMERIC] ?? '0'; if ($this->isTransactionExist($this->bookingId)) { return false; @@ -610,7 +610,7 @@ public function sSaveOrder() 'invoice_amount_net' => $this->sBasketData[CartKey::AMOUNT_NET_NUMERIC], 'invoice_shipping' => (float) $this->sShippingcostsNumeric, 'invoice_shipping_net' => (float) $this->sShippingcostsNumericNet, - 'invoice_shipping_tax_rate' => isset($this->sBasketData[CheckoutKey::SHIPPING_COSTS_TAX_PROPORTIONAL]) ? 0 : $this->sBasketData[CheckoutKey::SHIPPING_COSTS_TAX], + 'invoice_shipping_tax_rate' => isset($this->sBasketData[CheckoutKey::SHIPPING_COSTS_TAX_PROPORTIONAL]) ? 0 : ($this->sBasketData[CheckoutKey::SHIPPING_COSTS_TAX] ?? 0), 'ordertime' => new Zend_Db_Expr('NOW()'), 'changed' => new Zend_Db_Expr('NOW()'), 'status' => 0, @@ -725,8 +725,8 @@ public function sSaveOrder() $basketRow['taxID'], $basketRow['tax_rate'], $this->db->quote((string) $basketRow['ean']), - $this->db->quote((string) $basketRow['itemUnit']), - $this->db->quote((string) $basketRow['packunit']), + $this->db->quote((string) ($basketRow['itemUnit'] ?? '')), + $this->db->quote((string) ($basketRow['packunit'] ?? '')), $basketRow['additional_details']['articleDetailsID'] ?? 'null' ); @@ -824,7 +824,7 @@ public function sSaveOrder() 'sAmountNumeric' => $this->sAmountWithTax ? $this->sAmountWithTax : $this->sAmount, 'sAmountNet' => $this->sSYSTEM->sMODULES['sArticles']->sFormatPrice($this->sBasketData[CartKey::AMOUNT_NET_NUMERIC]) . ' ' . $this->sBasketData[CheckoutKey::CURRENCY_NAME], 'sAmountNetNumeric' => $this->sBasketData[CartKey::AMOUNT_NET_NUMERIC], - 'sTaxRates' => $this->sBasketData[CheckoutKey::TAX_RATES], + 'sTaxRates' => $this->sBasketData[CheckoutKey::TAX_RATES] ?? null, 'ordernumber' => $orderNumber, 'sOrderDay' => date('d.m.Y'), 'sOrderTime' => date('H:i'), @@ -893,37 +893,37 @@ public function sendMail($variables) $shopContext = $this->contextService->getShopContext(); $context = [ - 'sOrderDetails' => $variables['sOrderDetails'], + 'sOrderDetails' => $variables['sOrderDetails'] ?? null, - 'billingaddress' => $variables['billingaddress'], - 'shippingaddress' => $variables['shippingaddress'], + 'billingaddress' => $variables['billingaddress'] ?? null, + 'shippingaddress' => $variables['shippingaddress'] ?? null, 'additional' => $variables['additional'], - 'sTaxRates' => $variables[CheckoutKey::TAX_RATES], - 'sShippingCosts' => $variables['sShippingCosts'], - 'sAmount' => $variables[CheckoutKey::AMOUNT], - 'sAmountNumeric' => $variables['sAmountNumeric'], - 'sAmountNet' => $variables['sAmountNet'], - 'sAmountNetNumeric' => $variables['sAmountNetNumeric'], + 'sTaxRates' => $variables[CheckoutKey::TAX_RATES] ?? null, + 'sShippingCosts' => $variables['sShippingCosts'] ?? null, + 'sAmount' => $variables[CheckoutKey::AMOUNT] ?? null, + 'sAmountNumeric' => $variables['sAmountNumeric'] ?? null, + 'sAmountNet' => $variables['sAmountNet'] ?? null, + 'sAmountNetNumeric' => $variables['sAmountNetNumeric'] ?? null, - 'sOrderNumber' => $variables['ordernumber'], - 'sOrderDay' => $variables['sOrderDay'], - 'sOrderTime' => $variables['sOrderTime'], - 'sComment' => $variables['sComment'], + 'sOrderNumber' => $variables['ordernumber'] ?? null, + 'sOrderDay' => $variables['sOrderDay'] ?? null, + 'sOrderTime' => $variables['sOrderTime'] ?? null, + 'sComment' => $variables['sComment'] ?? null, - 'attributes' => $variables['attributes'], - 'sCurrency' => $this->sBasketData[CheckoutKey::CURRENCY_NAME], + 'attributes' => $variables['attributes'] ?? null, + 'sCurrency' => $this->sBasketData[CheckoutKey::CURRENCY_NAME] ?? null, 'sLanguage' => $shopContext->getShop()->getId(), 'sSubShop' => $shopContext->getShop()->getId(), - 'sEsd' => $variables['sEsd'], + 'sEsd' => $variables['sEsd'] ?? null, 'sNet' => $this->sNet, ]; // Support for individual payment means with custom-tables - if ($variables['additional']['payment']['table']) { + if (!empty($variables['additional']['payment']['table'])) { $paymentTable = $this->db->fetchRow( "SELECT * FROM {$variables['additional']['payment']['table']} WHERE userID=?", @@ -934,11 +934,11 @@ public function sendMail($variables) $context['sPaymentTable'] = []; } - if ($variables['sDispatch']) { + if (isset($variables['sDispatch'])) { $context['sDispatch'] = $variables['sDispatch']; } - if ($variables['sBookingID']) { + if (isset($variables['sBookingID'])) { $context['sBookingID'] = $variables['sBookingID']; } @@ -973,7 +973,7 @@ public function sendMail($variables) $mail = Shopware()->TemplateMail()->createMail('sORDER', $context, null, $overrideConfig); } - $mail->addTo($this->sUserData['additional']['user']['email']); + $mail->addTo($this->sUserData['additional']['user']['email'] ?? ''); if (!$this->config->get('sNO_ORDER_MAIL')) { $mail->addBcc($this->config->get('sMAIL')); @@ -1093,9 +1093,9 @@ public function sSaveBillingAddress($address, $id) ':countryID' => $address['countryID'], ':stateID' => $address['stateID'], ':ustid' => $address['ustid'], - ':additional_address_line1' => $address['additional_address_line1'], - ':additional_address_line2' => $address['additional_address_line2'], - ':title' => $address['title'], + ':additional_address_line1' => $address['additional_address_line1'] ?? null, + ':additional_address_line2' => $address['additional_address_line2'] ?? null, + ':title' => $address['title'] ?? null, ]; $array = $this->eventManager->filter( 'Shopware_Modules_Order_SaveBilling_FilterArray', @@ -1198,12 +1198,12 @@ public function sSaveShippingAddress($address, $id) ':street' => (string) $address['street'], ':zipcode' => (string) $address['zipcode'], ':city' => (string) $address['city'], - ':phone' => (string) $address['phone'], + ':phone' => (string) ($address['phone'] ?? ''), ':countryID' => $address['countryID'], ':stateID' => $address['stateID'], - ':additional_address_line1' => (string) $address['additional_address_line1'], - ':additional_address_line2' => (string) $address['additional_address_line2'], - ':title' => (string) $address['title'], + ':additional_address_line1' => (string) ($address['additional_address_line1'] ?? ''), + ':additional_address_line2' => (string) ($address['additional_address_line2'] ?? ''), + ':title' => (string) ($address['title'] ?? ''), ]; $array = $this->eventManager->filter( 'Shopware_Modules_Order_SaveShipping_FilterArray', @@ -1811,13 +1811,13 @@ private function getAvailableSerialsOfEsd($esdId) * Checks if the passed transaction id is already set as transaction id of an * existing order. * - * @param string $transactionId + * @param string|null $transactionId * * @return bool */ private function isTransactionExist($transactionId) { - if (\strlen($transactionId) <= 3) { + if (!\is_string($transactionId) || \strlen($transactionId) <= 3) { return false; } @@ -1936,7 +1936,7 @@ private function getOrderDetailsForMail(array $basketRows) $content['articlename'] = str_replace("\n\n", "\n", $content['articlename']); } - $content['ordernumber'] = trim(html_entity_decode($content['ordernumber'])); + $content['ordernumber'] = trim(html_entity_decode($content['ordernumber'] ?? '')); $details[] = $content; } @@ -1997,7 +1997,7 @@ private function getUserDataForMail(array $userData) { $userData['billingaddress'] = $this->htmlEntityDecodeRecursive($userData['billingaddress']); $userData['shippingaddress'] = $this->htmlEntityDecodeRecursive($userData['shippingaddress']); - $userData['country'] = $this->htmlEntityDecodeRecursive($userData['country']); + $userData['country'] = $this->htmlEntityDecodeRecursive($userData['country'] ?? null); $userData['additional']['payment']['description'] = html_entity_decode( $userData['additional']['payment']['description'] @@ -2016,7 +2016,7 @@ private function htmlEntityDecodeRecursive(?array $data): ?array } $func = static function ($item) use (&$func) { - return \is_array($item) ? array_map($func, $item) : html_entity_decode($item); + return \is_array($item) ? array_map($func, $item) : html_entity_decode((string) $item); }; return array_map($func, $data); @@ -2041,25 +2041,25 @@ private function formatBasketRow($basketRow) $basketRow['articlename'] ); - if (!$basketRow['price']) { + if (empty($basketRow['price'])) { $basketRow['price'] = '0,00'; } - if (!$basketRow['esdarticle']) { + if (empty($basketRow['esdarticle'])) { $basketRow['esdarticle'] = '0'; } - if (!$basketRow['modus']) { + if (empty($basketRow['modus'])) { $basketRow['modus'] = '0'; } - if (!$basketRow['taxID']) { + if (empty($basketRow['taxID'])) { $basketRow['taxID'] = '0'; } - if ($this->sNet == true) { + if ($this->sNet) { $basketRow['taxID'] = '0'; } - if (!$basketRow['ean']) { + if (empty($basketRow['ean'])) { $basketRow['ean'] = ''; } - if (!$basketRow['releasedate']) { + if (empty($basketRow['releasedate'])) { $basketRow['releasedate'] = '0000-00-00'; } From 7605b6f139989c70b49fd7aa431a784885a998cf Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Tue, 27 Jun 2023 15:38:38 +0200 Subject: [PATCH 424/730] fix(SW-27005): Fix notices and warnings in controllers --- .phpstan-baseline.neon | 85 ------------------- .../Shopware/Controllers/Backend/Address.php | 2 +- .../Controllers/Backend/Analytics.php | 12 ++- .../Controllers/Backend/Application.php | 52 ++++++------ .../Shopware/Controllers/Backend/Article.php | 75 ++++++---------- .../Shopware/Controllers/Backend/Category.php | 24 ++---- .../Shopware/Controllers/Backend/Config.php | 4 +- .../Shopware/Controllers/Backend/Customer.php | 8 +- .../Controllers/Backend/EmotionPreset.php | 4 +- engine/Shopware/Controllers/Backend/ExtJs.php | 14 ++- engine/Shopware/Controllers/Backend/Index.php | 24 ++++-- engine/Shopware/Controllers/Backend/Log.php | 2 +- .../Controllers/Backend/MediaManager.php | 6 +- .../Controllers/Backend/Newsletter.php | 29 +------ engine/Shopware/Controllers/Backend/Order.php | 8 +- .../Shopware/Controllers/Backend/Payment.php | 47 +++++----- .../Controllers/Backend/ProductFeed.php | 2 +- .../Controllers/Backend/RiskManagement.php | 2 +- .../Shopware/Controllers/Backend/Shipping.php | 12 +-- .../Shopware/Controllers/Backend/Supplier.php | 2 +- .../Controllers/Backend/UserManager.php | 4 +- engine/Shopware/Controllers/Backend/Vote.php | 2 +- .../Shopware/Controllers/Backend/Voucher.php | 10 +-- .../Shopware/Controllers/Backend/Widgets.php | 6 +- .../Shopware/Controllers/Frontend/Account.php | 13 ++- engine/Shopware/Controllers/Frontend/Blog.php | 6 +- .../Controllers/Frontend/Checkout.php | 30 ++++--- .../Shopware/Controllers/Frontend/Forms.php | 6 +- .../Controllers/Frontend/Register.php | 17 ++-- .../Shopware/Controllers/Frontend/Search.php | 2 +- .../Shopware/Controllers/Frontend/Sitemap.php | 31 ++----- .../Controllers/Frontend/SitemapXml.php | 10 +-- .../Shopware/Controllers/Widgets/Listing.php | 2 + 33 files changed, 214 insertions(+), 339 deletions(-) diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index 800ff22d604..b8d8b1ed4f3 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -4030,11 +4030,6 @@ parameters: count: 1 path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/AttributeData.php - - - message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:addAclPermission\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php - - message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:columnNameExistsAction\\(\\) has no return type specified\\.$#" count: 1 @@ -21035,11 +21030,6 @@ parameters: count: 1 path: engine/Shopware/Controllers/Backend/Article.php - - - message: "#^Method Shopware_Controllers_Backend_Article\\:\\:loadAction\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/Article.php - - message: "#^Method Shopware_Controllers_Backend_Article\\:\\:loadStoresAction\\(\\) has no return type specified\\.$#" count: 1 @@ -22595,36 +22585,6 @@ parameters: count: 1 path: engine/Shopware/Controllers/Backend/Export.php - - - message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$targetField\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/ExtJs.php - - - - message: "#^Method Shopware_Controllers_Backend_ExtJs\\:\\:addAclPermission\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/ExtJs.php - - - - message: "#^Method Shopware_Controllers_Backend_ExtJs\\:\\:getAclRules\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/ExtJs.php - - - - message: "#^Method Shopware_Controllers_Backend_ExtJs\\:\\:indexAction\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/ExtJs.php - - - - message: "#^Method Shopware_Controllers_Backend_ExtJs\\:\\:loadAction\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/ExtJs.php - - - - message: "#^Property Shopware_Controllers_Backend_ExtJs\\:\\:\\$aclPermissions type has no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/ExtJs.php - - message: "#^Cannot call method getId\\(\\) on Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Struct\\\\LocaleStruct\\|null\\.$#" count: 1 @@ -22760,11 +22720,6 @@ parameters: count: 1 path: engine/Shopware/Controllers/Backend/Form.php - - - message: "#^Method Shopware_Controllers_Backend_Index\\:\\:authAction\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/Index.php - - message: "#^Method Shopware_Controllers_Backend_Index\\:\\:buildTree\\(\\) has parameter \\$nodes with no value type specified in iterable type array\\.$#" count: 1 @@ -22775,31 +22730,6 @@ parameters: count: 1 path: engine/Shopware/Controllers/Backend/Index.php - - - message: "#^Method Shopware_Controllers_Backend_Index\\:\\:changeLocaleAction\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/Index.php - - - - message: "#^Method Shopware_Controllers_Backend_Index\\:\\:indexAction\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/Index.php - - - - message: "#^Method Shopware_Controllers_Backend_Index\\:\\:init\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/Index.php - - - - message: "#^Method Shopware_Controllers_Backend_Index\\:\\:loadAction\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/Index.php - - - - message: "#^Method Shopware_Controllers_Backend_Index\\:\\:menuAction\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/Index.php - - message: "#^Method Shopware\\\\Controllers\\\\Backend\\\\Logger\\:\\:createLogAction\\(\\) has no return type specified\\.$#" count: 1 @@ -23785,11 +23715,6 @@ parameters: count: 1 path: engine/Shopware/Controllers/Backend/Search.php - - - message: "#^Method Shopware_Controllers_Backend_Search\\:\\:indexAction\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/Search.php - - message: "#^Method Shopware_Controllers_Backend_Search\\:\\:resolveCategoryPath\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 @@ -24010,11 +23935,6 @@ parameters: count: 1 path: engine/Shopware/Controllers/Backend/UpdateWizard.php - - - message: "#^Method Shopware_Controllers_Backend_UpdateWizard\\:\\:indexAction\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Controllers/Backend/UpdateWizard.php - - message: "#^Method Shopware_Controllers_Backend_UpdateWizard\\:\\:updateAction\\(\\) has no return type specified\\.$#" count: 1 @@ -24785,11 +24705,6 @@ parameters: count: 1 path: engine/Shopware/Controllers/Frontend/Sitemap.php - - - message: "#^Method Shopware_Controllers_Frontend_SitemapXml\\:\\:indexAction\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Controllers/Frontend/SitemapXml.php - - message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$sArticle\\.$#" count: 1 diff --git a/engine/Shopware/Controllers/Backend/Address.php b/engine/Shopware/Controllers/Backend/Address.php index 1ddc9044c39..d69d154ee75 100644 --- a/engine/Shopware/Controllers/Backend/Address.php +++ b/engine/Shopware/Controllers/Backend/Address.php @@ -90,7 +90,7 @@ public function save($data) } $data['country'] = $data['countryId']; - $data['state'] = $data['stateId']; + $data['state'] = $data['stateId'] ?? null; $form = $this->get('shopware.form.factory')->create(AddressFormType::class, $model); $form->submit($data); diff --git a/engine/Shopware/Controllers/Backend/Analytics.php b/engine/Shopware/Controllers/Backend/Analytics.php index 254f093e48d..623fc8b17b1 100644 --- a/engine/Shopware/Controllers/Backend/Analytics.php +++ b/engine/Shopware/Controllers/Backend/Analytics.php @@ -212,9 +212,15 @@ public function getOverviewAction() $this->getToDate() ); - $turnover = array_map('reset', $turnover->getData()); - $visitors = array_map('reset', $visitors->getData()); - $registrations = array_map('reset', $registrations->getData()); + $turnover = array_map(function ($turnoverItem) { + return reset($turnoverItem); + }, $turnover->getData()); + $visitors = array_map(function ($visitorsItem) { + return reset($visitorsItem); + }, $visitors->getData()); + $registrations = array_map(function ($registrationsItem) { + return reset($registrationsItem); + }, $registrations->getData()); $data = array_merge_recursive($turnover, $visitors); $data = array_merge_recursive($data, $registrations); diff --git a/engine/Shopware/Controllers/Backend/Application.php b/engine/Shopware/Controllers/Backend/Application.php index b1b0a27d20e..9829d7f7156 100644 --- a/engine/Shopware/Controllers/Backend/Application.php +++ b/engine/Shopware/Controllers/Backend/Application.php @@ -877,7 +877,7 @@ protected function resolveExtJsData($data) $column = $mapping['joinColumns'][0]['name']; $field = $metaData->getFieldForColumn($column); - if ($data[$field]) { + if (isset($data[$field])) { $associationModel = $this->getManager()->find($mapping['targetEntity'], $data[$field]); // proxies need to be loaded, otherwise the validation will be failed. @@ -1087,39 +1087,41 @@ protected function getFilterConditions($filters, $model, $alias, $whiteList = [] $conditions = []; foreach ($filters as $condition) { - if ($condition['property'] === 'search') { - foreach ($fields as $name => $field) { + if (isset($condition['property'])) { + if ($condition['property'] === 'search') { + foreach ($fields as $name => $field) { + // check if the developer limited the filterable fields and the passed property defined in the filter fields parameter. + if (!empty($whiteList) && !\in_array($name, $whiteList, true)) { + continue; + } + + $value = $this->formatSearchValue($condition['value'], $field); + + $conditions[] = [ + 'property' => $field['alias'], + 'operator' => 'OR', + 'value' => $value, + ]; + } + } elseif (\array_key_exists($condition['property'], $fields)) { // check if the developer limited the filterable fields and the passed property defined in the filter fields parameter. - if (!empty($whiteList) && !\in_array($name, $whiteList, true)) { + if (!empty($whiteList) && !\in_array($condition['property'], $whiteList, true)) { continue; } - $value = $this->formatSearchValue($condition['value'], $field); + $field = $fields[$condition['property']]; + $value = $this->formatSearchValue($condition['value'], $field, $condition['expression'] ?? null); - $conditions[] = [ + $tmpCondition = [ 'property' => $field['alias'], - 'operator' => 'OR', + 'operator' => $condition['operator'] ?? null, 'value' => $value, ]; + if (isset($condition['expression'])) { + $tmpCondition['expression'] = $condition['expression']; + } + $conditions[] = $tmpCondition; } - } elseif (\array_key_exists($condition['property'], $fields)) { - // check if the developer limited the filterable fields and the passed property defined in the filter fields parameter. - if (!empty($whiteList) && !\in_array($condition['property'], $whiteList, true)) { - continue; - } - - $field = $fields[$condition['property']]; - $value = $this->formatSearchValue($condition['value'], $field, $condition['expression'] ?? null); - - $tmpCondition = [ - 'property' => $field['alias'], - 'operator' => $condition['operator'] ?? null, - 'value' => $value, - ]; - if (isset($condition['expression'])) { - $tmpCondition['expression'] = $condition['expression']; - } - $conditions[] = $tmpCondition; } } diff --git a/engine/Shopware/Controllers/Backend/Article.php b/engine/Shopware/Controllers/Backend/Article.php index 4bfc4d85494..a8866b175db 100644 --- a/engine/Shopware/Controllers/Backend/Article.php +++ b/engine/Shopware/Controllers/Backend/Article.php @@ -843,8 +843,6 @@ public function setPropertyListAction() */ public function getArticleCategories($articleId) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $builder = $this->get('models')->createQueryBuilder(); $builder->select(['categories.id']) ->from(Category::class, 'categories', 'categories.id') @@ -881,8 +879,6 @@ public function getArticleCategories($articleId) */ public function getArticleSimilars($articleId) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $result = $this->getRepository() ->getArticleSimilarsQuery($articleId) ->getArrayResult(); @@ -905,8 +901,6 @@ public function getArticleSimilars($articleId) */ public function getArticleRelatedProductStreams($articleId) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $result = $this->get(ModelManager::class)->getRepository(Product::class) ->getArticleRelatedProductStreamsQuery($articleId) ->getArrayResult(); @@ -928,8 +922,6 @@ public function getArticleRelatedProductStreams($articleId) */ public function getArticleRelated($articleId) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $result = $this->getRepository() ->getArticleRelatedQuery($articleId) ->getArrayResult(); @@ -1016,8 +1008,6 @@ public function getArticleImages($articleId) */ public function getArticleLinks($articleId) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $result = $this->getRepository() ->getArticleLinksQuery($articleId) ->getArrayResult(); @@ -1048,8 +1038,6 @@ public function getArticleLinks($articleId) */ public function getArticleDownloads($articleId) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $result = $this->getRepository() ->getArticleDownloadsQuery($articleId) ->getArrayResult(); @@ -1075,8 +1063,6 @@ public function getArticleDownloads($articleId) */ public function getArticleCustomerGroups($articleId) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $result = $this->getRepository() ->getArticleCustomerGroupsQuery($articleId) ->getArrayResult(); @@ -1098,12 +1084,10 @@ public function getArticleCustomerGroups($articleId) * * @param int $articleId * - * @return array + * @return array|null */ public function getArticleConfiguratorSet($articleId) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $builder = $this->get('models')->createQueryBuilder(); $builder->select(['configuratorSet', 'groups', 'options']) ->from(Set::class, 'configuratorSet') @@ -1118,7 +1102,7 @@ public function getArticleConfiguratorSet($articleId) $result = $builder->getQuery()->getArrayResult(); - return $result[0]; + return $result[0] ?? null; } /** @@ -1135,8 +1119,6 @@ public function getArticleConfiguratorSet($articleId) */ public function getArticleDependencies($configuratorSetId) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - return $this->getRepository() ->getConfiguratorDependenciesQuery($configuratorSetId) ->getArrayResult(); @@ -1157,13 +1139,11 @@ public function getArticleDependencies($configuratorSetId) */ public function getArticleConfiguratorTemplate($articleId, $tax) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $query = $this->getRepository()->getConfiguratorTemplateByArticleIdQuery($articleId); $configuratorTemplate = $query->getArrayResult(); - $prices = $configuratorTemplate[0]['prices']; + $prices = $configuratorTemplate[0]['prices'] ?? null; if (!empty($prices)) { $configuratorTemplate[0]['prices'] = $this->formatPricesFromNetToGross($prices, $tax); @@ -1856,8 +1836,6 @@ public function deleteUnusedSerialsAction() */ public function getFreeSerialCount($esdId) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $query = $this->getRepository()->getFreeSerialsCountByEsdQuery($esdId); return $query->getSingleScalarResult(); @@ -2100,8 +2078,6 @@ public function getEsdDownloadAction() */ public function getChartData() { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $productId = $this->Request()->getParam('articleId'); $dateFormat = '%Y%m'; $limit = 12; @@ -2417,7 +2393,7 @@ protected function getConfiguratorDependencyRepository() } /** - * @deprecated in 5.6, will be removed in 5.7 without a replacement + * @deprecated in 5.6, will be removed in 5.8 without a replacement * * Helper function to get access to the configuratorGroup repository. * @@ -2425,7 +2401,7 @@ protected function getConfiguratorDependencyRepository() */ protected function getConfiguratorGroupRepository() { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED); + trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED); if ($this->configuratorGroupRepository === null) { $this->configuratorGroupRepository = $this->get('models')->getRepository(Group::class); @@ -3263,9 +3239,10 @@ protected function formatPricesFromNetToGross($prices, $tax) foreach ($prices as $key => $price) { $customerGroup = $price['customerGroup']; if ($customerGroup['taxInput']) { - $price['price'] = $price['price'] / 100 * (100 + $tax['tax']); - $price['pseudoPrice'] = $price['pseudoPrice'] / 100 * (100 + $tax['tax']); - $price['regulationPrice'] = $price['regulationPrice'] / 100 * (100 + $tax['tax']); + $taxValue = $tax['tax'] ?? 0; + $price['price'] = $price['price'] / 100 * (100 + $taxValue); + $price['pseudoPrice'] = $price['pseudoPrice'] / 100 * (100 + $taxValue); + $price['regulationPrice'] = $price['regulationPrice'] / 100 * (100 + $taxValue); } $prices[$key] = $price; } @@ -3552,11 +3529,11 @@ protected function prepareVariantPrice($detailData, $priceVariations, $optionIds } /** - * @deprecated in 5.6, will be removed in 5.7 without a replacement + * @deprecated in 5.6, will be removed in 5.8 without a replacement */ protected function getDependencyByOptionId($optionId, $dependencies) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED); + trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED); $returnValue = []; foreach ($dependencies as $dependency) { @@ -3799,7 +3776,7 @@ protected function prepareConfiguratorAssociatedData($data, $article) $modelManger = $this->get('models'); if (!empty($data['configuratorSetId'])) { $data['configuratorSet'] = $modelManger->find(Set::class, $data['configuratorSetId']); - } elseif ($data['isConfigurator']) { + } elseif (!empty($data['isConfigurator'])) { $set = new Set(); $set->setName('Set-' . $data['mainDetail']['number']); $set->setPublic(false); @@ -3893,9 +3870,9 @@ protected function prepareArticleAssociatedData($data) */ protected function prepareMainDetailAssociatedData($data) { - $data['mainDetail'] = $data['mainDetail'][0]; - $data['mainDetail']['active'] = $data['active']; - $data['mainDetail']['lastStock'] = (int) ($data['lastStock'] >= 0 ? $data['lastStock'] : 0); + $data['mainDetail'] = $data['mainDetail'][0] ?? null; + $data['mainDetail']['active'] = $data['active'] ?? null; + $data['mainDetail']['lastStock'] = max((int) ($data['lastStock'] ?? 0), 0); if (!empty($data['mainDetail']['unitId'])) { $data['mainDetail']['unit'] = $this->get('models')->find(Unit::class, $data['mainDetail']['unitId']); @@ -3917,7 +3894,7 @@ protected function prepareMainDetailAssociatedData($data) protected function prepareCategoryAssociatedData($data) { $categories = []; - foreach ($data['categories'] as $categoryData) { + foreach ($data['categories'] ?? [] as $categoryData) { if (!empty($categoryData['id'])) { $model = $this->get('models')->find(Category::class, $categoryData['id']); $categories[] = $model; @@ -3993,7 +3970,7 @@ protected function prepareSeoCategoryAssociatedData($data, $article) protected function prepareRelatedAssociatedData($data, $article) { $related = []; - foreach ($data['related'] as $relatedData) { + foreach ($data['related'] ?? [] as $relatedData) { if (empty($relatedData['id'])) { continue; } @@ -4024,7 +4001,7 @@ protected function prepareRelatedAssociatedData($data, $article) protected function prepareRelatedProductStreamsData($data) { $relatedStreams = []; - foreach ($data['streams'] as $relatedProductStreamData) { + foreach ($data['streams'] ?? [] as $relatedProductStreamData) { if (empty($relatedProductStreamData['id'])) { continue; } @@ -4050,7 +4027,7 @@ protected function prepareRelatedProductStreamsData($data) protected function prepareSimilarAssociatedData($data, $article) { $similar = []; - foreach ($data['similar'] as $similarData) { + foreach ($data['similar'] ?? [] as $similarData) { if (empty($similarData['id'])) { continue; } @@ -4081,7 +4058,7 @@ protected function prepareSimilarAssociatedData($data, $article) protected function prepareImageAssociatedData($data) { $position = 1; - foreach ($data['images'] as &$imageData) { + foreach ($data['images'] ?? [] as &$imageData) { $imageData['position'] = $position; if (!empty($imageData['mediaId'])) { $media = $this->get('models')->find(Media::class, $imageData['mediaId']); @@ -4110,7 +4087,7 @@ protected function prepareImageAssociatedData($data) */ protected function prepareMainPricesAssociatedData($data, $article) { - $data['mainDetail']['prices'] = $this->preparePricesAssociatedData($data['mainPrices'], $article, $data['tax']); + $data['mainDetail']['prices'] = $this->preparePricesAssociatedData($data['mainPrices'] ?? [], $article, $data['tax']); return $data; } @@ -4136,7 +4113,7 @@ protected function preparePricesAssociatedData($prices, $article, $tax) $priceData['to'] = (int) $priceData['to']; - // If the "to" value isn't numeric, set the place holder "beliebig" + // If the "to" value isn't numeric, set the placeholder "beliebig" if ($priceData['to'] <= 0) { $priceData['to'] = 'beliebig'; } @@ -4165,7 +4142,7 @@ protected function preparePricesAssociatedData($prices, $article, $tax) */ protected function prepareLinkAssociatedData($data) { - foreach ($data['links'] as &$linkData) { + foreach ($data['links'] ?? [] as &$linkData) { $linkData['link'] = trim($linkData['link']); // Map the boolean ExtJS link target to the string format which used in the database $linkData['target'] = ($linkData['target'] === true) ? '_blank' : '_parent'; @@ -4184,7 +4161,7 @@ protected function prepareLinkAssociatedData($data) protected function prepareDownloadAssociatedData($data) { $mediaService = Shopware()->Container()->get(MediaServiceInterface::class); - foreach ($data['downloads'] as &$downloadData) { + foreach ($data['downloads'] ?? [] as &$downloadData) { $downloadData['file'] = $mediaService->normalize($downloadData['file']); } @@ -4494,7 +4471,7 @@ protected function getCommandMapping($syntax) } /** - * @deprecated in 5.6, will be removed in 5.7 without a replacement + * @deprecated in 5.6, will be removed in 5.8 without a replacement * * Internal helper function to get the field names of the passed violation array. * @@ -4504,7 +4481,7 @@ protected function getCommandMapping($syntax) */ protected function getViolationFields($violations) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED); + trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED); $fields = []; foreach ($violations as $violation) { diff --git a/engine/Shopware/Controllers/Backend/Category.php b/engine/Shopware/Controllers/Backend/Category.php index 21916d02975..a50e9ee14ca 100644 --- a/engine/Shopware/Controllers/Backend/Category.php +++ b/engine/Shopware/Controllers/Backend/Category.php @@ -80,8 +80,6 @@ public function __construct(ModelManager $em, SnippetManager $translation) */ public function getRepository() { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - if ($this->repository === null) { $this->repository = $this->em->getRepository(Category::class); } @@ -96,8 +94,6 @@ public function getRepository() */ public function getCategoryComponent() { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - return Shopware()->Container()->get('categorydenormalization'); } @@ -190,7 +186,7 @@ public function getDetailAction() $data = iterator_to_array($paginator); $data = $data[0]; - $data['imagePath'] = $data['media']['id']; + $data['imagePath'] = $data['media']['id'] ?? null; $this->View()->assign(['success' => true, 'data' => $data]); } @@ -536,10 +532,8 @@ public function saveNewChildPositionsAction() */ public function saveDetail() { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $params = $this->Request()->getParams(); - $categoryId = (int) $params['id']; + $categoryId = (int) ($params['id'] ?? 0); $repo = $this->em->getRepository(Category::class); @@ -548,7 +542,7 @@ public function saveDetail() $this->em->persist($categoryModel); // Find parent for newly created category - $params['parentId'] = is_numeric($params['parentId']) ? (int) $params['parentId'] : 1; + $params['parentId'] = isset($params['parentId']) && is_numeric($params['parentId']) ? (int) $params['parentId'] : 1; /** @var Category $parentCategory */ $parentCategory = $repo->find($params['parentId']); $categoryModel->setParent($parentCategory); @@ -579,7 +573,7 @@ public function saveDetail() } $categoryModel->setStream(null); - if ($params['streamId']) { + if (isset($params['streamId'])) { $params['stream'] = $this->em->find(ProductStream::class, (int) $params['streamId']); } @@ -605,7 +599,7 @@ public function saveDetail() $paginator = $this->em->createPaginator($query); $data = iterator_to_array($paginator); $data = $data[0]; - $data['imagePath'] = $data['media']['path']; + $data['imagePath'] = $data['media']['path'] ?? null; $this->View()->assign(['success' => true, 'data' => $data, 'total' => \count($data)]); } @@ -932,15 +926,11 @@ private function getCustomerRepository() /** * This method loads the customer group models for the passed ids in the "customerGroups" parameter. - * - * @param array $data - * - * @return array */ - private function prepareCustomerGroupsAssociatedData($data) + private function prepareCustomerGroupsAssociatedData(array $data): array { $customerGroups = []; - foreach ($data['customerGroups'] as $customerGroupData) { + foreach ($data['customerGroups'] ?? [] as $customerGroupData) { if (!empty($customerGroupData['id'])) { $model = $this->em->find(Group::class, $customerGroupData['id']); $customerGroups[] = $model; diff --git a/engine/Shopware/Controllers/Backend/Config.php b/engine/Shopware/Controllers/Backend/Config.php index 9f787122eeb..d9b3a3cce25 100644 --- a/engine/Shopware/Controllers/Backend/Config.php +++ b/engine/Shopware/Controllers/Backend/Config.php @@ -218,7 +218,7 @@ public function getFormAction() $store = $values['options']['store']; // Replace the store, which may contain multiple translations, with a store with translated messages: - if ($values['options']['translateUsingSnippets']) { + if (!empty($values['options']['translateUsingSnippets'])) { $values['options']['store'] = $this->translateStoreUsingSnippets($store, $values['options']['namespace']); } else { $values['options']['store'] = $this->translateStore($language, $store, $storeFallbackLocales); @@ -721,7 +721,7 @@ public function saveValuesAction() throw new RuntimeException(sprintf('Model object is not an instance of expected class "%s"', Document::class)); } - if ($data['id']) { + if (!empty($data['id'])) { $elements = new ArrayCollection(); foreach ($data['elements'] as $element) { $elementModel = $this->getRepository('documentElement')->find($element['id']); diff --git a/engine/Shopware/Controllers/Backend/Customer.php b/engine/Shopware/Controllers/Backend/Customer.php index f65215ff1be..35aa40ae168 100644 --- a/engine/Shopware/Controllers/Backend/Customer.php +++ b/engine/Shopware/Controllers/Backend/Customer.php @@ -781,8 +781,8 @@ private function getCustomer(int $id): array } $namespace = Shopware()->Container()->get('snippets')->getNamespace('frontend/salutation'); - $data['defaultBillingAddress']['salutationSnippet'] = $namespace->get($data['defaultBillingAddress']['salutation']); - $data['defaultShippingAddress']['salutationSnippet'] = $namespace->get($data['defaultShippingAddress']['salutation']); + $data['defaultBillingAddress']['salutationSnippet'] = $namespace->get($data['defaultBillingAddress']['salutation'] ?? null); + $data['defaultShippingAddress']['salutationSnippet'] = $namespace->get($data['defaultShippingAddress']['salutation'] ?? null); $data['customerStreamIds'] = $this->fetchCustomerStreams($id); if ($data['firstLogin'] instanceof DateTimeInterface && $data['firstLogin']->getTimestamp() < 0) { @@ -825,13 +825,13 @@ private function prepareCustomerData(array $params, Customer $customer, ?Payment } // If a different payment method is selected, it must also be placed in the "paymentPreset" so that the risk management that does not reset. - if ($customer->getPaymentId() !== $params['paymentId']) { + if (isset($params['paymentId']) && $customer->getPaymentId() !== $params['paymentId']) { $params['paymentPreset'] = $params['paymentId']; } if (empty($params['shipping'][0]['firstName']) && empty($params['shipping'][0]['lastName'])) { // Shipping params are empty use the billing ones - $params['shipping'][0] = $params['billing'][0]; + $params['shipping'][0] = $params['billing'][0] ?? null; } if ($paymentData && !empty($params['paymentData'])) { diff --git a/engine/Shopware/Controllers/Backend/EmotionPreset.php b/engine/Shopware/Controllers/Backend/EmotionPreset.php index 496e402507e..214c10f3e39 100644 --- a/engine/Shopware/Controllers/Backend/EmotionPreset.php +++ b/engine/Shopware/Controllers/Backend/EmotionPreset.php @@ -141,7 +141,7 @@ public function saveAction() $transformer = $this->container->get(EmotionToPresetDataTransformerInterface::class); $data = $this->Request()->getParams(); - if (!$data['emotionId']) { + if (empty($data['emotionId'])) { $this->View()->assign(['success' => false]); return; @@ -149,7 +149,7 @@ public function saveAction() $data = array_merge($data, $transformer->transform($data['emotionId'])); - if ($data['id']) { + if (!empty($data['id'])) { $resource->update($data['id'], $data, $this->getLocale()); } else { $resource->create($data, $this->getLocale()); diff --git a/engine/Shopware/Controllers/Backend/ExtJs.php b/engine/Shopware/Controllers/Backend/ExtJs.php index bc74b515bc4..f5d20c3a2c8 100644 --- a/engine/Shopware/Controllers/Backend/ExtJs.php +++ b/engine/Shopware/Controllers/Backend/ExtJs.php @@ -27,7 +27,7 @@ abstract class Shopware_Controllers_Backend_ExtJs extends Enlight_Controller_Act /** * Array with all permissions to check in this controller * - * @var array + * @var array */ protected $aclPermissions = []; @@ -43,7 +43,7 @@ public function init() $this->Front()->Plugins()->JsonRequest() ->setParseInput() ->setParseParams(['group', 'sort', 'filter']) - ->setPadding($this->Request()->targetField); + ->setPadding($this->Request()->get('targetField')); // Call controller acl rules (user - defined) $this->initAcl(); @@ -63,7 +63,7 @@ public function preDispatch() /** * Returns all acl permissions * - * @return array + * @return array */ public function getAclRules() { @@ -72,6 +72,8 @@ public function getAclRules() /** * Needs to be present for the script renderer + * + * @return void */ public function indexAction() { @@ -87,6 +89,8 @@ public function indexAction() /** * Needs to be present for the script renderer + * + * @return void */ public function loadAction() { @@ -116,6 +120,8 @@ protected function initAcl() * @param string $action Name of action with or without 'Action'-suffix * @param string $privilege Name of privilege as you have set in s_core_acl_privileges * @param string $errorMessage Optionally error message to show if permission denied + * + * @return void */ protected function addAclPermission($action, $privilege, $errorMessage = '') { @@ -150,7 +156,7 @@ protected function _isAllowed($privilege, $resource = null, $role = null) /** * @param mixed|null $identity * - * @return bool|string + * @return string */ protected function getTinyMceLang($identity) { diff --git a/engine/Shopware/Controllers/Backend/Index.php b/engine/Shopware/Controllers/Backend/Index.php index 3ff4ef1c46d..ef6042a30f2 100644 --- a/engine/Shopware/Controllers/Backend/Index.php +++ b/engine/Shopware/Controllers/Backend/Index.php @@ -36,6 +36,8 @@ class Shopware_Controllers_Backend_Index extends Enlight_Controller_Action imple /** * Loads auth and script renderer resource + * + * @return void */ public function init() { @@ -86,6 +88,8 @@ public function preDispatch() * Backend Menu * Licence Information * Rss-Data for example + * + * @return void */ public function indexAction() { @@ -145,12 +149,17 @@ public function indexAction() $this->View()->assign('extJsDeveloperModeActive', $this->container->getParameter('shopware.extjs.developer_mode')); } + /** + * @return void + */ public function authAction() { } /** * Allows changing the locale by sending a Shopware localeId or an ISO-3166 locale (e.g. de_DE) + * + * @return void */ public function changeLocaleAction() { @@ -207,6 +216,8 @@ public function changeLocaleAction() * Load action for the script renderer. * * @throws Enlight_Controller_Exception + * + * @return void */ public function loadAction() { @@ -226,6 +237,8 @@ public function loadAction() * Load action for the script renderer. * * @throws Enlight_Controller_Exception + * + * @return void */ public function menuAction() { @@ -253,10 +266,8 @@ public function menuAction() * Returns if the first run wizard should be loaded in the current backend instance * * @param stdClass $identity - * - * @return bool */ - private function isFirstRunWizardEnabled($identity) + private function isFirstRunWizardEnabled($identity): bool { // Only admins can see the wizard if ($identity->role->getAdmin()) { @@ -266,12 +277,7 @@ private function isFirstRunWizardEnabled($identity) return false; } - /** - * @param int|null $parentId - * - * @return array - */ - private function buildTree(array $nodes, $parentId = null) + private function buildTree(array $nodes, ?int $parentId = null): array { $menuTree = []; foreach ($nodes as $key => $node) { diff --git a/engine/Shopware/Controllers/Backend/Log.php b/engine/Shopware/Controllers/Backend/Log.php index 0e515da8717..c8ff974f470 100644 --- a/engine/Shopware/Controllers/Backend/Log.php +++ b/engine/Shopware/Controllers/Backend/Log.php @@ -127,7 +127,7 @@ public function deleteLogsAction() $params = $this->Request()->getParams(); unset($params['module'], $params['controller'], $params['action'], $params['_dc']); - if ($params[0]) { + if (!empty($params[0])) { foreach ($params as $values) { $logModel = $this->get('models')->find(Log::class, $values['id']); diff --git a/engine/Shopware/Controllers/Backend/MediaManager.php b/engine/Shopware/Controllers/Backend/MediaManager.php index 5a832c33d26..f680255d036 100644 --- a/engine/Shopware/Controllers/Backend/MediaManager.php +++ b/engine/Shopware/Controllers/Backend/MediaManager.php @@ -717,8 +717,8 @@ protected function resolveAlbumData(array $data, $album) } $thumbnailHighDpi = isset($data['thumbnailHighDpi']) && $data['thumbnailHighDpi']; - $thumbnailQuality = $data['thumbnailQuality'] ?: 90; - $thumbnailHighDpiQuality = $data['thumbnailHighDpiQuality'] ?: 70; + $thumbnailQuality = $data['thumbnailQuality'] ?? 90; + $thumbnailHighDpiQuality = $data['thumbnailHighDpiQuality'] ?? 70; $albumId = $album->getId(); if (empty($albumId) && $data['parent'] !== null) { @@ -785,7 +785,7 @@ private function filterAlbums(array $albums, string $search): array if (stripos($album['text'], $search) === 0) { $found[] = $album; } - $children = $album['data']; + $children = $album['data'] ?? null; if (\is_array($children) && \count($children) > 0) { $foundChildren[] = $this->filterAlbums($children, $search); diff --git a/engine/Shopware/Controllers/Backend/Newsletter.php b/engine/Shopware/Controllers/Backend/Newsletter.php index 1db21ebf7dc..84b60d59a8f 100644 --- a/engine/Shopware/Controllers/Backend/Newsletter.php +++ b/engine/Shopware/Controllers/Backend/Newsletter.php @@ -447,7 +447,7 @@ public function initTemplate($mailing) $template->assign('sUser', $user, true); $hash = $this->createHash((int) $user['mailaddressID'], (int) $mailing['id']); $template->assign('sCampaignHash', $hash, true); - $template->assign('sRecommendations', $this->getMailingSuggest($mailing['id'], $user['id']), true); + $template->assign('sRecommendations', $this->getMailingSuggest($mailing['id'], $user['userID']), true); $template->assign('sVoucher', $this->getMailingVoucher($mailing['id']), true); $template->assign('sCampaign', $this->getMailingDetails($mailing['id']), true); $template->assign('sConfig', Shopware()->Config()); @@ -508,8 +508,6 @@ public function getMailing($id = null) */ public function getMailingDetails($id) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $details = Shopware()->Modules()->Marketing()->sMailCampaignsGetDetail((int) $id); if (!\is_array($details)) { return []; @@ -554,8 +552,6 @@ public function getMailingSuggest($id, $userID) */ public function getMailingVoucher($id) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $sql = 'SELECT value FROM s_campaigns_containers WHERE type=? AND promotionID=?'; $voucherID = Shopware()->Db()->fetchOne($sql, [Container::TYPE_VOUCHER, $id]); if (empty($voucherID)) { @@ -583,8 +579,6 @@ public function getMailingVoucher($id) */ public function getMailingEmails($id) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $sql = 'SELECT `groups`, languageID FROM s_campaigns_mailings WHERE id=?'; $mailing = Shopware()->Db()->fetchRow($sql, [$id]); @@ -594,16 +588,16 @@ public function getMailingEmails($id) $customerGroups = []; $recipientGroups = []; - $mailing['groups'] = unserialize($mailing['groups'], ['allowed_classes' => false]); + $mailing['groups'] = unserialize($mailing['groups'], ['allowed_classes' => false]) ?: []; // The first element holds the selected customer groups for the current newsletter - foreach ($mailing['groups'][0] as $customerGroupKey => $customerGroupValue) { + foreach ($mailing['groups'][0] ?? [] as $customerGroupKey => $customerGroupValue) { $customerGroups[] = Shopware()->Db()->quoteInto('su.customergroup=?', $customerGroupKey); } $customerGroups = implode(' OR ', $customerGroups); // The second element holds the selected *newsletter* groups for the current newsletter - foreach ($mailing['groups'][1] as $customerGroupKey => $customerGroupValue) { + foreach ($mailing['groups'][1] ?? [] as $customerGroupKey => $customerGroupValue) { $recipientGroups[] = Shopware()->Db()->quoteInto('sc.groupID=?', $customerGroupKey); } $recipientGroups = implode(' OR ', $recipientGroups); @@ -667,8 +661,6 @@ public function getMailingEmails($id) */ public function getVoucherCode($voucherID) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $sql = ' SELECT id, code FROM s_emarketing_voucher_codes evc @@ -697,8 +689,6 @@ public function getVoucherCode($voucherID) */ public function getMailingUserByEmail($email) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $select = ' cm.email, cm.email as newsletter, cg.name as `group`, IFNULL(u.salutation, nd.salutation) as salutation, @@ -766,8 +756,6 @@ public function getMailingUserByEmail($email) */ public function preFilter($source) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $source = str_replace('', '{include file="suggest`$sMailing.template`"}', $source); $source = str_replace('', '', $source); $source = str_replace('@suggestions', '{include file="alt/suggest`$sMailing.template`"}', $source); @@ -788,8 +776,6 @@ public function preFilter($source) */ public function outputFilter($source) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $source = preg_replace('#(src|background)="([^:"./][^:"]+)"#Umsi', '$1="../../campaigns/$2"', $source); $callback = [Shopware()->Plugins()->Core()->PostFilter(), 'rewriteSrc']; @@ -807,8 +793,6 @@ public function outputFilter($source) */ public function altFilter($source) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $source = preg_replace('##Umsi', '$1', $source); $source = str_replace(['
        ', '

        ', ' '], ["\n", "\n", ' '], $source); $source = trim(strip_tags((string) preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s', '', $source))); @@ -828,8 +812,6 @@ public function altFilter($source) */ public function trackFilter($source, $mailingID) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $track = 'sPartner=sCampaign' . (int) $mailingID; $host = preg_quote(Shopware()->Config()->get('BasePath'), '#'); $pattern = '#href="(https?://' . $host . '[^<]*[?][^<]+)"#Umsi'; @@ -848,9 +830,6 @@ public function trackFilter($source, $mailingID) */ public function createHash() { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - - // todo@all Create new method to get same secret hashes for values $license = ''; $parts = \func_get_args(); $parts[] = $license; diff --git a/engine/Shopware/Controllers/Backend/Order.php b/engine/Shopware/Controllers/Backend/Order.php index 301082a138c..2349b470733 100644 --- a/engine/Shopware/Controllers/Backend/Order.php +++ b/engine/Shopware/Controllers/Backend/Order.php @@ -1508,10 +1508,10 @@ protected function getList($filter, $sort, $offset, $limit) $order['locale'] = $order['languageSubShop']['locale']; // Deprecated: use payment instance - $order['debit'] = $order['customer']['debit']; + $order['debit'] = $order['customer']['debit'] ?? null; $order['customerEmail'] = $order['customer']['email']; - $order['billing']['salutationSnippet'] = $namespace->get($order['billing']['salutation']); - $order['shipping']['salutationSnippet'] = $namespace->get($order['shipping']['salutation']); + $order['billing']['salutationSnippet'] = $namespace->get($order['billing']['salutation'] ?? ''); + $order['shipping']['salutationSnippet'] = $namespace->get($order['shipping']['salutation'] ?? ''); foreach ($order['details'] as &$orderDetail) { $number = $orderDetail['articleNumber']; @@ -2422,7 +2422,7 @@ private function getTemplateNameForDocumentTypeId(?int $documentTypeId = null): private function getCurrentLocale(): ?ShopLocale { - return $this->get('auth')->getIdentity()->locale; + return $this->get('auth')->getIdentity()->locale ?? null; } private function checkIfOrderHasBeenModifiedSince(DateTime $lastOrderChange, Order $order, Enlight_Components_Snippet_Namespace $namespace): bool diff --git a/engine/Shopware/Controllers/Backend/Payment.php b/engine/Shopware/Controllers/Backend/Payment.php index c304c341107..24a22911852 100644 --- a/engine/Shopware/Controllers/Backend/Payment.php +++ b/engine/Shopware/Controllers/Backend/Payment.php @@ -22,7 +22,10 @@ * our trademarks remain entirely with us. */ +use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\ORM\ORMException; use Shopware\Models\Country\Country; +use Shopware\Models\Country\Repository; use Shopware\Models\Payment\Payment; use Shopware\Models\Shop\Shop; @@ -34,7 +37,7 @@ class Shopware_Controllers_Backend_Payment extends Shopware_Controllers_Backend_ protected $repository; /** - * @var \Shopware\Models\Country\Repository + * @var Repository */ protected $countryRepository; @@ -74,7 +77,7 @@ public function getPaymentsAction() // The standard $translationComponent->translatePayments can not be used here since the // description may not be overridden. The field is edible and if the translation is // shown in the edit field, there is a high chance of a user saving the translation as description. - $translator = $this->get(\Shopware_Components_Translation::class)->getObjectTranslator('config_payment'); + $translator = $this->get(Shopware_Components_Translation::class)->getObjectTranslator('config_payment'); $results = array_map(function ($payment) use ($translator) { return $translator->translateObjectProperty($payment, 'description', 'translatedDescription', $payment['description']); }, $results); @@ -103,28 +106,27 @@ public function createPaymentsAction() try { $params = $this->Request()->getParams(); unset($params['action']); - $repository = $this->get('models')->getRepository(\Shopware\Models\Payment\Payment::class); + $repository = $this->get('models')->getRepository(Payment::class); $existingModel = $repository->findByName($params['name']); - if ($existingModel) { - throw new \Doctrine\ORM\ORMException('The name is already in use.'); + throw new ORMException('The name is already in use.'); } if ($params['source'] == 0) { $params['source'] = null; } $paymentModel = new Payment(); - $countries = $params['countries']; + $countries = $params['countries'] ?? []; $countryArray = []; foreach ($countries as $country) { - $countryArray[] = $this->get('models')->find(\Shopware\Models\Country\Country::class, $country['id']); + $countryArray[] = $this->get('models')->find(Country::class, $country['id']); } $params['countries'] = $countryArray; - $shops = $params['shops']; + $shops = $params['shops'] ?? []; $shopArray = []; foreach ($shops as $shop) { - $shopArray[] = $this->get('models')->find(\Shopware\Models\Shop\Shop::class, $shop['id']); + $shopArray[] = $this->get('models')->find(Shop::class, $shop['id']); } $params['shops'] = $shopArray; @@ -135,7 +137,7 @@ public function createPaymentsAction() $params['id'] = $paymentModel->getId(); $this->View()->assign(['success' => true, 'data' => $params]); - } catch (\Doctrine\ORM\ORMException $e) { + } catch (ORMException $e) { $this->View()->assign(['success' => false, 'errorMsg' => $e->getMessage()]); } } @@ -148,14 +150,13 @@ public function updatePaymentsAction() { try { $id = $this->Request()->getParam('id'); - /** @var Payment $payment */ $payment = $this->get('models')->find(Payment::class, $id); $action = $payment->getAction(); $data = $this->Request()->getParams(); - $data['surcharge'] = str_replace(',', '.', $data['surcharge']); - $data['debitPercent'] = str_replace(',', '.', $data['debitPercent']); + $data['surcharge'] = str_replace(',', '.', $data['surcharge'] ?? ''); + $data['debitPercent'] = str_replace(',', '.', $data['debitPercent'] ?? ''); - $countries = new \Doctrine\Common\Collections\ArrayCollection(); + $countries = new ArrayCollection(); if (!empty($data['countries'])) { // Clear all countries, to save the old and new ones then $payment->getCountries()->clear(); @@ -166,7 +167,7 @@ public function updatePaymentsAction() $data['countries'] = $countries; } - $shops = new \Doctrine\Common\Collections\ArrayCollection(); + $shops = new ArrayCollection(); if (!empty($data['shops'])) { // Clear all shops, to save the old and new ones then $payment->getShops()->clear(); @@ -176,7 +177,7 @@ public function updatePaymentsAction() } $data['shops'] = $shops; } - $data['surchargeString'] = $this->filterSurchargeString($data['surchargeString'], $data['countries']); + $data['surchargeString'] = $this->filterSurchargeString($data['surchargeString'] ?? '', $data['countries'] ?? []); $payment->fromArray($data); @@ -199,14 +200,14 @@ public function updatePaymentsAction() $this->get('models')->persist($payment); $this->get('models')->flush(); - if ($data['active']) { + if (!empty($data['active'])) { $data['iconCls'] = 'sprite-tick'; } else { $data['iconCls'] = 'sprite-cross'; } $this->View()->assign(['success' => true, 'data' => $data]); - } catch (\Doctrine\ORM\ORMException $e) { + } catch (ORMException $e) { $this->View()->assign(['success' => false, 'errorMsg' => $e->getMessage()]); } } @@ -220,7 +221,6 @@ public function deletePaymentAction() } $repository = $this->get('models')->getRepository(Payment::class); $id = $this->Request()->get('id'); - /** @var Payment $model */ $model = $repository->find($id); if ($model->getSource() == 1) { try { @@ -238,7 +238,7 @@ public function deletePaymentAction() /** * Internal helper function to get access to the country repository. * - * @return \Shopware\Models\Country\Repository + * @return Repository */ private function getCountryRepository() { @@ -296,12 +296,9 @@ private function formatResult($results) } /** - * @param string $surchargeString - * @param \Shopware\Models\Country\Country[] $countries - * - * @return string + * @param Country[] $countries */ - private function filterSurchargeString($surchargeString, $countries) + private function filterSurchargeString(string $surchargeString, array $countries): string { $buffer = []; $surcharges = explode(';', $surchargeString); diff --git a/engine/Shopware/Controllers/Backend/ProductFeed.php b/engine/Shopware/Controllers/Backend/ProductFeed.php index 89b8ab48769..95e7707bdb5 100644 --- a/engine/Shopware/Controllers/Backend/ProductFeed.php +++ b/engine/Shopware/Controllers/Backend/ProductFeed.php @@ -143,7 +143,7 @@ public function saveFeedAction() { $params = $this->Request()->getParams(); - $feedId = $params['id']; + $feedId = $params['id'] ?? null; if (!empty($feedId)) { // Edit Product Feed /** @var ProductFeed $productFeed */ diff --git a/engine/Shopware/Controllers/Backend/RiskManagement.php b/engine/Shopware/Controllers/Backend/RiskManagement.php index 0c1c9b58be8..59a7518f308 100644 --- a/engine/Shopware/Controllers/Backend/RiskManagement.php +++ b/engine/Shopware/Controllers/Backend/RiskManagement.php @@ -111,7 +111,7 @@ public function editRuleAction() unset($params['_dc']); // 2-dimensional array - if ($params[0]) { + if (!empty($params[0])) { $data = []; foreach ($params as $values) { $ruleModel = $this->get('models')->find(RuleSet::class, $values['id']); diff --git a/engine/Shopware/Controllers/Backend/Shipping.php b/engine/Shopware/Controllers/Backend/Shipping.php index da8a7e4eaf9..4f9af00b6d8 100644 --- a/engine/Shopware/Controllers/Backend/Shipping.php +++ b/engine/Shopware/Controllers/Backend/Shipping.php @@ -469,10 +469,10 @@ private function saveDispatch(): void } // Clean up params and init some fields - $payments = $params['payments']; - $holidays = $params['holidays']; - $countries = $params['countries']; - $categories = $params['categories']; + $payments = $params['payments'] ?? []; + $holidays = $params['holidays'] ?? []; + $countries = $params['countries'] ?? []; + $categories = $params['categories'] ?? []; if (!isset($params['shippingFree']) || $params['shippingFree'] === '' || $params['shippingFree'] === '0') { $params['shippingFree'] = null; @@ -489,13 +489,13 @@ private function saveDispatch(): void $params['customerGroupId'] = $this->cleanData($params['customerGroupId']); $params['bindTimeFrom'] = $this->cleanData($params['bindTimeFrom']); $params['bindTimeTo'] = $this->cleanData($params['bindTimeTo']); - $params['bindInStock'] = $this->cleanData($params['bindInStock']); + $params['bindInStock'] = $this->cleanData($params['bindInStock'] ?? null); $params['bindWeekdayFrom'] = $this->cleanData($params['bindWeekdayFrom']); $params['bindWeekdayTo'] = $this->cleanData($params['bindWeekdayTo']); $params['bindWeightFrom'] = $this->cleanData($params['bindWeightFrom']); $params['bindWeightTo'] = $this->cleanData($params['bindWeightTo']); $params['bindPriceFrom'] = $this->cleanData($params['bindPriceFrom']); - $params['bindPriceTo'] = $this->cleanData($params['bindPriceTo']); + $params['bindPriceTo'] = $this->cleanData($params['bindPriceTo'] ?? null); $params['bindSql'] = $this->cleanData($params['bindSql']); $params['calculationSql'] = $this->cleanData($params['calculationSql']); diff --git a/engine/Shopware/Controllers/Backend/Supplier.php b/engine/Shopware/Controllers/Backend/Supplier.php index 0808587f7c6..c2af3a19ab3 100644 --- a/engine/Shopware/Controllers/Backend/Supplier.php +++ b/engine/Shopware/Controllers/Backend/Supplier.php @@ -100,7 +100,7 @@ public function getSuppliersAction() $mediaService = Shopware()->Container()->get(MediaServiceInterface::class); foreach ($suppliers as &$supplier) { - $supplier['description'] = strip_tags($supplier['description']); + $supplier['description'] = strip_tags((string) $supplier['description']); $supplier['image'] = $mediaService->getUrl($supplier['image']); } unset($supplier); diff --git a/engine/Shopware/Controllers/Backend/UserManager.php b/engine/Shopware/Controllers/Backend/UserManager.php index 0404a873190..cece69084d0 100644 --- a/engine/Shopware/Controllers/Backend/UserManager.php +++ b/engine/Shopware/Controllers/Backend/UserManager.php @@ -226,7 +226,7 @@ public function updateRoleAction() $params['enabled'] = false; } - if ($params['admin'] === 'on' || $params['admin'] === true || $params['admin'] === 1) { + if (isset($params['admin']) && ($params['admin'] === 'on' || $params['admin'] === true || $params['admin'] === 1)) { $params['admin'] = true; } else { $params['admin'] = false; @@ -288,7 +288,7 @@ public function getRolesAction() // Strip roles with parent id set foreach ($roles as &$role) { - if ($role['parentID'] != null) { + if (!empty($role['parentID'])) { unset($role); } } diff --git a/engine/Shopware/Controllers/Backend/Vote.php b/engine/Shopware/Controllers/Backend/Vote.php index a0df4e07382..6950eb54513 100644 --- a/engine/Shopware/Controllers/Backend/Vote.php +++ b/engine/Shopware/Controllers/Backend/Vote.php @@ -36,7 +36,7 @@ class Shopware_Controllers_Backend_Vote extends Shopware_Controllers_Backend_App public function save($data) { - if (!empty($data['answer']) && $data['answer_date'] == null) { + if (!empty($data['answer']) && empty($data['answer_date'])) { $data['answerDate'] = new DateTime(); } if (empty($data['shopId'])) { diff --git a/engine/Shopware/Controllers/Backend/Voucher.php b/engine/Shopware/Controllers/Backend/Voucher.php index f4777d7fad3..e8bf4ba006c 100644 --- a/engine/Shopware/Controllers/Backend/Voucher.php +++ b/engine/Shopware/Controllers/Backend/Voucher.php @@ -92,7 +92,7 @@ public function getVoucherAction() $offset = (int) $this->Request()->getParam('start'); $limit = (int) $this->Request()->getParam('limit'); $filter = $this->Request()->getParam('filter'); - $filter = $filter[0]['value']; + $filter = $filter[0]['value'] ?? null; $sqlBindings = []; $searchSQL = ''; @@ -106,8 +106,8 @@ public function getVoucherAction() } // Sorting data $sortData = $this->Request()->getParam('sort'); - $sortField = $sortData[0]['property']; - $dir = $sortData[0]['direction']; + $sortField = $sortData[0]['property'] ?? null; + $dir = $sortData[0]['direction'] ?? null; $sort = ''; if ((!empty($sortField) && $dir === 'ASC') || $dir === 'DESC') { // To prevent sql-injections @@ -154,7 +154,7 @@ public function getVoucherCodesAction() $orderBy = $this->Request()->getParam('sort'); $filter = $this->Request()->getParam('filter'); - $filter = $filter[0]['value']; + $filter = $filter[0]['value'] ?? null; $offset = $this->Request()->getParam('start'); $limit = $this->Request()->getParam('limit'); @@ -321,7 +321,7 @@ public function getTaxConfigurationAction() public function saveVoucherAction() { $params = $this->Request()->getParams(); - $voucherId = empty($params['voucherID']) ? $params['id'] : $params['voucherID']; + $voucherId = empty($params['voucherID']) ? $params['id'] ?? null : $params['voucherID']; if (!empty($voucherId)) { if (!$this->_isAllowed('update', 'voucher')) { return; diff --git a/engine/Shopware/Controllers/Backend/Widgets.php b/engine/Shopware/Controllers/Backend/Widgets.php index 41dbac3ccfd..39914808b38 100644 --- a/engine/Shopware/Controllers/Backend/Widgets.php +++ b/engine/Shopware/Controllers/Backend/Widgets.php @@ -309,7 +309,7 @@ public function getTurnOverVisitorsAction() ] ); - if ($fetchConversion['visitors'] != 0) { + if (\is_array($fetchConversion) && $fetchConversion['visitors'] != 0) { $fetchConversion = number_format($fetchConversion['countOrders'] / $fetchConversion['visitors'] * 100, 2); } else { $fetchConversion = number_format(0, 2); @@ -483,7 +483,7 @@ public function getLastOrdersAction() */ public function getNoticeAction() { - $userID = $_SESSION['ShopwareBackend']['Auth']->id; + $userID = $_SESSION['ShopwareBackend']['Auth']->id ?? null; if (empty($userID)) { $this->View()->assign(['success' => false, 'message' => 'No user id']); @@ -508,7 +508,7 @@ public function saveNoticeAction() { $noticeMsg = (string) $this->Request()->getParam('notice'); - $userID = $_SESSION['ShopwareBackend']['Auth']->id; + $userID = $_SESSION['ShopwareBackend']['Auth']->id ?? null; if (empty($userID)) { $this->View()->assign(['success' => false, 'message' => 'No user id']); diff --git a/engine/Shopware/Controllers/Frontend/Account.php b/engine/Shopware/Controllers/Frontend/Account.php index 01fe6d97da9..b11f7cd6d47 100644 --- a/engine/Shopware/Controllers/Frontend/Account.php +++ b/engine/Shopware/Controllers/Frontend/Account.php @@ -104,8 +104,8 @@ public function preDispatch() $this->response->headers->addCacheControlDirective('no-store'); $this->response->headers->addCacheControlDirective('no-cache'); - $activeBillingAddressId = $customerData['additional']['user']['default_billing_address_id']; - $activeShippingAddressId = $customerData['additional']['user']['default_shipping_address_id']; + $activeBillingAddressId = $customerData['additional']['user']['default_billing_address_id'] ?? null; + $activeShippingAddressId = $customerData['additional']['user']['default_shipping_address_id'] ?? null; if (!empty($customerData['shippingaddress']['country']['id'])) { $country = $this->get(CountryGatewayInterface::class)->getCountry($customerData['shippingaddress']['country']['id'], $this->get(ContextServiceInterface::class)->getContext()); @@ -899,7 +899,12 @@ private function getForwardParameters(): array private function isOneTimeAccount(): bool { - return $this->container->get('session')->offsetGet('sOneTimeAccount') - || (int) $this->View()->getAssign('sUserData')['additional']['user']['accountmode'] === Customer::ACCOUNT_MODE_FAST_LOGIN; + $customerData = $this->View()->getAssign('sUserData'); + if (!isset($customerData['additional']['user'])) { + return false; + } + + return $this->container->get('session')->get('sOneTimeAccount') + || (int) $customerData['additional']['user']['accountmode'] === Customer::ACCOUNT_MODE_FAST_LOGIN; } } diff --git a/engine/Shopware/Controllers/Frontend/Blog.php b/engine/Shopware/Controllers/Frontend/Blog.php index 36e4f1e9d5f..1ec99deb040 100644 --- a/engine/Shopware/Controllers/Frontend/Blog.php +++ b/engine/Shopware/Controllers/Frontend/Blog.php @@ -153,9 +153,9 @@ public function indexAction() $categoryId = (int) $this->Request()->getQuery('sCategory'); $page = (int) $this->request->getParam('sPage', 1); $page = $page >= 1 ? $page : 1; - $filterDate = urldecode($this->Request()->getParam('sFilterDate')); - $filterAuthor = urldecode($this->Request()->getParam('sFilterAuthor')); - $filterTags = urldecode($this->Request()->getParam('sFilterTags')); + $filterDate = urldecode($this->Request()->getParam('sFilterDate', '')); + $filterAuthor = urldecode($this->Request()->getParam('sFilterAuthor', '')); + $filterTags = urldecode($this->Request()->getParam('sFilterTags', '')); // Redirect if blog's category is not a child of the current shop's category $shopCategory = $this->get('shop')->getCategory(); diff --git a/engine/Shopware/Controllers/Frontend/Checkout.php b/engine/Shopware/Controllers/Frontend/Checkout.php index 2b9e96bbcf7..fe09acf1580 100644 --- a/engine/Shopware/Controllers/Frontend/Checkout.php +++ b/engine/Shopware/Controllers/Frontend/Checkout.php @@ -41,12 +41,13 @@ use Shopware\Components\Model\ModelManager; use Shopware\Models\Country\Country; use Shopware\Models\Customer\Address; +use Shopware\Models\Customer\Customer; use Shopware\Models\Shop\Currency; use ShopwarePlugin\PaymentMethods\Components\BasePaymentMethod; use Symfony\Component\HttpFoundation\Request as SymfonyRequest; /** - * @phpstan-type CheckoutBasketArray array{content?: array, Amount?: string, AmountNet?: string, Quantity?: int, AmountNumeric: float, AmountNetNumeric: float, AmountWithTax?: string, AmountWithTaxNumeric?: float, sCurrencyId: int, sCurrencyName: string, sCurrencyFactor: float, sShippingcosts: float, sShippingcostsTax: float|null, sShippingcostsTaxProportional?: array<\Shopware\Components\Cart\Struct\Price>, sShippingcostsNet: float, sShippingcostsWithTax: float, sShippingcostsDifference: float|null, sTaxRates: array, sAmount: float, sAmountTax: float, sAmountWithTax?: float} + * @phpstan-type CheckoutBasketArray array{content?: array, Amount?: string, AmountNet?: string, Quantity?: int, AmountNumeric: float, AmountNetNumeric: float, AmountWithTax?: string, AmountWithTaxNumeric?: float, sCurrencyId: int, sCurrencyName: string, sCurrencyFactor: float, sShippingcosts: float, sShippingcostsTax: float|null, sShippingcostsTaxProportional?: array<\Shopware\Components\Cart\Struct\Price>, sShippingcostsNet: float, sShippingcostsWithTax: float, sShippingcostsDifference?: float|null, sTaxRates: array, sAmount: float, sAmountTax: float, sAmountWithTax?: float} * * @phpstan-import-type ShippingCostArray from \sAdmin */ @@ -170,6 +171,7 @@ public function indexAction() */ public function cartAction() { + $accountMode = (int) ($this->View()->getAssign('sUserData')['additional']['user']['accountmode'] ?? Customer::ACCOUNT_MODE_CUSTOMER); $country = $this->getSelectedCountry(); $this->View()->assign('sCountry', $country); $this->View()->assign('sPayment', $this->getSelectedPayment()); @@ -177,7 +179,7 @@ public function cartAction() $this->View()->assign('sCountryList', $this->getCountryList()); $this->View()->assign('sPayments', $this->getPayments()); $this->View()->assign('sDispatches', $this->getDispatches()); - $this->View()->assign('sDispatchNoOrder', (int) $this->View()->getAssign('sUserData')['additional']['user']['accountmode'] === 0 && $this->getDispatchNoOrder()); + $this->View()->assign('sDispatchNoOrder', $accountMode === Customer::ACCOUNT_MODE_CUSTOMER && $this->getDispatchNoOrder()); $this->View()->assign('sState', $this->getSelectedState()); $this->View()->assign('sUserData', $this->getUserData()); @@ -185,9 +187,9 @@ public function cartAction() $this->View()->assign('sInvalidCartItems', $this->getInvalidProducts($this->View()->getAssign('sBasket'))); $this->View()->assign(CheckoutKey::SHIPPING_COSTS, $this->View()->getAssign('sBasket')[CheckoutKey::SHIPPING_COSTS]); - $this->View()->assign(CheckoutKey::SHIPPING_COSTS_DIFFERENCE, $this->View()->getAssign('sBasket')[CheckoutKey::SHIPPING_COSTS_DIFFERENCE]); + $this->View()->assign(CheckoutKey::SHIPPING_COSTS_DIFFERENCE, $this->View()->getAssign('sBasket')[CheckoutKey::SHIPPING_COSTS_DIFFERENCE] ?? null); $this->View()->assign(CheckoutKey::AMOUNT, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT]); - $this->View()->assign(CheckoutKey::AMOUNT_WITH_TAX, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT_WITH_TAX]); + $this->View()->assign(CheckoutKey::AMOUNT_WITH_TAX, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT_WITH_TAX] ?? 0.0); $this->View()->assign(CheckoutKey::AMOUNT_TAX, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT_TAX]); $this->View()->assign('sAmountNet', $this->View()->getAssign('sBasket')[CartKey::AMOUNT_NET_NUMERIC]); @@ -259,9 +261,9 @@ public function confirmAction() $this->View()->assign('sLaststock', $this->basket->sCheckBasketQuantities()); $this->View()->assign(CheckoutKey::SHIPPING_COSTS, $this->View()->getAssign('sBasket')[CheckoutKey::SHIPPING_COSTS]); - $this->View()->assign(CheckoutKey::SHIPPING_COSTS_DIFFERENCE, $this->View()->getAssign('sBasket')[CheckoutKey::SHIPPING_COSTS_DIFFERENCE]); + $this->View()->assign(CheckoutKey::SHIPPING_COSTS_DIFFERENCE, $this->View()->getAssign('sBasket')[CheckoutKey::SHIPPING_COSTS_DIFFERENCE] ?? null); $this->View()->assign(CheckoutKey::AMOUNT, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT]); - $this->View()->assign(CheckoutKey::AMOUNT_WITH_TAX, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT_WITH_TAX]); + $this->View()->assign(CheckoutKey::AMOUNT_WITH_TAX, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT_WITH_TAX] ?? 0.0); $this->View()->assign(CheckoutKey::AMOUNT_TAX, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT_TAX]); $this->View()->assign('sAmountNet', $this->View()->getAssign('sBasket')[CartKey::AMOUNT_NET_NUMERIC]); @@ -860,9 +862,9 @@ public function shippingPaymentAction() $this->View()->assign('sLaststock', $this->basket->sCheckBasketQuantities()); $this->View()->assign(CheckoutKey::SHIPPING_COSTS, $this->View()->getAssign('sBasket')[CheckoutKey::SHIPPING_COSTS]); - $this->View()->assign(CheckoutKey::SHIPPING_COSTS_DIFFERENCE, $this->View()->getAssign('sBasket')[CheckoutKey::SHIPPING_COSTS_DIFFERENCE]); + $this->View()->assign(CheckoutKey::SHIPPING_COSTS_DIFFERENCE, $this->View()->getAssign('sBasket')[CheckoutKey::SHIPPING_COSTS_DIFFERENCE] ?? null); $this->View()->assign(CheckoutKey::AMOUNT, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT]); - $this->View()->assign(CheckoutKey::AMOUNT_WITH_TAX, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT_WITH_TAX]); + $this->View()->assign(CheckoutKey::AMOUNT_WITH_TAX, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT_WITH_TAX] ?? 0.0); $this->View()->assign(CheckoutKey::AMOUNT_TAX, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT_TAX]); $this->View()->assign('sAmountNet', $this->View()->getAssign('sBasket')[CartKey::AMOUNT_NET_NUMERIC]); $this->View()->assign('sRegisterFinished', !empty($this->session['sRegisterFinished'])); @@ -1782,11 +1784,11 @@ public function ajaxCartAction() $view->assign(CheckoutKey::SHIPPING_COSTS, $basket[CheckoutKey::SHIPPING_COSTS]); $view->assign(CheckoutKey::SHIPPING_COSTS_DIFFERENCE, $basket[CheckoutKey::SHIPPING_COSTS_DIFFERENCE] ?? null); $view->assign(CheckoutKey::AMOUNT, $basket[CheckoutKey::AMOUNT]); - $view->assign(CheckoutKey::AMOUNT_WITH_TAX, $basket[CheckoutKey::AMOUNT_WITH_TAX] ?? null); + $view->assign(CheckoutKey::AMOUNT_WITH_TAX, $basket[CheckoutKey::AMOUNT_WITH_TAX] ?? 0.0); $view->assign(CheckoutKey::AMOUNT_TAX, $basket[CheckoutKey::AMOUNT_TAX]); $view->assign('sAmountNet', $basket[CartKey::AMOUNT_NET_NUMERIC]); $view->assign('sDispatches', $this->getDispatches()); - $accountMode = (int) $this->View()->getAssign('sUserData')['additional']['user']['accountmode']; + $accountMode = (int) ($this->View()->getAssign('sUserData')['additional']['user']['accountmode'] ?? null); $view->assign('sDispatchNoOrder', $accountMode === 0 && $this->getDispatchNoOrder()); $view->assign('showShippingCalculation', (bool) $this->Request()->getParam('openShippingCalculations')); $view->assign('sMinimumSurcharge', $this->getMinimumCharge()); @@ -2005,8 +2007,11 @@ private function basketHasMixedProducts(array $basket): bool continue; } + if (empty($attrName)) { + continue; + } $serviceAttr = $cartItem['additional_details'][$attrName]; - if (empty($attrName) || ($serviceAttr && $serviceAttr != 'false')) { + if ($serviceAttr && $serviceAttr !== 'false') { continue; } @@ -2157,7 +2162,8 @@ private function getOrderAddress(string $orderNumber, string $source): array */ private function areAddressesEqual(array $addressA, array $addressB): bool { - foreach (['id', 'customernumber', 'phone', 'ustid'] as $key) { + // 'country' and 'state' are arrays, but not relevant as the IDs are also present which will then be compared + foreach (['id', 'userID', 'orderID', 'customernumber', 'phone', 'ustid', 'country', 'state', 'attribute'] as $key) { unset($addressA[$key], $addressB[$key]); } diff --git a/engine/Shopware/Controllers/Frontend/Forms.php b/engine/Shopware/Controllers/Frontend/Forms.php index 9b824661c3c..2d4bcd8af76 100644 --- a/engine/Shopware/Controllers/Frontend/Forms.php +++ b/engine/Shopware/Controllers/Frontend/Forms.php @@ -256,7 +256,7 @@ protected function getContent($formId) } } - $fields[$id] = $this->_createInputElement($element, $this->_postData[$id]); + $fields[$id] = $this->_createInputElement($element, $this->_postData[$id] ?? null); $labels[$id] = $this->_createLabelElement($element); } } @@ -455,7 +455,7 @@ protected function _createInputElement(array $element, $post = null) $element['class'][0], $requiredField, $requiredFieldAria, - $post[0], + $post[0] ?? null, $placeholder0, $element['name'][0], $element['name'][0] @@ -465,7 +465,7 @@ protected function _createInputElement(array $element, $post = null) $element['class'][1], $requiredField, $requiredFieldAria, - $post[1], + $post[1] ?? null, $placeholder1, $element['name'][1], $element['name'][1] diff --git a/engine/Shopware/Controllers/Frontend/Register.php b/engine/Shopware/Controllers/Frontend/Register.php index fdc36fa4292..fce9bcf0f8b 100644 --- a/engine/Shopware/Controllers/Frontend/Register.php +++ b/engine/Shopware/Controllers/Frontend/Register.php @@ -181,7 +181,7 @@ public function saveRegisterAction() ])); $customer->setReferer((string) $session->offsetGet('sReferer')); - $customer->setValidation((string) $data['register']['personal']['sValidation']); + $customer->setValidation((string) ($data['register']['personal']['sValidation'] ?? '')); $customer->setAffiliate((int) $session->offsetGet('sPartner')); $customer->setPaymentId((int) $session->offsetGet('sPaymentID')); $customer->setDoubleOptinRegister($doubleOptinRegister); @@ -268,7 +268,12 @@ public function confirmValidationAction() return; } - if (($data = unserialize($result, ['allowed_classes' => false])) === false || !isset($data['customerId'])) { + try { + $data = unserialize($result, ['allowed_classes' => false]); + } catch (Throwable $e) { + $data = false; + } + if ($data === false || !isset($data['customerId'])) { throw new InvalidArgumentException(sprintf('The data for hash \'%s\' is corrupted.', $hash)); } $customerId = (int) $data['customerId']; @@ -439,12 +444,12 @@ private function getPostData(): array $data = $this->request->getPost(); $countryStateName = 'country_state_' . $data['register']['billing']['country']; - $data['register']['billing']['state'] = $data['register']['billing'][$countryStateName]; + $data['register']['billing']['state'] = $data['register']['billing'][$countryStateName] ?? null; - $countryStateName = 'country_shipping_state_' . $data['register']['shipping']['country']; - $data['register']['shipping']['state'] = $data['register']['shipping'][$countryStateName]; + $countryStateName = 'country_shipping_state_' . ($data['register']['shipping']['country'] ?? null); + $data['register']['shipping']['state'] = $data['register']['shipping'][$countryStateName] ?? null; $data['register']['billing'] += $data['register']['personal']; - $data['register']['shipping']['phone'] = $data['register']['personal']['phone']; + $data['register']['shipping']['phone'] = $data['register']['personal']['phone'] ?? null; if (!$data['register']['personal']['accountmode']) { $data['register']['personal']['accountmode'] = Customer::ACCOUNT_MODE_CUSTOMER; diff --git a/engine/Shopware/Controllers/Frontend/Search.php b/engine/Shopware/Controllers/Frontend/Search.php index 71990b40cf0..410e3c64630 100644 --- a/engine/Shopware/Controllers/Frontend/Search.php +++ b/engine/Shopware/Controllers/Frontend/Search.php @@ -144,7 +144,7 @@ protected function searchFuzzyCheck($search) LIMIT 2 '; $products = $this->get('db')->fetchAll($sql, [$search]); - if ($products[0]['configurator_set_id']) { + if (!empty($products[0]['configurator_set_id'])) { $number = $products[0]['ordernumber']; } diff --git a/engine/Shopware/Controllers/Frontend/Sitemap.php b/engine/Shopware/Controllers/Frontend/Sitemap.php index e162b646521..315c7753114 100644 --- a/engine/Shopware/Controllers/Frontend/Sitemap.php +++ b/engine/Shopware/Controllers/Frontend/Sitemap.php @@ -23,6 +23,7 @@ */ use Doctrine\DBAL\Connection; +use Shopware\Bundle\SitemapBundle\Service\LinkFilter; use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface; use Shopware\Components\Model\ModelManager; use Shopware\Models\Emotion\Emotion; @@ -191,7 +192,7 @@ private function getSitesByShopId(int $shopId): array private function convertSite($site, array $translations) { $site = array_merge($site, $this->fetchTranslation($site['id'], $translations)); - $site['hideOnSitemap'] = !$this->filterLink($site['link']); + $site['hideOnSitemap'] = !LinkFilter::filterLink($site['link']); $site = array_merge( $site, @@ -244,28 +245,6 @@ private function fetchTranslation(int $objectKey, array $translations): array return []; } - /** - * Helper function to filter predefined links, which should not be in the sitemap (external links, sitemap links itself) - * Returns false, if the link is not allowed - */ - private function filterLink(string $link): bool - { - if (empty($link)) { - return true; - } - - $userParams = (string) parse_url($link, PHP_URL_QUERY); - parse_str($userParams, $userParamsArray); - - $blacklist = ['', 'sitemap', 'sitemapXml']; - - if (\in_array($userParamsArray['sViewport'], $blacklist, true)) { - return false; - } - - return true; - } - /** * Helper function to get all supplier pages */ @@ -311,9 +290,9 @@ private function getLandingPages(): array foreach ($campaigns as &$campaign) { $translation = $this->fetchTranslation($campaign['id'], $translations); - $translation['seo_title'] = $translation['seoTitle']; - $translation['seo_keywords'] = $translation['seoKeywords']; - $translation['seo_description'] = $translation['seoDescription']; + $translation['seo_title'] = $translation['seoTitle'] ?? null; + $translation['seo_keywords'] = $translation['seoKeywords'] ?? null; + $translation['seo_description'] = $translation['seoDescription'] ?? null; $campaign = array_merge($campaign, $translation); diff --git a/engine/Shopware/Controllers/Frontend/SitemapXml.php b/engine/Shopware/Controllers/Frontend/SitemapXml.php index 3b3210cd7ed..7ddab42ff08 100644 --- a/engine/Shopware/Controllers/Frontend/SitemapXml.php +++ b/engine/Shopware/Controllers/Frontend/SitemapXml.php @@ -23,19 +23,19 @@ */ /** - * @deprecated Will be removed in Shopware 5.7 + * @deprecated Will be removed in Shopware 5.8 */ class Shopware_Controllers_Frontend_SitemapXml extends Enlight_Controller_Action { /** * Index action method + * + * @return void */ public function indexAction() { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED); + trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $this->redirect([ - 'controller' => 'sitemap_index.xml', - ]); + $this->redirect(['controller' => 'sitemap_index.xml']); } } diff --git a/engine/Shopware/Controllers/Widgets/Listing.php b/engine/Shopware/Controllers/Widgets/Listing.php index 53426d6e10f..3723d18cdf7 100644 --- a/engine/Shopware/Controllers/Widgets/Listing.php +++ b/engine/Shopware/Controllers/Widgets/Listing.php @@ -326,6 +326,8 @@ private function setSearchResultResponse(ProductSearchResult $result): void if ($this->Request()->getParam('loadFacets')) { $body['facets'] = array_values($result->getFacets()); + $body['listing'] = false; + $body['pagination'] = false; } if ($this->Request()->getParam('loadProducts')) { $this->prepareListing($result); From c9f6de8196c276866473003b1f7251d90935c52e Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Tue, 27 Jun 2023 16:40:00 +0200 Subject: [PATCH 425/730] fix(SW-27005): Fix notices and warnings in components --- .phpstan-baseline.neon | 40 ------------------- .phpstan.neon | 2 +- .../Components/Api/Resource/Article.php | 16 ++++---- .../Components/Api/Resource/Customer.php | 10 ++--- .../Components/Api/Resource/EmotionPreset.php | 10 ++--- .../Components/Api/Resource/Translation.php | 2 +- .../Shopware/Components/Api/Resource/User.php | 2 +- .../Components/Api/Resource/Variant.php | 18 +++++---- .../Components/Auth/Adapter/Default.php | 15 ++++--- engine/Shopware/Components/CacheManager.php | 12 +++--- .../Components/Captcha/AbstractCaptcha.php | 2 +- .../Cart/ProportionalCartMerger.php | 4 +- .../Shopware/Components/Cart/Struct/Price.php | 38 +++++++----------- engine/Shopware/Components/Check/Path.php | 3 ++ engine/Shopware/Components/ConfigWriter.php | 6 +++ engine/Shopware/Components/CsvIterator.php | 26 ++++++------ .../Bridge/MailTransport.php | 19 +++++---- .../DependencyInjection/Bridge/Session.php | 4 +- .../DependencyInjection/Bridge/Template.php | 9 ++--- .../Components/DispatchFormatHelper.php | 10 ++--- engine/Shopware/Components/Document.php | 18 +++++---- .../Preset/EmotionToPresetDataTransformer.php | 2 +- .../Emotion/Preset/PresetDataSynchronizer.php | 2 +- .../Emotion/Preset/PresetLoader.php | 33 ++++++--------- .../Shopware/Components/Escaper/Escaper.php | 4 +- .../HttpCache/DefaultRouteService.php | 2 +- .../InvalidationDateTrait.php | 21 ++++------ .../RegexOrderNumberValidator.php | 5 +-- .../Shopware/Components/Plugin/Namespace.php | 2 +- .../Privacy/CookieRemoveSubscriber.php | 4 +- .../Components/ProductStream/Repository.php | 3 ++ .../Routing/Generators/DefaultGenerator.php | 6 ++- .../Routing/Generators/RewriteGenerator.php | 4 +- engine/Shopware/Components/SitePageMenu.php | 2 +- .../Components/SitemapXMLRepository.php | 30 +------------- .../Snippet/Writer/DatabaseWriter.php | 4 +- .../Components/StateTranslatorService.php | 2 +- engine/Shopware/Components/TemplateMail.php | 37 +++++++++-------- engine/Shopware/Components/Translation.php | 11 ++++- .../Translation/ObjectTranslator.php | 2 +- 40 files changed, 194 insertions(+), 248 deletions(-) diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index b8d8b1ed4f3..ba5bc667055 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -14160,21 +14160,6 @@ parameters: count: 1 path: engine/Shopware/Components/Auth/Adapter/Default.php - - - message: "#^Method Shopware_Components_Auth_Adapter_Default\\:\\:rehash\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Components/Auth/Adapter/Default.php - - - - message: "#^Method Shopware_Components_Auth_Adapter_Default\\:\\:updateExpiry\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Components/Auth/Adapter/Default.php - - - - message: "#^Method Shopware_Components_Auth_Adapter_Default\\:\\:updateHash\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Components/Auth/Adapter/Default.php - - message: "#^Property Shopware_Components_Auth_Adapter_Default\\:\\:\\$conditions type has no value type specified in iterable type array\\.$#" count: 1 @@ -14655,11 +14640,6 @@ parameters: count: 1 path: engine/Shopware/Components/Cart/Struct/DiscountContext.php - - - message: "#^Property Shopware\\\\Components\\\\Cart\\\\Struct\\\\Price\\:\\:\\$tax \\(float\\) does not accept float\\|null\\.$#" - count: 1 - path: engine/Shopware/Components/Cart/Struct/Price.php - - message: "#^Method Shopware\\\\Components\\\\Cart\\\\TaxAggregator\\:\\:positionsTaxSum\\(\\) has parameter \\$cart with no value type specified in iterable type array\\.$#" count: 1 @@ -15045,11 +15025,6 @@ parameters: count: 1 path: engine/Shopware/Components/ConfigLoader.php - - - message: "#^Method Shopware\\\\Components\\\\ConfigWriter\\:\\:get\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Components/ConfigWriter.php - - message: "#^Method Shopware\\\\Components\\\\ConfigWriter\\:\\:insert\\(\\) has no return type specified\\.$#" count: 1 @@ -15240,11 +15215,6 @@ parameters: count: 1 path: engine/Shopware/Components/DependencyInjection/Bridge/MailTransport.php - - - message: "#^Method Shopware\\\\Components\\\\DependencyInjection\\\\Bridge\\\\MailTransport\\:\\:factory\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Components/DependencyInjection/Bridge/MailTransport.php - - message: "#^Unable to resolve the template type TClass in call to method static method Enlight_Class\\:\\:Instance\\(\\)$#" count: 2 @@ -15315,11 +15285,6 @@ parameters: count: 1 path: engine/Shopware/Components/DependencyInjection/Bridge/Session.php - - - message: "#^Call to an undefined method Enlight_Template_Manager\\:\\:setDefaultResourceType\\(\\)\\.$#" - count: 1 - path: engine/Shopware/Components/DependencyInjection/Bridge/Template.php - - message: "#^Method Shopware\\\\Components\\\\DependencyInjection\\\\Bridge\\\\Template\\:\\:factory\\(\\) has parameter \\$backendOptions with no value type specified in iterable type array\\.$#" count: 1 @@ -19075,11 +19040,6 @@ parameters: count: 1 path: engine/Shopware/Components/SitePageMenu.php - - - message: "#^Method Shopware\\\\Components\\\\SitemapXMLRepository\\:\\:filterLink\\(\\) has parameter \\$userParams with no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Shopware/Components/SitemapXMLRepository.php - - message: "#^Method Shopware\\\\Components\\\\SitemapXMLRepository\\:\\:getSitemapContent\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 diff --git a/.phpstan.neon b/.phpstan.neon index fbd19ddb11f..bdaa52e9e03 100644 --- a/.phpstan.neon +++ b/.phpstan.neon @@ -163,7 +163,7 @@ parameters: - engine/Shopware/Commands/ThemeCreateCommand.php - # For testing purposes the constructor of the price struct gets strings - message: '#Parameter .* of class Shopware\\Components\\Cart\\Struct\\Price constructor expects float.*string given#' + message: '#Parameter .* of class Shopware\\Components\\Cart\\Struct\\Price constructor expects float|numeric-string, .* given#' path: tests/Functional/Components/Cart/ProportionalTaxCalculatorTest.php # This is a bleeding edge feature and not working well since now. See https://github.com/phpstan/phpstan-doctrine/issues/332 diff --git a/engine/Shopware/Components/Api/Resource/Article.php b/engine/Shopware/Components/Api/Resource/Article.php index 887e5553b90..95791af5b3e 100644 --- a/engine/Shopware/Components/Api/Resource/Article.php +++ b/engine/Shopware/Components/Api/Resource/Article.php @@ -496,7 +496,7 @@ public function prepareMainDetail(array $data, ProductModel $article) $article->setMainDetail($detail); } - if (!$data['mainDetail']) { + if (empty($data['mainDetail'])) { $data['mainDetail'] = []; } @@ -838,7 +838,7 @@ protected function getArticleSimilar($articleId) $product = $this->getSingleResult($builder); - return $product['similar']; + return $product['similar'] ?? null; } /** @@ -859,7 +859,7 @@ protected function getArticleRelated($articleId) $product = $this->getSingleResult($builder); - return $product['related']; + return $product['related'] ?? null; } /** @@ -1056,7 +1056,7 @@ protected function prepareVariants($data, ProductModel $article) } } - if ($variantData['isMain'] || $variantData['standard']) { + if (!empty($variantData['isMain']) || !empty($variantData['standard'])) { $newMain = $variant; $newMain->setKind(1); $oldMainId = $article->getMainDetail()->getId(); @@ -1510,7 +1510,7 @@ protected function prepareRelatedAssociatedData($data, ProductModel $article) } $relatedProduct = null; - if ($relatedData['number']) { + if (!empty($relatedData['number'])) { $productId = $this->getManager()->getConnection()->fetchOne( 'SELECT articleID FROM s_articles_details WHERE ordernumber = :number', [':number' => $relatedData['number']] @@ -1539,7 +1539,7 @@ protected function prepareRelatedAssociatedData($data, ProductModel $article) throw new CustomValidationException(sprintf('Related product by number/id "%s" not found', $property)); } - if ($relatedData['cross']) { + if (!empty($relatedData['cross'])) { $relatedProduct->getRelated()->add($article); } } @@ -1570,7 +1570,7 @@ protected function prepareSimilarAssociatedData($data, ProductModel $article) } $similarProduct = null; - if ($similarData['number']) { + if (!empty($similarData['number'])) { $productId = $this->getManager()->getConnection()->fetchOne( 'SELECT articleID FROM s_articles_details WHERE ordernumber = :number', [':number' => $similarData['number']] @@ -1599,7 +1599,7 @@ protected function prepareSimilarAssociatedData($data, ProductModel $article) throw new CustomValidationException(sprintf('Similar product by number/id "%s" not found', $property)); } - if ($similarData['cross']) { + if (!empty($similarData['cross'])) { $similarProduct->getSimilar()->add($article); } } diff --git a/engine/Shopware/Components/Api/Resource/Customer.php b/engine/Shopware/Components/Api/Resource/Customer.php index 692f63f191f..ab594cadc3b 100644 --- a/engine/Shopware/Components/Api/Resource/Customer.php +++ b/engine/Shopware/Components/Api/Resource/Customer.php @@ -215,7 +215,7 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o public function create(array $params) { $this->checkPrivilege('create'); - $this->setupContext($params['shopId']); + $this->setupContext($params['shopId'] ?? null); // Create models $customer = new CustomerModel(); @@ -237,13 +237,13 @@ public function create(array $params) $customer->fromArray($params); $billing = $this->createAddress($params['billing']) ?? new AddressModel(); - $shipping = $this->createAddress($params['shipping']); + $shipping = $this->createAddress($params['shipping'] ?? null); $registerService = $this->getContainer()->get(RegisterServiceInterface::class); $context = $this->getContainer()->get(ContextServiceInterface::class)->getShopContext()->getShop(); $context->addAttribute('sendOptinMail', new Attribute([ - 'sendOptinMail' => $params['sendOptinMail'] === true, + 'sendOptinMail' => ($params['sendOptinMail'] ?? false) === true, ])); $registerService->register($context, $customer, $billing, $shipping); @@ -489,7 +489,7 @@ private function prepareCustomerData(array $params, CustomerModel $customer): ar } // If a different payment method is selected, it must also be placed in the "paymentPreset" so that the risk management that does not reset. - if ($customer->getId() && $customer->getPaymentId() !== $params['paymentId']) { + if (isset($params['paymentId']) && $customer->getId() && $customer->getPaymentId() !== $params['paymentId']) { $params['paymentPreset'] = $params['paymentId']; } @@ -528,7 +528,7 @@ private function createAddress(?array $data = null): ?AddressModel return null; } - if (!$data['country']) { + if (empty($data['country'])) { throw new CustomValidationException('A country is required.'); } diff --git a/engine/Shopware/Components/Api/Resource/EmotionPreset.php b/engine/Shopware/Components/Api/Resource/EmotionPreset.php index 8185256b7fd..98ea3298906 100644 --- a/engine/Shopware/Components/Api/Resource/EmotionPreset.php +++ b/engine/Shopware/Components/Api/Resource/EmotionPreset.php @@ -164,7 +164,7 @@ private function save(array $data, Preset $preset, $locale = 'de_DE') unset($translation); } - if (!\is_array($data['requiredPlugins'])) { + if (!isset($data['requiredPlugins']) || !\is_array($data['requiredPlugins'])) { $data['requiredPlugins'] = []; } @@ -241,7 +241,7 @@ private function hydrate(array $presets, $locale = 'de_DE') { $pluginNames = []; foreach ($presets as $id => $preset) { - $plugins = json_decode($preset['requiredPlugins'], true) ?? []; + $plugins = json_decode($preset['requiredPlugins'] ?? '', true) ?? []; $combinedPlugins = array_combine(array_column($plugins, 'name'), $plugins); if (!\is_array($combinedPlugins)) { $preset['requiredPlugins'] = []; @@ -263,8 +263,8 @@ private function hydrate(array $presets, $locale = 'de_DE') 'premium' => $preset['premium'], 'custom' => $preset['custom'], 'thumbnail' => $preset['thumbnail'], - 'preview' => $preset['preview'], - 'presetData' => $preset['presetData'], + 'preview' => $preset['preview'] ?? null, + 'presetData' => $preset['presetData'] ?? null, 'requiredPlugins' => $this->getPluginsForPreset($preset, $localPlugins), 'assetsImported' => $preset['assetsImported'], ]; @@ -336,7 +336,7 @@ function ($plugin) { 'installed' => false, 'plugin_label' => $plugin['label'], 'plugin_name' => $plugin['name'], - 'current_version' => null, + 'current_version' => '', 'valid' => false, ], $plugin); diff --git a/engine/Shopware/Components/Api/Resource/Translation.php b/engine/Shopware/Components/Api/Resource/Translation.php index 78acab06f77..03eaff091c8 100644 --- a/engine/Shopware/Components/Api/Resource/Translation.php +++ b/engine/Shopware/Components/Api/Resource/Translation.php @@ -90,7 +90,7 @@ public function __construct(?Shopware_Components_Translation $translationCompone public function getIdByData($data) { - if ($data['useNumberAsId']) { + if (!empty($data['useNumberAsId'])) { return $this->getIdByNumber( $data['key'], $data['type'] diff --git a/engine/Shopware/Components/Api/Resource/User.php b/engine/Shopware/Components/Api/Resource/User.php index a77a45185fb..7d17de8a4e4 100644 --- a/engine/Shopware/Components/Api/Resource/User.php +++ b/engine/Shopware/Components/Api/Resource/User.php @@ -359,7 +359,7 @@ protected function prepareAssociatedData(array $data, UserModel $user) $defaultEncoderName = $passwordEncoderRegistry->getDefaultPasswordEncoderName(); $encoder = $passwordEncoderRegistry->getEncoderByName($defaultEncoderName); - $data['password'] = $encoder->encodePassword($data['password']); + $data['password'] = $encoder->encodePassword($data['password'] ?? ''); $data['encoder'] = $encoder->getName(); return $data; diff --git a/engine/Shopware/Components/Api/Resource/Variant.php b/engine/Shopware/Components/Api/Resource/Variant.php index 2079d9a4608..b6b5ec4c3a1 100644 --- a/engine/Shopware/Components/Api/Resource/Variant.php +++ b/engine/Shopware/Components/Api/Resource/Variant.php @@ -699,8 +699,8 @@ protected function prepareConfigurator(array $data, ProductModel $article, Detai foreach ($data['configuratorOptions'] as $optionData) { $availableGroup = $this->getAvailableGroup($availableGroups, [ - 'id' => $optionData['groupId'], - 'name' => $optionData['group'], + 'id' => $optionData['groupId'] ?? null, + 'name' => $optionData['group'] ?? null, ]); // Group is in the product configurator set configured? @@ -710,8 +710,8 @@ protected function prepareConfigurator(array $data, ProductModel $article, Detai // Check if the option is available in the configured product configurator set. $option = $this->getAvailableOption($availableGroup->getOptions(), [ - 'id' => $optionData['optionId'], - 'name' => $optionData['option'], + 'id' => $optionData['optionId'] ?? null, + 'name' => $optionData['option'] ?? null, ]); if (!$option) { @@ -919,11 +919,12 @@ private function getAvailableGroup(Collection $availableGroups, array $groupData { // Convert string to lower case to avoid problems with case insensitivity in database // vs case sensitivity in PHP - $groupName = mb_strtolower($groupData['name']); + $groupName = mb_strtolower($groupData['name'] ?? ''); foreach ($availableGroups as $availableGroup) { if (($groupData['id'] !== null && (int) $availableGroup->getId() === (int) $groupData['id']) - || (mb_strtolower($availableGroup->getName()) === $groupName && $groupData['name'] !== null)) { + || (mb_strtolower($availableGroup->getName()) === $groupName && $groupData['name'] !== null) + ) { return $availableGroup; } } @@ -942,11 +943,12 @@ private function getAvailableOption(Collection $availableOptions, array $optionD { // Convert string to lower case to avoid problems with case insensitivity in database // vs case sensitivity in PHP - $optionName = mb_strtolower($optionData['name']); + $optionName = mb_strtolower($optionData['name'] ?? ''); foreach ($availableOptions as $availableOption) { if ((mb_strtolower($availableOption->getName()) === $optionName && $optionData['name'] !== null) - || ((int) $availableOption->getId() === (int) $optionData['id'] && $optionData['id'] !== null)) { + || ((int) $availableOption->getId() === (int) $optionData['id'] && $optionData['id'] !== null) + ) { return $availableOption; } } diff --git a/engine/Shopware/Components/Auth/Adapter/Default.php b/engine/Shopware/Components/Auth/Adapter/Default.php index f75c202d24c..f4f78c67a6e 100644 --- a/engine/Shopware/Components/Auth/Adapter/Default.php +++ b/engine/Shopware/Components/Auth/Adapter/Default.php @@ -150,8 +150,8 @@ public function authenticate() // Reset failed login count $this->setFailedLogins(0); - } else { - // If more then 4 previous failed logins lock account for n * failedlogins seconds + } elseif ($user) { + // If more than 4 previous failed logins lock account for n * failedlogins seconds if ($user->failedlogins >= 4) { $lockedUntil = new Zend_Date(); $lockedUntil->addSecond($this->lockSeconds * $user->failedlogins); @@ -172,16 +172,16 @@ public function authenticate() } /** - * @deprecated in 5.6, will be private in 5.7 + * @deprecated in 5.6, will be private in 5.8 * * @param string $plaintext * @param string $hash * @param string $encoderName + * + * @return void */ public function rehash($plaintext, $hash, $encoderName) { - trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.7.', __CLASS__, __METHOD__), E_USER_DEPRECATED); - $newHash = Shopware()->PasswordEncoder()->reencodePassword($plaintext, $hash, $encoderName); if ($newHash === $hash) { @@ -203,6 +203,8 @@ public function rehash($plaintext, $hash, $encoderName) * * @param string $plaintext * @param string $defaultEncoderName + * + * @return void */ public function updateHash($plaintext, $defaultEncoderName) { @@ -218,6 +220,9 @@ public function updateHash($plaintext, $defaultEncoderName) ); } + /** + * @return void + */ protected function updateExpiry() { if ($this->expiryColumn === null) { diff --git a/engine/Shopware/Components/CacheManager.php b/engine/Shopware/Components/CacheManager.php index a2fb2f00648..85fc1ba2270 100644 --- a/engine/Shopware/Components/CacheManager.php +++ b/engine/Shopware/Components/CacheManager.php @@ -148,9 +148,9 @@ public function __construct( } /** - * @return Zend_Cache_Core - * * @deprecated in 5.6, will be removed in 5.8. Use `cache` service directly via DI + * + * @return Zend_Cache_Core */ public function getCoreCache() { @@ -438,11 +438,11 @@ public function getOpCacheCacheInfo() /** * Returns cache information * + * @deprecated in 5.6, will be private in 5.8 without replacement + * * @param string $dir * * @return array - * - * @deprecated in 5.6, will be private in 5.8 without replacement */ public function getDirectoryInfo($dir) { @@ -554,11 +554,11 @@ public function clearByTag($tag) /** * Format size method * + * @deprecated in 5.6, will be private in 5.8 without replacement + * * @param float $bytes * * @return string - * - * @deprecated in 5.6, will be private in 5.8 without replacement */ public function encodeSize($bytes) { diff --git a/engine/Shopware/Components/Captcha/AbstractCaptcha.php b/engine/Shopware/Components/Captcha/AbstractCaptcha.php index fe3005887a5..07259dd7e7b 100644 --- a/engine/Shopware/Components/Captcha/AbstractCaptcha.php +++ b/engine/Shopware/Components/Captcha/AbstractCaptcha.php @@ -98,7 +98,7 @@ protected function getImageResource($string) $string = implode(' ', str_split($string)); if (!empty($font)) { - for ($i = 0, $iMax = \strlen($string); $i <= $iMax; ++$i) { + for ($i = 0, $iMax = \strlen($string); $i < $iMax; ++$i) { $rand1 = Random::getInteger(35, 40); $rand2 = Random::getInteger(15, 20); $rand3 = Random::getInteger(60, 70); diff --git a/engine/Shopware/Components/Cart/ProportionalCartMerger.php b/engine/Shopware/Components/Cart/ProportionalCartMerger.php index 764c5448771..5cee1381076 100644 --- a/engine/Shopware/Components/Cart/ProportionalCartMerger.php +++ b/engine/Shopware/Components/Cart/ProportionalCartMerger.php @@ -95,8 +95,8 @@ public function mergeProportionalItems(array $content) */ private function mergeAmount(array $item1, array $item2, string $property) { - $hasComma = str_contains($item1[$property], ','); - $amount = (float) str_replace(',', '.', $item1[$property]) + (float) str_replace(',', '.', $item2[$property]); + $hasComma = str_contains($item1[$property] ?? '', ','); + $amount = (float) str_replace(',', '.', $item1[$property] ?? '') + (float) str_replace(',', '.', $item2[$property] ?? ''); if ($hasComma) { $amount = $this->modules->Articles()->sFormatPrice($amount); diff --git a/engine/Shopware/Components/Cart/Struct/Price.php b/engine/Shopware/Components/Cart/Struct/Price.php index 07169b72c3e..acc22c20831 100644 --- a/engine/Shopware/Components/Cart/Struct/Price.php +++ b/engine/Shopware/Components/Cart/Struct/Price.php @@ -1,4 +1,6 @@ price = $price; - $this->netPrice = $netPrice; - $this->taxRate = $taxRate; - $this->tax = $tax; + $this->price = (float) $price; + $this->netPrice = (float) $netPrice; + $this->taxRate = (float) $taxRate; + $this->tax = (float) $tax; } /** diff --git a/engine/Shopware/Components/Check/Path.php b/engine/Shopware/Components/Check/Path.php index 65fb8b69ae4..3ece7761344 100644 --- a/engine/Shopware/Components/Check/Path.php +++ b/engine/Shopware/Components/Check/Path.php @@ -75,8 +75,11 @@ public function getList() /** * Returns the check list * + * @deprecated - Native return type will be added with Shopware 5.8 + * * @return Iterator */ + #[\ReturnTypeWillChange] public function getIterator() { return $this->getList(); diff --git a/engine/Shopware/Components/ConfigWriter.php b/engine/Shopware/Components/ConfigWriter.php index e7d0d3a1681..8092e07ae5c 100644 --- a/engine/Shopware/Components/ConfigWriter.php +++ b/engine/Shopware/Components/ConfigWriter.php @@ -45,6 +45,8 @@ public function __construct(Connection $connection) * @param string $name * @param string|null $namespace * @param int $shopId + * + * @return mixed|null */ public function get($name, $namespace = null, $shopId = 1) { @@ -56,6 +58,10 @@ public function get($name, $namespace = null, $shopId = 1) return unserialize($result['configured'], ['allowed_classes' => false]); } + if ($result['value'] === null) { + return null; + } + return unserialize($result['value'], ['allowed_classes' => false]); } diff --git a/engine/Shopware/Components/CsvIterator.php b/engine/Shopware/Components/CsvIterator.php index 67971b6f713..069b02a2e3c 100644 --- a/engine/Shopware/Components/CsvIterator.php +++ b/engine/Shopware/Components/CsvIterator.php @@ -77,7 +77,7 @@ class Shopware_Components_CsvIterator extends Enlight_Class implements Iterator private $_header; /** - * This is the constructor. It try to open the CSV file. + * This is the constructor. It tries to open the CSV file. * * @param string $filename the full path of the CSV file * @param non-empty-string $delimiter the delimiter @@ -111,7 +111,7 @@ public function __construct($filename, $delimiter = self::DEFAULT_DELIMITER, $he } /** - * This is the destructor. It close the CSV file. + * This is the destructor. It closes the CSV file. */ public function __destruct() { @@ -141,9 +141,9 @@ public function GetHeader() /** * This method move the file pointer to the next row. * - * @return void + * @deprecated - Native return type will be added with Shopware 5.8 * - * @deprecated - Native return and parameter type will be added with Shopware 5.8 + * @return void */ #[\ReturnTypeWillChange] public function next() @@ -155,9 +155,9 @@ public function next() /** * This method reset the file handler. * - * @return void + * @deprecated - Native return type will be added with Shopware 5.8 * - * @deprecated - Native return and parameter type will be added with Shopware 5.8 + * @return void */ #[\ReturnTypeWillChange] public function rewind() @@ -171,9 +171,9 @@ public function rewind() /** * This method returns the current row number. * - * @return int|null + * @deprecated - Native return type will be added with Shopware 5.8 * - * @deprecated - Native return and parameter type will be added with Shopware 5.8 + * @return int|null */ #[\ReturnTypeWillChange] public function key() @@ -182,11 +182,11 @@ public function key() } /** - * This methods return the current CSV row data. + * This method return the current CSV row data. * - * @return array The row as a one-dimensional array + * @deprecated - Native return type will be added with Shopware 5.8 * - * @deprecated - Native return and parameter type will be added with Shopware 5.8 + * @return array The row as a one-dimensional array */ #[\ReturnTypeWillChange] public function current() @@ -202,9 +202,9 @@ public function current() /** * This method checks if the current row is readable. * - * @return bool if the current row is readable + * @deprecated - Native return type will be added with Shopware 5.8 * - * @deprecated - Native return and parameter type will be added with Shopware 5.8 + * @return bool if the current row is readable */ #[\ReturnTypeWillChange] public function valid() diff --git a/engine/Shopware/Components/DependencyInjection/Bridge/MailTransport.php b/engine/Shopware/Components/DependencyInjection/Bridge/MailTransport.php index 37ac3ce488f..3b5b441dbe3 100644 --- a/engine/Shopware/Components/DependencyInjection/Bridge/MailTransport.php +++ b/engine/Shopware/Components/DependencyInjection/Bridge/MailTransport.php @@ -31,21 +31,26 @@ use Zend_Mail_Transport_Abstract; use Zend_Mail_Transport_Smtp; +/** + * @phpstan-type MailOptions = array{charset: string, type?: string|class-string, username?: string, password?: string, auth?: string, ssl?: string, port?: string, name?: string, host?: string, from?: array{email: string, name: string}, replyTo?: array{email: string, name: string}} + */ class MailTransport { /** - * @return Enlight_Class|Zend_Mail_Transport_Abstract + * @param MailOptions $options + * + * @return Zend_Mail_Transport_Abstract */ public function factory(Enlight_Loader $loader, Shopware_Components_Config $config, array $options) { - if (!isset($options['type']) && !empty($config->MailerMailer) && $config->MailerMailer != 'mail') { + if (!isset($options['type']) && !empty($config->MailerMailer) && $config->MailerMailer !== 'mail') { $options['type'] = $config->MailerMailer; } if (empty($options['type'])) { $options['type'] = 'sendmail'; } - if ($options['type'] == 'smtp') { + if ($options['type'] === 'smtp') { if (!isset($options['username']) && !empty($config->MailerUsername)) { if (!empty($config->MailerAuth)) { $options['auth'] = $config->MailerAuth; @@ -77,16 +82,14 @@ public function factory(Enlight_Loader $loader, Shopware_Components_Config $conf } unset($options['type'], $options['charset']); - if ($transportName === 'Zend_Mail_Transport_Smtp') { - /** @var Zend_Mail_Transport_Smtp $transport */ - $transport = Enlight_Class::Instance($transportName, [$options['host'], $options]); + if ($transportName === Zend_Mail_Transport_Smtp::class) { + $transport = Enlight_Class::Instance($transportName, [$options['host'] ?? null, $options]); } elseif (!empty($options)) { - /** @var Zend_Mail_Transport_Abstract $transport */ $transport = Enlight_Class::Instance($transportName, [$options]); } else { - /** @var Zend_Mail_Transport_Abstract $transport */ $transport = Enlight_Class::Instance($transportName); } + \assert($transport instanceof Zend_Mail_Transport_Abstract); Enlight_Components_Mail::setDefaultTransport($transport); if (!isset($options['from']) && !empty($config->Mail)) { diff --git a/engine/Shopware/Components/DependencyInjection/Bridge/Session.php b/engine/Shopware/Components/DependencyInjection/Bridge/Session.php index c4715c9ccbe..e66f88adcc4 100644 --- a/engine/Shopware/Components/DependencyInjection/Bridge/Session.php +++ b/engine/Shopware/Components/DependencyInjection/Bridge/Session.php @@ -114,7 +114,9 @@ public function createSession(Container $container, ?SessionHandlerInterface $sa $sessionOptions['cookie_path'] = empty($basePath) ? '/' : $basePath; if ($saveHandler) { - session_set_save_handler($saveHandler); + if (empty($sessionOptions['unitTestEnabled'])) { + session_set_save_handler($saveHandler); + } unset($sessionOptions['save_handler']); } diff --git a/engine/Shopware/Components/DependencyInjection/Bridge/Template.php b/engine/Shopware/Components/DependencyInjection/Bridge/Template.php index 2792997a04a..b65411de239 100644 --- a/engine/Shopware/Components/DependencyInjection/Bridge/Template.php +++ b/engine/Shopware/Components/DependencyInjection/Bridge/Template.php @@ -45,17 +45,16 @@ public function factory( array $securityConfig, array $backendOptions ) { - /** @var Enlight_Template_Manager $template */ - $template = Enlight_Class::Instance('Enlight_Template_Manager', [null, $backendOptions]); + $template = Enlight_Class::Instance(Enlight_Template_Manager::class, [null, $backendOptions]); + \assert($template instanceof Enlight_Template_Manager); - $template->enableSecurity( - new Security($template, $securityConfig) - ); + $template->enableSecurity(new Security($template, $securityConfig)); $template->setOptions($templateConfig); $template->setEventManager($eventManager); $template->registerResource('snippet', $snippetResource); + /* @phpstan-ignore-next-line is handled by magic method `\Smarty_Internal_TemplateBase::__call` and will set the property `\Smarty::$default_resource_type` */ $template->setDefaultResourceType('snippet'); $template->registerPlugin(Smarty::PLUGIN_MODIFIER, 'escapeHtml', [$escaper, 'escapeHtml']); diff --git a/engine/Shopware/Components/DispatchFormatHelper.php b/engine/Shopware/Components/DispatchFormatHelper.php index 13e3cf63dfa..2a6b11b8148 100644 --- a/engine/Shopware/Components/DispatchFormatHelper.php +++ b/engine/Shopware/Components/DispatchFormatHelper.php @@ -27,8 +27,8 @@ class DispatchFormatHelper { /** - * @param string $unFormatted - * @param bool $isController + * @param string|null $unFormatted + * @param bool $isController * * @return string */ @@ -40,17 +40,17 @@ public function formatNameForRequest($unFormatted, $isController = false) $allowedCharacters .= '\.'; } - return preg_replace('#[^' . $allowedCharacters . ']+#', '', $unFormatted); + return preg_replace('#[^' . $allowedCharacters . ']+#', '', $unFormatted ?? ''); } /** - * @param string $unFormatted + * @param string|null $unFormatted * * @return string */ public function formatNameForDispatch($unFormatted) { - $segments = explode('_', $unFormatted); + $segments = explode('_', $unFormatted ?? ''); foreach ($segments as $key => $segment) { $segment = (string) preg_replace('#[A-Z]#', ' $0', $segment); diff --git a/engine/Shopware/Components/Document.php b/engine/Shopware/Components/Document.php index d9350a9a3b3..7a6b543da6e 100644 --- a/engine/Shopware/Components/Document.php +++ b/engine/Shopware/Components/Document.php @@ -464,19 +464,19 @@ protected function assignValues4x() $Document = array_merge( $Document, [ - 'comment' => $this->_config['docComment'], + 'comment' => $this->_config['docComment'] ?? null, 'id' => $id, 'bid' => $this->_documentBid, 'date' => $this->_config['date'], - 'deliveryDate' => $this->_config['delivery_date'], + 'deliveryDate' => $this->_config['delivery_date'] ?? null, // The "netto" config flag, if set to true, allows creating // netto documents for brutto orders. Setting it to false, // does not however create brutto documents for netto orders. - 'netto' => $this->_order->order->taxfree ? true : $this->_config['netto'], + 'netto' => $this->_order->order->taxfree ? true : ($this->_config['netto'] ?? null), 'nettoPositions' => $this->_order->order->net, ] ); - $Document['voucher'] = $this->getVoucher($this->_config['voucher']); + $Document['voucher'] = $this->getVoucher($this->_config['voucher'] ?? null); $this->_view->assign('Document', $Document); // Translate payment and dispatch depending on the order's language @@ -529,7 +529,7 @@ protected function assignValues4x() } unset($product); - if ($this->_config['_previewForcePagebreak']) { + if (!empty($this->_config['_previewForcePagebreak'])) { $positions = array_merge($positions, $positions); } @@ -692,7 +692,7 @@ protected function saveDocument() return; } - $bid = $this->_config['bid']; + $bid = $this->_config['bid'] ?? null; if (!empty($bid)) { $this->_documentBid = $bid; } @@ -713,7 +713,8 @@ protected function saveDocument() UPDATE `s_order_documents` SET `date` = now(),`amount` = ? WHERE `type` = ? AND userID = ? AND orderID = ? LIMIT 1 '; - $amount = ($this->_order->order->taxfree ? true : $this->_config['netto']) ? round($this->_order->amountNetto, 2) : round($this->_order->amount, 2); + $useNet = $this->_order->order->taxfree ? true : ($this->_config['netto'] ?? null); + $amount = $useNet ? round($this->_order->amountNetto, 2) : round($this->_order->amount, 2); if ($typID == 4) { $amount *= -1; } @@ -756,7 +757,8 @@ protected function saveDocument() $hash = md5(uniqid((string) rand())); - $amount = ($this->_order->order->taxfree ? true : $this->_config['netto']) ? round($this->_order->amountNetto, 2) : round($this->_order->amount, 2); + $useNet = $this->_order->order->taxfree ? true : ($this->_config['netto'] ?? null); + $amount = $useNet ? round($this->_order->amountNetto, 2) : round($this->_order->amount, 2); if ($typID == 4) { $amount *= -1; } diff --git a/engine/Shopware/Components/Emotion/Preset/EmotionToPresetDataTransformer.php b/engine/Shopware/Components/Emotion/Preset/EmotionToPresetDataTransformer.php index 39b5e58fd83..a1ef9554923 100644 --- a/engine/Shopware/Components/Emotion/Preset/EmotionToPresetDataTransformer.php +++ b/engine/Shopware/Components/Emotion/Preset/EmotionToPresetDataTransformer.php @@ -163,7 +163,7 @@ private function cleanupElementData(array $element, array $fieldMapping) $data['emotionId'], $data['elementId'] ); - $field = $fieldMapping[$data['fieldId']]; + $field = $fieldMapping[$data['fieldId']] ?? null; if ($field) { $data['fieldId'] = $field['name']; diff --git a/engine/Shopware/Components/Emotion/Preset/PresetDataSynchronizer.php b/engine/Shopware/Components/Emotion/Preset/PresetDataSynchronizer.php index 378437dce78..606e0a6e865 100644 --- a/engine/Shopware/Components/Emotion/Preset/PresetDataSynchronizer.php +++ b/engine/Shopware/Components/Emotion/Preset/PresetDataSynchronizer.php @@ -182,7 +182,7 @@ private function synchronizeData(Preset $preset, array $element) private function findElementBySyncKey(array $presetData, $elementSyncKey) { foreach ($presetData['elements'] as $element) { - if ($element['syncKey'] === $elementSyncKey) { + if (isset($element['syncKey']) && $element['syncKey'] === $elementSyncKey) { return $element; } } diff --git a/engine/Shopware/Components/Emotion/Preset/PresetLoader.php b/engine/Shopware/Components/Emotion/Preset/PresetLoader.php index 60539d54c66..065c2c2f632 100644 --- a/engine/Shopware/Components/Emotion/Preset/PresetLoader.php +++ b/engine/Shopware/Components/Emotion/Preset/PresetLoader.php @@ -1,4 +1,6 @@ getPresetData(), true); - if (!$presetData['elements']) { + if (empty($presetData['elements'])) { return $preset->getPresetData(); } @@ -80,10 +76,7 @@ public function load($presetId) return $this->preparePresetData($presetData); } - /** - * @return array - */ - private function refreshElementData(array $elements) + private function refreshElementData(array $elements): array { $collectedComponents = array_column($elements, 'componentId'); $collectedComponents = array_keys(array_flip($collectedComponents)); @@ -103,7 +96,7 @@ private function refreshElementData(array $elements) foreach ($element['data'] as &$data) { $data['componentId'] = $element['componentId']; - $data['fieldId'] = $fieldMapping[$data['fieldId']]['id']; + $data['fieldId'] = $fieldMapping[$data['fieldId']]['id'] ?? null; } unset($data); } @@ -118,7 +111,7 @@ private function refreshElementData(array $elements) * * @return string $presetData */ - private function preparePresetData(array $presetData) + private function preparePresetData(array $presetData): string { foreach ($presetData['elements'] as &$element) { $fieldMapping = []; @@ -129,7 +122,10 @@ private function preparePresetData(array $presetData) } foreach ($element['data'] as &$data) { - $field = $fieldMapping[$data['fieldId']]; + $field = $fieldMapping[$data['fieldId']] ?? null; + if ($field === null) { + continue; + } if (\in_array($field['name'], ['file', 'image', 'fallback_picture'], true)) { $data['value'] = $this->mediaService->getUrl($data['value']); @@ -155,10 +151,7 @@ private function preparePresetData(array $presetData) return json_encode($presetData); } - /** - * @return array - */ - private function getComponentData(array $collectedComponents) + private function getComponentData(array $collectedComponents): array { return $this->modelManager->createQueryBuilder() ->select('component', 'fields') diff --git a/engine/Shopware/Components/Escaper/Escaper.php b/engine/Shopware/Components/Escaper/Escaper.php index 8d633aace86..ccab408be61 100644 --- a/engine/Shopware/Components/Escaper/Escaper.php +++ b/engine/Shopware/Components/Escaper/Escaper.php @@ -1,4 +1,6 @@ config['noCacheControllers']; + $controllers = $this->config['noCacheControllers'] ?? null; $result = []; if (empty($controllers)) { diff --git a/engine/Shopware/Components/HttpCache/InvalidationDate/InvalidationDateTrait.php b/engine/Shopware/Components/HttpCache/InvalidationDate/InvalidationDateTrait.php index 525beed68f5..be9d14018d7 100644 --- a/engine/Shopware/Components/HttpCache/InvalidationDate/InvalidationDateTrait.php +++ b/engine/Shopware/Components/HttpCache/InvalidationDate/InvalidationDateTrait.php @@ -1,4 +1,6 @@ $dates + * @param array $dates * * @return DateTimeInterface|null */ @@ -43,7 +45,7 @@ protected function getMostRecentDate(array $dates) // Convert all date-strings into DateTime-objects $dates = array_map(function ($el) use ($now) { if (!$el instanceof DateTimeInterface) { - $el = new DateTime($el); + $el = new DateTime($el ?? ''); } return $now < $el ? $el : null; @@ -56,17 +58,10 @@ protected function getMostRecentDate(array $dates) return null; } - // Pop a date as reference - $nearest = array_pop($dates); - - // Find the nearest date - foreach ($dates as $date) { - if ($now->diff($nearest) < $now->diff($date)) { - continue; - } - $nearest = $date; - } + usort($dates, function (DateTimeInterface $a, DateTimeInterface $b): int { + return $a <=> $b; + }); - return $nearest; + return array_pop($dates); } } diff --git a/engine/Shopware/Components/OrderNumberValidator/RegexOrderNumberValidator.php b/engine/Shopware/Components/OrderNumberValidator/RegexOrderNumberValidator.php index f8dca783b93..4982ae47244 100644 --- a/engine/Shopware/Components/OrderNumberValidator/RegexOrderNumberValidator.php +++ b/engine/Shopware/Components/OrderNumberValidator/RegexOrderNumberValidator.php @@ -28,10 +28,7 @@ class RegexOrderNumberValidator implements OrderNumberValidatorInterface { - /** - * @var string - */ - private $pattern; + private string $pattern; public function __construct(string $pattern) { diff --git a/engine/Shopware/Components/Plugin/Namespace.php b/engine/Shopware/Components/Plugin/Namespace.php index 5b2405ea4c7..bdd84b1584b 100644 --- a/engine/Shopware/Components/Plugin/Namespace.php +++ b/engine/Shopware/Components/Plugin/Namespace.php @@ -623,7 +623,7 @@ protected function buildClassName($namespace, $pluginName) */ protected function buildPath($namespace, $pluginName, $pluginSource) { - $baseDir = $this->pluginDirectories[$pluginSource]; + $baseDir = $this->pluginDirectories[$pluginSource] ?? ''; return $baseDir . $namespace . DIRECTORY_SEPARATOR . $pluginName . DIRECTORY_SEPARATOR; } diff --git a/engine/Shopware/Components/Privacy/CookieRemoveSubscriber.php b/engine/Shopware/Components/Privacy/CookieRemoveSubscriber.php index 26a824340b6..66cac25b935 100644 --- a/engine/Shopware/Components/Privacy/CookieRemoveSubscriber.php +++ b/engine/Shopware/Components/Privacy/CookieRemoveSubscriber.php @@ -95,13 +95,13 @@ public function onPostDispatch(Enlight_Controller_ActionEventArgs $args): void ); } - $allowCookie = (int) $controller->Request()->cookies->getInt('allowCookie'); + $allowCookie = $controller->Request()->cookies->getInt('allowCookie'); if ($this->config->get('cookie_note_mode') !== self::COOKIE_MODE_TECHNICAL) { if ($allowCookie === 1) { return; } - header_remove('Set-Cookie'); + $controller->Response()->headers->remove('Set-Cookie'); return; } diff --git a/engine/Shopware/Components/ProductStream/Repository.php b/engine/Shopware/Components/ProductStream/Repository.php index de051d5da5d..520fd9eaeb5 100644 --- a/engine/Shopware/Components/ProductStream/Repository.php +++ b/engine/Shopware/Components/ProductStream/Repository.php @@ -48,6 +48,9 @@ public function __construct(Connection $conn, LogawareReflectionHelper $reflecto public function prepareCriteria(Criteria $criteria, $productStreamId) { $productStream = $this->getStreamById($productStreamId); + if (!\array_key_exists('type', $productStream)) { + return; + } if ((int) $productStream['type'] === ProductStream::TYPE_CONDITION) { $this->prepareConditionStream($productStream, $criteria); diff --git a/engine/Shopware/Components/Routing/Generators/DefaultGenerator.php b/engine/Shopware/Components/Routing/Generators/DefaultGenerator.php index 19474e0c73f..d0c2a77ed4a 100644 --- a/engine/Shopware/Components/Routing/Generators/DefaultGenerator.php +++ b/engine/Shopware/Components/Routing/Generators/DefaultGenerator.php @@ -86,14 +86,16 @@ public function generate(array $params, Context $context) foreach ($params as $key => $value) { if (\is_object($value)) { - trigger_error(sprintf('Using objects as params in %s:%s is deprecated since Shopware 5.6 and will result in an exception with 5.7.', __CLASS__, __METHOD__), E_USER_DEPRECATED); + trigger_error(sprintf('Using objects as params in %s:%s is deprecated since Shopware 5.6 and will result in an exception with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED); } $route[] = $key; $route[] = \is_array($value) ? http_build_query($value) : $value; } - $route = array_map('urlencode', $route); + $route = array_map(function ($routePart) { + return $routePart !== null ? urlencode($routePart) : null; + }, $route); return implode($this->separator, $route); } diff --git a/engine/Shopware/Components/Routing/Generators/RewriteGenerator.php b/engine/Shopware/Components/Routing/Generators/RewriteGenerator.php index 6294006850a..35ae6433351 100644 --- a/engine/Shopware/Components/Routing/Generators/RewriteGenerator.php +++ b/engine/Shopware/Components/Routing/Generators/RewriteGenerator.php @@ -159,7 +159,9 @@ protected function getOrgQueryArray($query) $orgQuery = ['sViewport' => $query['controller']]; switch ($query['controller']) { case 'detail': - $orgQuery['sArticle'] = $query['sArticle']; + if (isset($query['sArticle'])) { + $orgQuery['sArticle'] = $query['sArticle']; + } break; case 'blog': if (isset($query['action']) && $query['action'] !== 'index') { diff --git a/engine/Shopware/Components/SitePageMenu.php b/engine/Shopware/Components/SitePageMenu.php index 1aec326e1c5..76482979f3e 100644 --- a/engine/Shopware/Components/SitePageMenu.php +++ b/engine/Shopware/Components/SitePageMenu.php @@ -90,7 +90,7 @@ public function getTree($shopId, $activeId) $menu[$key] = []; } - if ($site['__page_translation']) { + if (isset($site['__page_translation'])) { $translations = unserialize($site['__page_translation'], ['allowed_classes' => false]); if ($translations) { diff --git a/engine/Shopware/Components/SitemapXMLRepository.php b/engine/Shopware/Components/SitemapXMLRepository.php index 9903fb49ab7..bd73285c918 100644 --- a/engine/Shopware/Components/SitemapXMLRepository.php +++ b/engine/Shopware/Components/SitemapXMLRepository.php @@ -33,6 +33,7 @@ use Shopware\Bundle\SearchBundle\Criteria; use Shopware\Bundle\SearchBundle\ProductNumberSearchInterface; use Shopware\Bundle\SearchBundle\StoreFrontCriteriaFactoryInterface; +use Shopware\Bundle\SitemapBundle\Service\LinkFilter; use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface; use Shopware\Components\Model\ModelManager; use Shopware\Models\Category\Category; @@ -265,7 +266,7 @@ private function readStaticUrls() 'sCustom' => $site['id'], ]; - $site['show'] = $this->filterLink($site['link'], $site['urlParams']); + $site['show'] = LinkFilter::filterLink($site['link'], $site['urlParams']); } return $sites; @@ -309,33 +310,6 @@ private function getSitesByShopId($shopId) return $sites; } - /** - * Helper function to filter predefined links, which should not be in the sitemap (external links, sitemap links itself) - * Returns false, if the link is not allowed - * - * @param string $link - * @param array $userParams - * - * @return bool - */ - private function filterLink($link, &$userParams) - { - if (empty($link)) { - return true; - } - - $parsedUserParams = (string) parse_url($link, PHP_URL_QUERY); - parse_str($parsedUserParams, $userParams); - - $blacklist = ['', 'sitemap', 'sitemapXml']; - - if (\in_array($userParams['sViewport'], $blacklist, true)) { - return false; - } - - return true; - } - /** * Helper function to read the supplier pages urls * diff --git a/engine/Shopware/Components/Snippet/Writer/DatabaseWriter.php b/engine/Shopware/Components/Snippet/Writer/DatabaseWriter.php index eb7c36db185..9f35194fd79 100644 --- a/engine/Shopware/Components/Snippet/Writer/DatabaseWriter.php +++ b/engine/Shopware/Components/Snippet/Writer/DatabaseWriter.php @@ -74,14 +74,14 @@ public function write($data, $namespace, $localeId, $shopId) if (!$this->update) { $this->insertBatch($data, $namespace, $localeId, $shopId); } else { - $rows = $this->db->fetchAll( + $rows = $this->db->fetchAllAssociative( 'SELECT * FROM s_core_snippets WHERE shopID = :shopId AND localeID = :localeId AND namespace = :namespace', [ 'shopId' => $shopId, 'localeId' => $localeId, 'namespace' => $namespace, ] - ); + ) ?: []; foreach ($data as $name => $value) { $row = null; diff --git a/engine/Shopware/Components/StateTranslatorService.php b/engine/Shopware/Components/StateTranslatorService.php index b5a45ae774e..7e27b8c241c 100644 --- a/engine/Shopware/Components/StateTranslatorService.php +++ b/engine/Shopware/Components/StateTranslatorService.php @@ -62,7 +62,7 @@ public function translateState($type, array $state) { $type = strtolower($type); - if (!$this->availableTypes[$type]) { + if (empty($this->availableTypes[$type])) { throw new RuntimeException(sprintf('Invalid type \'%s\' given.', $type)); } diff --git a/engine/Shopware/Components/TemplateMail.php b/engine/Shopware/Components/TemplateMail.php index 1a7d8f5cd1d..138dcd920de 100644 --- a/engine/Shopware/Components/TemplateMail.php +++ b/engine/Shopware/Components/TemplateMail.php @@ -23,6 +23,7 @@ */ use Shopware\Bundle\MailBundle\Service\LogEntryBuilder; +use Shopware\Bundle\MediaBundle\MediaServiceInterface; use Shopware\Components\Model\ModelManager; use Shopware\Models\Mail\Mail; use Shopware\Models\Shop\Shop; @@ -43,12 +44,12 @@ class Shopware_Components_TemplateMail protected $modelManager; /** - * @var \Shopware_Components_Translation + * @var Shopware_Components_Translation */ protected $translationReader; /** - * @var \Shopware_Components_StringCompiler + * @var Shopware_Components_StringCompiler */ protected $stringCompiler; @@ -78,7 +79,7 @@ class Shopware_Components_TemplateMail ]; /** - * @return \Shopware_Components_TemplateMail + * @return Shopware_Components_TemplateMail */ public function setModelManager(ModelManager $modelManager) { @@ -98,7 +99,7 @@ public function getModelManager() /** * @param Shop $shop * - * @return \Shopware_Components_TemplateMail + * @return Shopware_Components_TemplateMail */ public function setShop($shop) { @@ -118,21 +119,21 @@ public function getShop() /** * @throws \Exception * - * @return \Shopware_Components_Translation + * @return Shopware_Components_Translation */ public function getTranslationReader() { if ($this->translationReader === null) { - $this->translationReader = Shopware()->Container()->get(\Shopware_Components_Translation::class); + $this->translationReader = Shopware()->Container()->get(Shopware_Components_Translation::class); } return $this->translationReader; } /** - * @param \Shopware_Components_Translation $translationReader + * @param Shopware_Components_Translation $translationReader * - * @return \Shopware_Components_TemplateMail + * @return Shopware_Components_TemplateMail */ public function setTranslationReader($translationReader) { @@ -142,7 +143,7 @@ public function setTranslationReader($translationReader) } /** - * @return \Shopware_Components_TemplateMail + * @return Shopware_Components_TemplateMail */ public function setStringCompiler(Shopware_Components_StringCompiler $stringCompiler) { @@ -152,7 +153,7 @@ public function setStringCompiler(Shopware_Components_StringCompiler $stringComp } /** - * @return \Shopware_Components_StringCompiler + * @return Shopware_Components_StringCompiler */ public function getStringCompiler() { @@ -165,9 +166,9 @@ public function getStringCompiler() * @param Shop $shop * @param array $overrideConfig * - * @throws \Enlight_Exception + * @throws Enlight_Exception * - * @return \Enlight_Components_Mail + * @return Enlight_Components_Mail */ public function createMail($mailModel, $context = [], $shop = null, $overrideConfig = []) { @@ -177,12 +178,11 @@ public function createMail($mailModel, $context = [], $shop = null, $overrideCon if (!($mailModel instanceof Mail)) { $modelName = $mailModel; - /** @var Mail|null $mailModel */ $mailModel = $this->getModelManager()->getRepository(Mail::class)->findOneBy( ['name' => $modelName] ); - if (!$mailModel) { - throw new \Enlight_Exception(sprintf('Mail-Template with name "%s" could not be found.', $modelName)); + if (!$mailModel instanceof Mail) { + throw new Enlight_Exception(sprintf('Mail-Template with name "%s" could not be found.', $modelName)); } } @@ -258,9 +258,9 @@ public function createMail($mailModel, $context = [], $shop = null, $overrideCon * * @param array $overrideConfig * - * @throws \Enlight_Exception + * @throws Enlight_Exception * - * @return \Enlight_Components_Mail + * @return Enlight_Components_Mail */ public function loadValues(Enlight_Components_Mail $mail, Mail $mailModel, $overrideConfig = []) { @@ -296,14 +296,13 @@ public function loadValues(Enlight_Components_Mail $mail, Mail $mailModel, $over $mail->setBodyHtml($stringCompiler->compileString($mailModel->getContentHtml())); } - /** @var \Shopware\Models\Mail\Attachment $attachment */ foreach ($mailModel->getAttachments() as $attachment) { if ($attachment->getShopId() !== null && ($this->getShop() === null || $attachment->getShopId() !== $this->getShop()->getId())) { continue; } - $mediaService = Shopware()->Container()->get(\Shopware\Bundle\MediaBundle\MediaServiceInterface::class); + $mediaService = Shopware()->Container()->get(MediaServiceInterface::class); if (!$mediaService->has($attachment->getPath())) { Shopware()->Container()->get('corelogger')->error('Could not load file: ' . $attachment->getPath()); } else { diff --git a/engine/Shopware/Components/Translation.php b/engine/Shopware/Components/Translation.php index d4507bd69eb..e4e8f3a9fb8 100644 --- a/engine/Shopware/Components/Translation.php +++ b/engine/Shopware/Components/Translation.php @@ -24,7 +24,9 @@ use Doctrine\DBAL\Connection; use Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface; +use Shopware\Components\Model\ModelManager; use Shopware\Components\Translation\ObjectTranslator; +use Shopware\Models\Shop\Locale as ShopLocale; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -58,7 +60,12 @@ public function __construct(Connection $connection, ContainerInterface $containe // Determine how to query the current language if ($container->initialized('auth') && $container->get('auth')->hasIdentity()) { - $locale = $container->get('auth')->getIdentity()->locale; + $identity = $container->get('auth')->getIdentity(); + if (isset($identity->locale)) { + $locale = $identity->locale; + } elseif (isset($identity->localeID)) { + $locale = $container->get(ModelManager::class)->getRepository(ShopLocale::class)->find($identity->localeID); + } } elseif ($container->initialized('shop')) { $locale = $container->get('shop')->getLocale(); } @@ -450,7 +457,7 @@ public function translateOrders(array $orders, ?int $language = null, ?int $fall // Save the translated objects foreach ($orders as &$order) { - $orderDocuments = \is_array($order['documents']) ? $order['documents'] : []; + $orderDocuments = isset($order['documents']) && \is_array($order['documents']) ? $order['documents'] : []; for ($documentCounter = 0, $orderDocumentsCount = \count($orderDocuments); $documentCounter < $orderDocumentsCount; ++$documentCounter) { $type = $orderDocuments[$documentCounter]['type']; diff --git a/engine/Shopware/Components/Translation/ObjectTranslator.php b/engine/Shopware/Components/Translation/ObjectTranslator.php index b195d34a702..f2f2886094d 100644 --- a/engine/Shopware/Components/Translation/ObjectTranslator.php +++ b/engine/Shopware/Components/Translation/ObjectTranslator.php @@ -81,7 +81,7 @@ public function translateObjectProperty(array $object, string $translationIndex, $objectIndex = $objectIndex ?: $translationIndex; - $translation = $this->translations[$object['id']]; + $translation = $this->translations[$object['id']] ?? null; if ($translation && !empty($translation[$translationIndex])) { $object[$objectIndex] = $translation[$translationIndex]; } elseif ($fallback) { From 98b8c4871b31b7e60b952698fc921b4e2f76c8d5 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Tue, 27 Jun 2023 17:03:56 +0200 Subject: [PATCH 426/730] fix(SW-27005): Adjust test kernel so tests are considering PHP notices and warnings --- tests/Functional/TestKernel.php | 1 - tests/phpunit.xml.dist | 1 + tests/phpunit_unit.xml.dist | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Functional/TestKernel.php b/tests/Functional/TestKernel.php index b2075d2c980..647830dde05 100644 --- a/tests/Functional/TestKernel.php +++ b/tests/Functional/TestKernel.php @@ -46,7 +46,6 @@ public static function start(): TestKernel $kernel->boot(); $container = $kernel->getContainer(); - $container->get('plugins')->Core()->ErrorHandler()->registerErrorHandler(E_ALL | E_STRICT); $modelManager = $container->get(ModelManager::class); $generator = $modelManager->createModelGenerator(); diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml.dist index 629b3d7f0ef..ceb9d149f25 100644 --- a/tests/phpunit.xml.dist +++ b/tests/phpunit.xml.dist @@ -7,6 +7,7 @@ beStrictAboutOutputDuringTests="true" beStrictAboutResourceUsageDuringSmallTests="true" beStrictAboutTodoAnnotatedTests="true" + convertDeprecationsToExceptions="true" verbose="true"> diff --git a/tests/phpunit_unit.xml.dist b/tests/phpunit_unit.xml.dist index 75f7a219f3d..ee365243e27 100644 --- a/tests/phpunit_unit.xml.dist +++ b/tests/phpunit_unit.xml.dist @@ -8,6 +8,7 @@ beStrictAboutResourceUsageDuringSmallTests="true" beStrictAboutOutputDuringTests="true" beStrictAboutTodoAnnotatedTests="true" + convertDeprecationsToExceptions="true" verbose="true"> From f55ffe170d4456374166e7cbd8a8f159d45b5979 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 28 Jun 2023 09:55:27 +0200 Subject: [PATCH 427/730] fix(SW-27005): Fix notices and warnings in MenuSynchronizer --- .phpstan-baseline.neon | 50 ----------------- .../Components/Plugin/MenuSynchronizer.php | 56 +++++-------------- .../Plugin/MenuSynchronizerTest.php | 29 ++++++---- 3 files changed, 34 insertions(+), 101 deletions(-) diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index ba5bc667055..7ab1ac25ced 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -18380,41 +18380,21 @@ parameters: count: 1 path: engine/Shopware/Components/Plugin/FormSynchronizer.php - - - message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Shop\\\\Locale\\|null\\.$#" - count: 1 - path: engine/Shopware/Components/Plugin/MenuSynchronizer.php - - message: "#^Method Shopware\\\\Components\\\\Plugin\\\\MenuSynchronizer\\:\\:createMenuItem\\(\\) has parameter \\$menuItem with no value type specified in iterable type array\\.$#" count: 1 path: engine/Shopware/Components/Plugin/MenuSynchronizer.php - - - message: "#^Method Shopware\\\\Components\\\\Plugin\\\\MenuSynchronizer\\:\\:removeNotExistingEntries\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Components/Plugin/MenuSynchronizer.php - - message: "#^Method Shopware\\\\Components\\\\Plugin\\\\MenuSynchronizer\\:\\:removeNotExistingEntries\\(\\) has parameter \\$menuNames with no value type specified in iterable type array\\.$#" count: 1 path: engine/Shopware/Components/Plugin/MenuSynchronizer.php - - - message: "#^Method Shopware\\\\Components\\\\Plugin\\\\MenuSynchronizer\\:\\:saveMenuTranslation\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Components/Plugin/MenuSynchronizer.php - - message: "#^Method Shopware\\\\Components\\\\Plugin\\\\MenuSynchronizer\\:\\:saveMenuTranslation\\(\\) has parameter \\$labels with no value type specified in iterable type array\\.$#" count: 1 path: engine/Shopware/Components/Plugin/MenuSynchronizer.php - - - message: "#^Method Shopware\\\\Components\\\\Plugin\\\\MenuSynchronizer\\:\\:synchronize\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Components/Plugin/MenuSynchronizer.php - - message: "#^Method Shopware\\\\Components\\\\Plugin\\\\MenuSynchronizer\\:\\:synchronize\\(\\) has parameter \\$menu with no value type specified in iterable type array\\.$#" count: 1 @@ -37165,36 +37145,6 @@ parameters: count: 1 path: tests/Functional/Components/Plugin/LegacyConfigWriterTest.php - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\MenuSynchronizerTest\\:\\:executeTestAndCheckResult\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Components/Plugin/MenuSynchronizerTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\MenuSynchronizerTest\\:\\:executeTestAndCheckResult\\(\\) has parameter \\$expectedQueryParameters with no value type specified in iterable type array\\.$#" - count: 1 - path: tests/Functional/Components/Plugin/MenuSynchronizerTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\MenuSynchronizerTest\\:\\:executeTestAndCheckResult\\(\\) has parameter \\$menu with no value type specified in iterable type array\\.$#" - count: 1 - path: tests/Functional/Components/Plugin/MenuSynchronizerTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\MenuSynchronizerTest\\:\\:testIndexLowerCaseIsPartOfSnippet\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Components/Plugin/MenuSynchronizerTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\MenuSynchronizerTest\\:\\:testIndexNotPartOfSnippet\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Components/Plugin/MenuSynchronizerTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\MenuSynchronizerTest\\:\\:testOtherActionIsPartOfSnippet\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Components/Plugin/MenuSynchronizerTest.php - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\PluginMigrationTest\\:\\:assertTableColumnExists\\(\\) has no return type specified\\.$#" count: 1 diff --git a/engine/Shopware/Components/Plugin/MenuSynchronizer.php b/engine/Shopware/Components/Plugin/MenuSynchronizer.php index 55a7026a5bb..3adfc93503b 100644 --- a/engine/Shopware/Components/Plugin/MenuSynchronizer.php +++ b/engine/Shopware/Components/Plugin/MenuSynchronizer.php @@ -25,26 +25,20 @@ namespace Shopware\Components\Plugin; use Doctrine\DBAL\Connection; -use Exception; use InvalidArgumentException; use RuntimeException; use Shopware\Components\Model\ModelManager; use Shopware\Components\Snippet\Writer\DatabaseWriter; use Shopware\Models\Menu\Menu; +use Shopware\Models\Menu\Repository; use Shopware\Models\Plugin\Plugin; use Shopware\Models\Shop\Locale; class MenuSynchronizer { - /** - * @var ModelManager - */ - private $em; + private ModelManager $em; - /** - * @var \Shopware\Models\Menu\Repository - */ - private $menuRepository; + private Repository $menuRepository; public function __construct(ModelManager $em) { @@ -53,7 +47,7 @@ public function __construct(ModelManager $em) } /** - * @throws InvalidArgumentException + * @return void */ public function synchronize(Plugin $plugin, array $menu) { @@ -74,7 +68,6 @@ public function synchronize(Plugin $plugin, array $menu) if (!isset($menuItem['parent'])) { throw new InvalidArgumentException('Root Menu Item must provide parent element'); } - /** @var Menu|null $parent */ $parent = $this->menuRepository->findOneBy($menuItem['parent']); if (!$parent) { throw new InvalidArgumentException(sprintf('Unable to find parent for query %s', print_r($menuItem['parent'], true))); @@ -88,12 +81,7 @@ public function synchronize(Plugin $plugin, array $menu) $this->removeNotExistingEntries($plugin->getId(), $menuNames); } - /** - * @param string $name - * - * @throws Exception - */ - private function saveMenuTranslation(array $labels, $name) + private function saveMenuTranslation(array $labels, string $name): void { $databaseWriter = new DatabaseWriter($this->em->getConnection()); foreach ($labels as $locale => $text) { @@ -106,22 +94,19 @@ private function saveMenuTranslation(array $labels, $name) } $locale = Shopware()->Models()->getRepository(Locale::class)->findOneBy(['locale' => $locale]); + if (!$locale instanceof Locale) { + continue; + } $databaseWriter->write([$name => $text], 'backend/index/view/main', $locale->getId(), 1); } } - /** - * @throws RuntimeException - * - * @return Menu - */ - private function createMenuItem(Plugin $plugin, ?Menu $parent = null, array $menuItem) + private function createMenuItem(Plugin $plugin, ?Menu $parent, array $menuItem): Menu { $item = null; if ($plugin->getId()) { - /** @var Menu $item */ $item = $this->menuRepository->findOneBy([ 'pluginId' => $plugin->getId(), 'label' => $menuItem['name'], @@ -135,26 +120,18 @@ private function createMenuItem(Plugin $plugin, ?Menu $parent = null, array $men $item->setParent($parent); $item->setPlugin($plugin); - if (!isset($menuItem['label']['en']) || empty($menuItem['label']['en'])) { + if (empty($menuItem['label']['en'])) { throw new RuntimeException('Label with lang en required'); } $item->setLabel($menuItem['name']); - $item->setController( - isset($menuItem['controller']) ? $menuItem['controller'] : null - ); + $item->setController($menuItem['controller'] ?? null); - $item->setAction( - isset($menuItem['action']) ? $menuItem['action'] : null - ); + $item->setAction($menuItem['action'] ?? null); - $item->setOnclick( - isset($menuItem['onclick']) ? $menuItem['onclick'] : null - ); + $item->setOnclick($menuItem['onclick'] ?? null); - $item->setClass( - isset($menuItem['class']) ? $menuItem['class'] : null - ); + $item->setClass($menuItem['class'] ?? null); if (isset($menuItem['active'])) { $item->setActive((bool) $menuItem['active']); @@ -188,10 +165,7 @@ private function createMenuItem(Plugin $plugin, ?Menu $parent = null, array $men return $item; } - /** - * @param int $pluginId - */ - private function removeNotExistingEntries($pluginId, array $menuNames) + private function removeNotExistingEntries(int $pluginId, array $menuNames): void { $builder = $this->em->getConnection()->createQueryBuilder(); $builder->delete('s_core_menu'); diff --git a/tests/Functional/Components/Plugin/MenuSynchronizerTest.php b/tests/Functional/Components/Plugin/MenuSynchronizerTest.php index 52cac7b5912..fe6fff4606e 100644 --- a/tests/Functional/Components/Plugin/MenuSynchronizerTest.php +++ b/tests/Functional/Components/Plugin/MenuSynchronizerTest.php @@ -1,4 +1,6 @@ executeTestAndCheckResult([ [ @@ -55,7 +58,7 @@ public function testIndexNotPartOfSnippet() ]); } - public function testIndexLowerCaseIsPartOfSnippet() + public function testIndexLowerCaseIsPartOfSnippet(): void { $this->executeTestAndCheckResult( [ @@ -80,7 +83,7 @@ public function testIndexLowerCaseIsPartOfSnippet() ); } - public function testOtherActionIsPartOfSnippet() + public function testOtherActionIsPartOfSnippet(): void { $this->executeTestAndCheckResult( [ @@ -105,22 +108,28 @@ public function testOtherActionIsPartOfSnippet() ); } - protected function executeTestAndCheckResult(array $menu, array $expectedQueryParameters) + /** + * @param array> $menu + * @param array $expectedQueryParameters + */ + protected function executeTestAndCheckResult(array $menu, array $expectedQueryParameters): void { $connection = $this->createMock(Connection::class); - $connection->method('createQueryBuilder') - ->willReturn($this->createMock(QueryBuilder::class)); + $connection->method('createQueryBuilder')->willReturn($this->createMock(QueryBuilder::class)); $connection->expects(static::once()) ->method('insert') - ->with('s_core_snippets', static::callback(function ($value) use ($expectedQueryParameters) { + ->with('s_core_snippets', static::callback(static function ($value) use ($expectedQueryParameters) { return !array_diff($expectedQueryParameters, $value); })); $modelManagerMock = $this->createMock(ModelManager::class); - $modelManagerMock->method('getConnection') - ->willReturn($connection); + $modelManagerMock->method('getConnection')->willReturn($connection); + $modelManagerMock->method('getRepository')->willReturn($this->createMock(Repository::class)); + + $plugin = new Plugin(); + $plugin->setId(PHP_INT_MAX); $menuSynchronizer = new MenuSynchronizer($modelManagerMock); - $menuSynchronizer->synchronize(new Plugin(), $menu); + $menuSynchronizer->synchronize($plugin, $menu); } } From fa0e8c8d3e9c1117581e0bc102e3e02059aaa606 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 28 Jun 2023 13:32:47 +0200 Subject: [PATCH 428/730] fix(SW-27005): Fix notices and warnings in backend template files --- themes/Backend/ExtJs/backend/search/articles.tpl | 2 +- themes/Backend/ExtJs/backend/search/customers.tpl | 2 +- themes/Backend/ExtJs/backend/search/orders.tpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/themes/Backend/ExtJs/backend/search/articles.tpl b/themes/Backend/ExtJs/backend/search/articles.tpl index 6ca5bc1c64e..dfe360069cf 100644 --- a/themes/Backend/ExtJs/backend/search/articles.tpl +++ b/themes/Backend/ExtJs/backend/search/articles.tpl @@ -14,7 +14,7 @@ {block name="backend/search/index/result_content"}
        {foreach $searchResult.articles as $item} - + {$item.name|truncate:60} {if $item.description} diff --git a/themes/Backend/ExtJs/backend/search/customers.tpl b/themes/Backend/ExtJs/backend/search/customers.tpl index 3224a83b291..1a3a676ac5d 100644 --- a/themes/Backend/ExtJs/backend/search/customers.tpl +++ b/themes/Backend/ExtJs/backend/search/customers.tpl @@ -14,7 +14,7 @@ {block name="backend/search/index/result_content"}
        {foreach $searchResult.customers as $item} - + {if $item.company}{$item.company} {/if}{$item.firstname} {$item.lastname} diff --git a/themes/Backend/ExtJs/backend/search/orders.tpl b/themes/Backend/ExtJs/backend/search/orders.tpl index bbfea5680f6..ed2cda5eb5a 100644 --- a/themes/Backend/ExtJs/backend/search/orders.tpl +++ b/themes/Backend/ExtJs/backend/search/orders.tpl @@ -14,7 +14,7 @@ {block name="backend/search/index/result_content"}
        {foreach $searchResult.orders as $item} - + {$item.number}: {$item.orderStateName|truncate:30} {if $item.company}{$item.company} {/if}{$item.firstname} {$item.lastname} {$item.street} {$item.zipcode} {$item.city} {$item.shopName} / {$item.dispatchName} / {$item.paymentName} From 2c4245d19fe6c4725f44b0cff74a8cfc9de16201 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 28 Jun 2023 13:41:41 +0200 Subject: [PATCH 429/730] fix(SW-27005): Add hint to UPGRADE file --- UPGRADE-5.7.md | 1 + 1 file changed, 1 insertion(+) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 41a2c887782..0dc0df91f6b 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -9,6 +9,7 @@ This changelog references changes done in Shopware 5.7 patch versions. ### Changes * Changed behaviour of the translation transfer while setting a product variant as the main variant +* Changed the test kernel, so PHPUnit tests do no longer ignore PHP warnings and notices and are failing instead ## 5.7.18 From 07570a1cdf1a846d5edd58df3553c17db3d35501 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 28 Jun 2023 15:18:48 +0200 Subject: [PATCH 430/730] fix(SW-27005): Unify error log and error screenshot file names for Mink --- .../Tests/General/Helpers/FeatureContext.php | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/tests/Mink/Tests/General/Helpers/FeatureContext.php b/tests/Mink/Tests/General/Helpers/FeatureContext.php index fb60b4f794e..af35579e564 100644 --- a/tests/Mink/Tests/General/Helpers/FeatureContext.php +++ b/tests/Mink/Tests/General/Helpers/FeatureContext.php @@ -172,9 +172,7 @@ public function takeScreenshotAfterFailedStep(AfterStepScope $scope): void */ public function saveScreenshot(?string $filename = null, ?string $filepath = null): void { - // Under Cygwin, uniqid with more_entropy must be set to true. - // No effect in other environments. - $generatedFilename = sprintf('%s_%s_%s.%s', $this->getMinkParameter('browser_name'), (new DateTime())->format('Y-m-d--H-i-s'), uniqid('', true), 'png'); + $generatedFilename = sprintf('%s_%s.%s', $this->getMinkParameter('browser_name'), $this->getDateTimeWithRandomString(), 'png'); $filename = $filename ?: $generatedFilename; $filepath = $filepath ?: (ini_get('upload_tmp_dir') ?: sys_get_temp_dir()); file_put_contents($filepath . '/' . $filename, $this->getSession()->getScreenshot()); @@ -264,8 +262,7 @@ public function registerErrorHandler(): void ]; $filepath = $this->getService(Kernel::class)->getRootDir() . '/build/logs/mink'; - // No effect in other environments. - $filename = sprintf('errors_%s_%s.%s', date('c'), uniqid('', true), 'log'); + $filename = sprintf('errors_%s.%s', $this->getDateTimeWithRandomString(), 'log'); $filepath .= '/' . $filename; file_put_contents($filepath, $errorNameMap[$errno] . ': ' . $errstr, FILE_APPEND); @@ -382,9 +379,7 @@ private function saveLog(string $content): void { $logDir = $this->getService(Kernel::class)->getRootDir() . '/build/logs/mink'; - $currentDateAsString = date('YmdHis'); - - $path = sprintf('%s/behat-%s.%s', $logDir, $currentDateAsString, 'log'); + $path = sprintf('%s/behat-%s.%s', $logDir, $this->getDateTime(), 'log'); if (!file_put_contents($path, $content)) { Helper::throwException(sprintf('Failed while trying to write log in "%s".', $path)); } @@ -436,4 +431,14 @@ private static function clearTemplateCache(): void $cacheManager->clearTemplateCache(); $cacheManager->clearThemeCache(); } + + private function getDateTimeWithRandomString(): string + { + return $this->getDateTime() . '_' . uniqid('', true); + } + + private function getDateTime(): string + { + return (new DateTime())->format('Y-m-d--H-i-s'); + } } From 7a512fc31665d2838d6a86145296bcec56f6ec47 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 28 Jun 2023 15:38:43 +0200 Subject: [PATCH 431/730] chore(SW-27143): Update PHPStan and its plugins --- composer.json | 4 ++-- composer.lock | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index 686973e7a09..258576b42c6 100644 --- a/composer.json +++ b/composer.json @@ -113,13 +113,13 @@ "php-parallel-lint/php-var-dump-check": "^0.5", "phpspec/prophecy-phpunit": "^2.0", "phpstan/extension-installer": "1.3.1", - "phpstan/phpstan": "1.10.20", + "phpstan/phpstan": "1.10.21", "phpstan/phpstan-doctrine": "1.3.40", "phpstan/phpstan-phpunit": "1.3.13", "phpstan/phpstan-symfony": "1.3.2", "phpunit/phpunit": "^9.6", "sensiolabs/behat-page-object-extension": "2.3.7", - "staabm/phpstan-dba": "0.2.72", + "staabm/phpstan-dba": "0.2.74", "symfony/browser-kit": "~4.4.27", "symfony/dom-crawler": "~4.4.30" }, diff --git a/composer.lock b/composer.lock index 103d3ef2758..d2f696c7c99 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": "ca2c5dcfece9913dd4891fff9742ab1c", + "content-hash": "86b231ccf8b61370d74d359efb74ab4a", "packages": [ { "name": "aws/aws-crt-php", @@ -8624,16 +8624,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.20", + "version": "1.10.21", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "c4c8adb56313fbd59ff5a5f4a496bbed1a6b8803" + "reference": "b2a30186be2e4d97dce754ae4e65eb0ec2f04eb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c4c8adb56313fbd59ff5a5f4a496bbed1a6b8803", - "reference": "c4c8adb56313fbd59ff5a5f4a496bbed1a6b8803", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b2a30186be2e4d97dce754ae4e65eb0ec2f04eb5", + "reference": "b2a30186be2e4d97dce754ae4e65eb0ec2f04eb5", "shasum": "" }, "require": { @@ -8682,7 +8682,7 @@ "type": "tidelift" } ], - "time": "2023-06-20T12:07:40+00:00" + "time": "2023-06-21T20:07:58+00:00" }, { "name": "phpstan/phpstan-doctrine", @@ -10340,16 +10340,16 @@ }, { "name": "staabm/phpstan-dba", - "version": "0.2.72", + "version": "0.2.74", "source": { "type": "git", "url": "https://github.com/staabm/phpstan-dba.git", - "reference": "e01951cc63a2fe32301aa0f11ce74872e3918108" + "reference": "1bd0de3d457e3a49218e9eb3182ceefcd6b1b4b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/staabm/phpstan-dba/zipball/e01951cc63a2fe32301aa0f11ce74872e3918108", - "reference": "e01951cc63a2fe32301aa0f11ce74872e3918108", + "url": "https://api.github.com/repos/staabm/phpstan-dba/zipball/1bd0de3d457e3a49218e9eb3182ceefcd6b1b4b9", + "reference": "1bd0de3d457e3a49218e9eb3182ceefcd6b1b4b9", "shasum": "" }, "require": { @@ -10373,7 +10373,7 @@ "phpstan/phpstan-strict-rules": "^1.1", "phpunit/phpunit": "^8.5|^9.5", "symplify/easy-coding-standard": "^11.3", - "tomasvotruba/unused-public": "^0.1.9", + "tomasvotruba/unused-public": "^0.1.10", "vlucas/phpdotenv": "^5.4" }, "type": "phpstan-extension", @@ -10403,9 +10403,9 @@ ], "support": { "issues": "https://github.com/staabm/phpstan-dba/issues", - "source": "https://github.com/staabm/phpstan-dba/tree/0.2.72" + "source": "https://github.com/staabm/phpstan-dba/tree/0.2.74" }, - "time": "2023-04-13T08:57:55+00:00" + "time": "2023-06-27T13:58:51+00:00" }, { "name": "symfony/browser-kit", From 00805c716a7fe528d53eb1be1a04162e398d5f89 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 28 Jun 2023 15:41:52 +0200 Subject: [PATCH 432/730] chore(SW-27143): Update google/cloud-storage to 1.32.0 --- UPGRADE-5.7.md | 1 + composer.json | 2 +- composer.lock | 44 ++++++++++++++++++++++---------------------- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 0dc0df91f6b..8c60161125d 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -10,6 +10,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Changed behaviour of the translation transfer while setting a product variant as the main variant * Changed the test kernel, so PHPUnit tests do no longer ignore PHP warnings and notices and are failing instead +* Updated `google/cloud-storage` to version 1.32.0 ## 5.7.18 diff --git a/composer.json b/composer.json index 258576b42c6..4fab1905fee 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,7 @@ "elasticsearch/elasticsearch": "^7", "fig/link-util": "1.1.2", "friendsofphp/proxy-manager-lts": "1.0.16", - "google/cloud-storage": "1.31.2", + "google/cloud-storage": "1.32.0", "guzzlehttp/guzzle": "~7.7.0", "guzzlehttp/psr7": "2.5.0", "laminas/laminas-code": "4.7.1 || 4.11.0", diff --git a/composer.lock b/composer.lock index d2f696c7c99..8faede48405 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": "86b231ccf8b61370d74d359efb74ab4a", + "content-hash": "d355db272af0fce0f180eb43f712b364", "packages": [ { "name": "aws/aws-crt-php", @@ -1714,16 +1714,16 @@ }, { "name": "firebase/php-jwt", - "version": "v6.5.0", + "version": "v6.8.0", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "e94e7353302b0c11ec3cfff7180cd0b1743975d2" + "reference": "48b0210c51718d682e53210c24d25c5a10a2299b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/e94e7353302b0c11ec3cfff7180cd0b1743975d2", - "reference": "e94e7353302b0c11ec3cfff7180cd0b1743975d2", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/48b0210c51718d682e53210c24d25c5a10a2299b", + "reference": "48b0210c51718d682e53210c24d25c5a10a2299b", "shasum": "" }, "require": { @@ -1771,9 +1771,9 @@ ], "support": { "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v6.5.0" + "source": "https://github.com/firebase/php-jwt/tree/v6.8.0" }, - "time": "2023-05-12T15:47:07+00:00" + "time": "2023-06-20T16:45:35+00:00" }, { "name": "friendsofphp/proxy-manager-lts", @@ -1917,26 +1917,26 @@ }, { "name": "google/cloud-core", - "version": "v1.51.2", + "version": "v1.52.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-cloud-php-core.git", - "reference": "85dc48d62143f4bbfaa34c24da95003371de7b79" + "reference": "bd87e418923e0d836c7e754d82e66bc0b79964ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/85dc48d62143f4bbfaa34c24da95003371de7b79", - "reference": "85dc48d62143f4bbfaa34c24da95003371de7b79", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/bd87e418923e0d836c7e754d82e66bc0b79964ab", + "reference": "bd87e418923e0d836c7e754d82e66bc0b79964ab", "shasum": "" }, "require": { "google/auth": "^1.18", "guzzlehttp/guzzle": "^5.3|^6.5.7|^7.4.4", - "guzzlehttp/promises": "^1.3", + "guzzlehttp/promises": "^1.4||^2.0", "guzzlehttp/psr7": "^1.7|^2.0", "monolog/monolog": "^1.1|^2.0|^3.0", "php": ">=7.4", - "psr/http-message": "^1.0", + "psr/http-message": "^1.0|^2.0", "rize/uri-template": "~0.3" }, "require-dev": { @@ -1976,26 +1976,26 @@ ], "description": "Google Cloud PHP shared dependency, providing functionality useful to all components.", "support": { - "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.51.2" + "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.0" }, - "time": "2023-05-05T23:01:42+00:00" + "time": "2023-06-21T21:05:25+00:00" }, { "name": "google/cloud-storage", - "version": "v1.31.2", + "version": "v1.32.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-cloud-php-storage.git", - "reference": "7fe96d56856cda550b21779bb95a066b264852da" + "reference": "2dd5cee0da51e94bcf39c0af9cefd0ec6b931685" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/7fe96d56856cda550b21779bb95a066b264852da", - "reference": "7fe96d56856cda550b21779bb95a066b264852da", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/2dd5cee0da51e94bcf39c0af9cefd0ec6b931685", + "reference": "2dd5cee0da51e94bcf39c0af9cefd0ec6b931685", "shasum": "" }, "require": { - "google/cloud-core": "^1.51.1", + "google/cloud-core": "^1.51.3", "google/crc32": "^0.2.0", "php": ">=7.4", "ramsey/uuid": "^4.2.3" @@ -2033,9 +2033,9 @@ ], "description": "Cloud Storage Client for PHP", "support": { - "source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.31.2" + "source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.32.0" }, - "time": "2023-05-05T23:01:42+00:00" + "time": "2023-06-21T21:05:25+00:00" }, { "name": "google/crc32", From 9755d1b566f9a7ab1a5a216876c440d8ca401e2d Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 28 Jun 2023 15:46:28 +0200 Subject: [PATCH 433/730] chore(SW-27143): Update doctrine/orm to 2.15.3 --- UPGRADE-5.7.md | 1 + composer.json | 2 +- composer.lock | 18 +++++++++--------- .../Persisters/Entity/BasicEntityPersister.php | 10 +--------- 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 8c60161125d..a99a497508f 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -11,6 +11,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Changed behaviour of the translation transfer while setting a product variant as the main variant * Changed the test kernel, so PHPUnit tests do no longer ignore PHP warnings and notices and are failing instead * Updated `google/cloud-storage` to version 1.32.0 +* Updated `doctrine/orm` to version 2.15.3 ## 5.7.18 diff --git a/composer.json b/composer.json index 4fab1905fee..7a7d20f2ebc 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,7 @@ "doctrine/dbal": "2.13.9", "doctrine/event-manager": "1.2.0", "doctrine/inflector": "2.0.4", - "doctrine/orm": "2.15.2", + "doctrine/orm": "2.15.3", "doctrine/persistence": "3.2.0", "elasticsearch/elasticsearch": "^7", "fig/link-util": "1.1.2", diff --git a/composer.lock b/composer.lock index 8faede48405..acaa2d4eee7 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": "d355db272af0fce0f180eb43f712b364", + "content-hash": "5abe9e398f9a08c63dcdf3f615a9d211", "packages": [ { "name": "aws/aws-crt-php", @@ -1281,16 +1281,16 @@ }, { "name": "doctrine/orm", - "version": "2.15.2", + "version": "2.15.3", "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "bf449bef7ddc47e62c22f9a06dacc1736abe1c0b" + "reference": "4c3bd208018c26498e5f682aaad45fa00ea307d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/bf449bef7ddc47e62c22f9a06dacc1736abe1c0b", - "reference": "bf449bef7ddc47e62c22f9a06dacc1736abe1c0b", + "url": "https://api.github.com/repos/doctrine/orm/zipball/4c3bd208018c26498e5f682aaad45fa00ea307d5", + "reference": "4c3bd208018c26498e5f682aaad45fa00ea307d5", "shasum": "" }, "require": { @@ -1319,14 +1319,14 @@ "doctrine/annotations": "^1.13 || ^2", "doctrine/coding-standard": "^9.0.2 || ^12.0", "phpbench/phpbench": "^0.16.10 || ^1.0", - "phpstan/phpstan": "~1.4.10 || 1.10.14", + "phpstan/phpstan": "~1.4.10 || 1.10.18", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6", "psr/log": "^1 || ^2 || ^3", "squizlabs/php_codesniffer": "3.7.2", "symfony/cache": "^4.4 || ^5.4 || ^6.0", "symfony/var-exporter": "^4.4 || ^5.4 || ^6.2", "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0", - "vimeo/psalm": "4.30.0 || 5.11.0" + "vimeo/psalm": "4.30.0 || 5.12.0" }, "suggest": { "ext-dom": "Provides support for XSD validation for XML mapping files", @@ -1376,9 +1376,9 @@ ], "support": { "issues": "https://github.com/doctrine/orm/issues", - "source": "https://github.com/doctrine/orm/tree/2.15.2" + "source": "https://github.com/doctrine/orm/tree/2.15.3" }, - "time": "2023-06-01T09:35:50+00:00" + "time": "2023-06-22T12:36:06+00:00" }, { "name": "doctrine/persistence", diff --git a/engine/Library/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php b/engine/Library/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php index 1c2468aee86..e2b6484064f 100644 --- a/engine/Library/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php +++ b/engine/Library/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php @@ -273,10 +273,6 @@ public function executeInserts() $paramIndex = 1; foreach ($insertData[$tableName] as $column => $value) { - if ($value instanceof BackedEnum) { - $value = $value->value; - } - $stmt->bindValue($paramIndex++, $value, $this->columnTypes[$column]); } } @@ -542,7 +538,7 @@ final protected function updateTable( protected function deleteJoinTableRecords(array $identifier, array $types): void { foreach ($this->class->associationMappings as $mapping) { - if ($mapping['type'] !== ClassMetadata::MANY_TO_MANY) { + if ($mapping['type'] !== ClassMetadata::MANY_TO_MANY || isset($mapping['isOnDeleteCascade'])) { continue; } @@ -578,10 +574,6 @@ protected function deleteJoinTableRecords(array $identifier, array $types): void $otherKeys[] = $this->quoteStrategy->getJoinColumnName($joinColumn, $class, $this->platform); } - if (isset($mapping['isOnDeleteCascade'])) { - continue; - } - $joinTableName = $this->quoteStrategy->getJoinTableName($association, $this->class, $this->platform); $this->conn->delete($joinTableName, array_combine($keys, $identifier), $types); From e428feecd23814283d3d9c94ca981df388afa6aa Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 28 Jun 2023 15:49:07 +0200 Subject: [PATCH 434/730] chore(SW-27143): Update setasign/fpdf to 1.8.6 --- UPGRADE-5.7.md | 1 + composer.json | 2 +- composer.lock | 14 +++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index a99a497508f..dc7d5887bbb 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -12,6 +12,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Changed the test kernel, so PHPUnit tests do no longer ignore PHP warnings and notices and are failing instead * Updated `google/cloud-storage` to version 1.32.0 * Updated `doctrine/orm` to version 2.15.3 +* Updated `setasign/fpdf` to version 1.8.6 ## 5.7.18 diff --git a/composer.json b/composer.json index 7a7d20f2ebc..d0b31ea3b5d 100644 --- a/composer.json +++ b/composer.json @@ -67,7 +67,7 @@ "psr/link": "1.0.0", "psr/log": "1.1.4", "ramsey/uuid": "4.2.3", - "setasign/fpdf": "1.8.5", + "setasign/fpdf": "1.8.6", "setasign/fpdi": "2.3.7", "stecman/symfony-console-completion": "0.11.0", "superbalist/flysystem-google-storage": "7.2.2", diff --git a/composer.lock b/composer.lock index acaa2d4eee7..c258904e65a 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": "5abe9e398f9a08c63dcdf3f615a9d211", + "content-hash": "e0774859b68a3d0f2aa1d591e5e27341", "packages": [ { "name": "aws/aws-crt-php", @@ -3868,16 +3868,16 @@ }, { "name": "setasign/fpdf", - "version": "1.8.5", + "version": "1.8.6", "source": { "type": "git", "url": "https://github.com/Setasign/FPDF.git", - "reference": "f4104a04c9a3f95c4c26a0a0531abebcc980987a" + "reference": "0838e0ee4925716fcbbc50ad9e1799b5edfae0a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Setasign/FPDF/zipball/f4104a04c9a3f95c4c26a0a0531abebcc980987a", - "reference": "f4104a04c9a3f95c4c26a0a0531abebcc980987a", + "url": "https://api.github.com/repos/Setasign/FPDF/zipball/0838e0ee4925716fcbbc50ad9e1799b5edfae0a0", + "reference": "0838e0ee4925716fcbbc50ad9e1799b5edfae0a0", "shasum": "" }, "require": { @@ -3908,9 +3908,9 @@ "pdf" ], "support": { - "source": "https://github.com/Setasign/FPDF/tree/1.8.5" + "source": "https://github.com/Setasign/FPDF/tree/1.8.6" }, - "time": "2022-11-18T07:02:00+00:00" + "time": "2023-06-26T14:44:25+00:00" }, { "name": "setasign/fpdi", From cbfd0fd96c3832bcfe35dff4dd5938b02a2ec2ce Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 28 Jun 2023 16:03:26 +0200 Subject: [PATCH 435/730] chore(SW-27143): Update php-cs-fixer to version 3.20.0 --- .php-cs-fixer.php | 1 - vendor-bin/cs-fixer/composer.json | 4 ++-- vendor-bin/cs-fixer/composer.lock | 40 +++++++++++++++---------------- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index fcea0632c5f..0321bb7f948 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -11,7 +11,6 @@ use PhpCsFixerCustomFixers\Fixer\PhpUnitDedicatedAssertFixer; use PhpCsFixerCustomFixers\Fixer\SingleSpaceAfterStatementFixer; use PhpCsFixerCustomFixers\Fixer\SingleSpaceBeforeStatementFixer; -use PhpCsFixerCustomFixers\Fixer\NoSuperfluousConcatenationFixer; use PhpCsFixerCustomFixers\Fixers; $finder = PhpCsFixer\Finder::create() diff --git a/vendor-bin/cs-fixer/composer.json b/vendor-bin/cs-fixer/composer.json index 6263a9019e8..e137cea6219 100644 --- a/vendor-bin/cs-fixer/composer.json +++ b/vendor-bin/cs-fixer/composer.json @@ -1,7 +1,7 @@ { "require-dev": { - "friendsofphp/php-cs-fixer": "3.18.0", - "kubawerlos/php-cs-fixer-custom-fixers": "3.14.0" + "friendsofphp/php-cs-fixer": "3.20.0", + "kubawerlos/php-cs-fixer-custom-fixers": "3.15.0" }, "sort-packages": true } diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock index a0aa17cb0f4..b06b6945df9 100644 --- a/vendor-bin/cs-fixer/composer.lock +++ b/vendor-bin/cs-fixer/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": "c000a4137e7ddf893a3289b412e9b097", + "content-hash": "3f50182aa0db3152b162a0ea183c4041", "packages": [], "packages-dev": [ { @@ -428,16 +428,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.18.0", + "version": "v3.20.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "b123395c9fa3a70801f816f13606c0f3a7ada8df" + "reference": "0e8249e0b15e2bc022fbbd1090ce29d071481e69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/b123395c9fa3a70801f816f13606c0f3a7ada8df", - "reference": "b123395c9fa3a70801f816f13606c0f3a7ada8df", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/0e8249e0b15e2bc022fbbd1090ce29d071481e69", + "reference": "0e8249e0b15e2bc022fbbd1090ce29d071481e69", "shasum": "" }, "require": { @@ -512,7 +512,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.18.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.20.0" }, "funding": [ { @@ -520,26 +520,26 @@ "type": "github" } ], - "time": "2023-06-18T22:25:45+00:00" + "time": "2023-06-27T20:22:39+00:00" }, { "name": "kubawerlos/php-cs-fixer-custom-fixers", - "version": "v3.14.0", + "version": "v3.15.0", "source": { "type": "git", "url": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers.git", - "reference": "0414fbeada4360510df515b613ccc4055921a3c7" + "reference": "82c08eed3cc42dab45241cfd70e99b94cd54ca7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kubawerlos/php-cs-fixer-custom-fixers/zipball/0414fbeada4360510df515b613ccc4055921a3c7", - "reference": "0414fbeada4360510df515b613ccc4055921a3c7", + "url": "https://api.github.com/repos/kubawerlos/php-cs-fixer-custom-fixers/zipball/82c08eed3cc42dab45241cfd70e99b94cd54ca7e", + "reference": "82c08eed3cc42dab45241cfd70e99b94cd54ca7e", "shasum": "" }, "require": { "ext-filter": "*", "ext-tokenizer": "*", - "friendsofphp/php-cs-fixer": "^3.16.0", + "friendsofphp/php-cs-fixer": "^3.19", "php": "^7.4 || ^8.0" }, "require-dev": { @@ -564,9 +564,9 @@ "description": "A set of custom fixers for PHP CS Fixer", "support": { "issues": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/issues", - "source": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.14.0" + "source": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.15.0" }, - "time": "2023-04-03T20:47:19+00:00" + "time": "2023-06-26T21:00:04+00:00" }, { "name": "psr/cache", @@ -1163,16 +1163,16 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.23", + "version": "v5.4.25", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "b2f79d86cd9e7de0fff6d03baa80eaed7a5f38b5" + "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/b2f79d86cd9e7de0fff6d03baa80eaed7a5f38b5", - "reference": "b2f79d86cd9e7de0fff6d03baa80eaed7a5f38b5", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", + "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", "shasum": "" }, "require": { @@ -1207,7 +1207,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.23" + "source": "https://github.com/symfony/filesystem/tree/v5.4.25" }, "funding": [ { @@ -1223,7 +1223,7 @@ "type": "tidelift" } ], - "time": "2023-03-02T11:38:35+00:00" + "time": "2023-05-31T13:04:02+00:00" }, { "name": "symfony/finder", From be7f117c614dfa99dc36c8c40524a2314e31be30 Mon Sep 17 00:00:00 2001 From: Dennis Garding Date: Tue, 27 Jun 2023 15:09:58 +0200 Subject: [PATCH 436/730] ci(SW-27140): Tests are executed in dependence on each other --- .github/workflows/check-code.yml | 83 ---------- .github/workflows/check-js-code.yml | 45 ++++++ .github/workflows/check-php-code.yml | 46 ++++++ .github/workflows/end-to-end.yml | 102 ++++++------ .github/workflows/phpunit.yml | 234 +++++++++++++-------------- .github/workflows/tests-launcher.yml | 34 ++++ 6 files changed, 293 insertions(+), 251 deletions(-) delete mode 100644 .github/workflows/check-code.yml create mode 100644 .github/workflows/check-js-code.yml create mode 100644 .github/workflows/check-php-code.yml create mode 100644 .github/workflows/tests-launcher.yml diff --git a/.github/workflows/check-code.yml b/.github/workflows/check-code.yml deleted file mode 100644 index a69148fa69e..00000000000 --- a/.github/workflows/check-code.yml +++ /dev/null @@ -1,83 +0,0 @@ -name: Check Code - -on: - push: - -permissions: - contents: read - -jobs: - php: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v20 - with: - github_access_token: ${{ secrets.GITHUB_TOKEN }} - - - uses: cachix/cachix-action@v12 - with: - name: devenv - - - name: Use Shopware Cache - uses: cachix/cachix-action@v12 - with: - name: shopware - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - - - name: Install devenv.sh - run: nix-env -if https://github.com/cachix/devenv/tarball/main - shell: sh - - - name: Get Composer Cache Directory - id: composer-cache - run: | - echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - - uses: actions/cache@v3 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} - restore-keys: | - ${{ runner.os }}-composer- - - - run: devenv up & - - run: devenv shell init-shopware - - run: devenv shell check-code - - js: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v20 - with: - github_access_token: ${{ secrets.GITHUB_TOKEN }} - - - uses: cachix/cachix-action@v12 - with: - name: devenv - - - name: Use Shopware Cache - uses: cachix/cachix-action@v12 - with: - name: shopware - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - - name: Install devenv.sh - run: nix profile install github:cachix/devenv/v0.5 - shell: sh - - - name: Get Composer Cache Directory - id: composer-cache - run: | - echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - - uses: actions/cache@v3 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} - restore-keys: | - ${{ runner.os }}-composer- - - - run: devenv up & - - run: devenv shell check-js-code - - run: devenv shell test-jest diff --git a/.github/workflows/check-js-code.yml b/.github/workflows/check-js-code.yml new file mode 100644 index 00000000000..abd9ce327c3 --- /dev/null +++ b/.github/workflows/check-js-code.yml @@ -0,0 +1,45 @@ +name: Check JS code and run Jest tests + +on: + workflow_call: + +permissions: + contents: read + +jobs: + js: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: cachix/install-nix-action@v20 + with: + github_access_token: ${{ secrets.GITHUB_TOKEN }} + + - uses: cachix/cachix-action@v12 + with: + name: devenv + + - name: Use Shopware Cache + uses: cachix/cachix-action@v12 + with: + name: shopware + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + + - name: Install devenv.sh + run: nix profile install github:cachix/devenv/v0.5 + shell: sh + + - name: Get Composer Cache Directory + id: composer-cache + run: | + echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + - uses: actions/cache@v3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: | + ${{ runner.os }}-composer- + + - run: devenv up & + - run: devenv shell check-js-code + - run: devenv shell test-jest diff --git a/.github/workflows/check-php-code.yml b/.github/workflows/check-php-code.yml new file mode 100644 index 00000000000..a77d91aa723 --- /dev/null +++ b/.github/workflows/check-php-code.yml @@ -0,0 +1,46 @@ +name: Check PHP code + +on: + workflow_call: + +permissions: + contents: read + +jobs: + php: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: cachix/install-nix-action@v20 + with: + github_access_token: ${{ secrets.GITHUB_TOKEN }} + + - uses: cachix/cachix-action@v12 + with: + name: devenv + + - name: Use Shopware Cache + uses: cachix/cachix-action@v12 + with: + name: shopware + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + + + - name: Install devenv.sh + run: nix-env -if https://github.com/cachix/devenv/tarball/main + shell: sh + + - name: Get Composer Cache Directory + id: composer-cache + run: | + echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + - uses: actions/cache@v3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: | + ${{ runner.os }}-composer- + + - run: devenv up & + - run: devenv shell init-shopware + - run: devenv shell check-code diff --git a/.github/workflows/end-to-end.yml b/.github/workflows/end-to-end.yml index b4efe530575..4e9ea403679 100644 --- a/.github/workflows/end-to-end.yml +++ b/.github/workflows/end-to-end.yml @@ -1,58 +1,58 @@ name: End-to-End on: - push: + workflow_call: permissions: - contents: read + contents: read jobs: - Mink: - strategy: - matrix: - MINK_TAG: [ 'account', 'checkout1', 'checkout2', 'detail', 'listing', 'note', 'sitemap', 'misc', 'backend' ] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v20 - with: - github_access_token: ${{ secrets.GITHUB_TOKEN }} - - - uses: cachix/cachix-action@v12 - with: - name: devenv - - - name: Use Shopware Cache - uses: cachix/cachix-action@v12 - with: - name: shopware - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - - name: Install devenv.sh - run: nix-env -if https://github.com/cachix/devenv/tarball/main - - - run: docker run -d --network host --shm-size 3g selenium/standalone-chrome:94.0 - - name: Get Composer Cache Directory - id: composer-cache - run: | - echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - - uses: actions/cache@v3 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} - restore-keys: | - ${{ runner.os }}-composer- - - - run: export SW_HOST=$(hostname -i) - - run: devenv shell info-setup - - run: devenv up & - - run: devenv shell ./.github/check-mysql.sh - - run: devenv shell init-shopware - - run: devenv shell prepare-mink - - run: devenv shell vendor/bin/behat -vv --config=tests/Mink/behat.yml --format=pretty --out=std --tags ${{ matrix.MINK_TAG }} - - name: Archive results - if: always() - uses: actions/upload-artifact@v3 - with: - name: build data - path: build/logs + Mink: + strategy: + matrix: + MINK_TAG: [ 'account', 'checkout1', 'checkout2', 'detail', 'listing', 'note', 'sitemap', 'misc', 'backend' ] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: cachix/install-nix-action@v20 + with: + github_access_token: ${{ secrets.GITHUB_TOKEN }} + + - uses: cachix/cachix-action@v12 + with: + name: devenv + + - name: Use Shopware Cache + uses: cachix/cachix-action@v12 + with: + name: shopware + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + + - name: Install devenv.sh + run: nix-env -if https://github.com/cachix/devenv/tarball/main + + - run: docker run -d --network host --shm-size 3g selenium/standalone-chrome:94.0 + - name: Get Composer Cache Directory + id: composer-cache + run: | + echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + - uses: actions/cache@v3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: | + ${{ runner.os }}-composer- + + - run: export SW_HOST=$(hostname -i) + - run: devenv shell info-setup + - run: devenv up & + - run: devenv shell ./.github/check-mysql.sh + - run: devenv shell init-shopware + - run: devenv shell prepare-mink + - run: devenv shell vendor/bin/behat -vv --config=tests/Mink/behat.yml --format=pretty --out=std --tags ${{ matrix.MINK_TAG }} + - name: Archive results + if: always() + uses: actions/upload-artifact@v3 + with: + name: build data + path: build/logs diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 17eca75800c..77b88ac0e87 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -1,7 +1,7 @@ name: Php Unit on: - push: + workflow_call: permissions: contents: read @@ -10,112 +10,112 @@ jobs: php: strategy: matrix: - php: [ '7.4', '8.0', '8.1', '8.2' ] - mysql: [ 'pkgs.mysql80' ] + php: ['7.4', '8.0', '8.1', '8.2'] + mysql: ['pkgs.mysql80'] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v20 - with: - github_access_token: ${{ secrets.GITHUB_TOKEN }} - - uses: cachix/cachix-action@v12 - with: - name: devenv - - name: Install devenv.sh - run: nix-env -if https://github.com/cachix/devenv/tarball/main - - - name: Get Composer Cache Directory - id: composer-cache - run: | - echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - - uses: actions/cache@v3 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} - restore-keys: | - ${{ runner.os }}-composer- - - run: | - cat > devenv.local.nix << EOF - { pkgs, lib, config, ... }: - - { - languages.php.version = "${{ matrix.php }}"; - services.mysql.package = ${{ matrix.mysql }}; - } - EOF - - run: cat devenv.local.nix - - run: devenv shell info-setup - - run: sudo mount -t tmpfs tmpfs $(pwd)/.devenv/profile/lib/mysql -o size=4G - - run: devenv up & - - run: devenv shell composer update laminas/laminas-code - - run: devenv shell test-phpunit + - uses: actions/checkout@v3 + - uses: cachix/install-nix-action@v20 + with: + github_access_token: ${{ secrets.GITHUB_TOKEN }} + - uses: cachix/cachix-action@v12 + with: + name: devenv + - name: Install devenv.sh + run: nix-env -if https://github.com/cachix/devenv/tarball/main + + - name: Get Composer Cache Directory + id: composer-cache + run: | + echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + - uses: actions/cache@v3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: | + ${{ runner.os }}-composer- + - run: | + cat > devenv.local.nix << EOF + { pkgs, lib, config, ... }: + + { + languages.php.version = "${{ matrix.php }}"; + services.mysql.package = ${{ matrix.mysql }}; + } + EOF + - run: cat devenv.local.nix + - run: devenv shell info-setup + - run: sudo mount -t tmpfs tmpfs $(pwd)/.devenv/profile/lib/mysql -o size=4G + - run: devenv up & + - run: devenv shell composer update laminas/laminas-code + - run: devenv shell test-phpunit mysql: strategy: matrix: - php: [ '8.1' ] - mysql: [ 'pkgs.mysql80', 'pkgs.mariadb', 'pkgs.mariadb_104', 'config.nur.repos.pascalthesing.mysql57' ] + php: ['8.1'] + mysql: ['pkgs.mysql80', 'pkgs.mariadb', 'pkgs.mariadb_104', 'config.nur.repos.pascalthesing.mysql57'] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - - uses: cachix/install-nix-action@v20 - with: - github_access_token: ${{ secrets.GITHUB_TOKEN }} - - uses: cachix/cachix-action@v12 - with: - name: devenv - - - name: Use Shopware Cache - uses: cachix/cachix-action@v12 - with: - name: shopware - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - - name: Install devenv.sh - run: nix-env -if https://github.com/cachix/devenv/tarball/main - - - name: Get Composer Cache Directory - id: composer-cache - run: | - echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - - uses: actions/cache@v3 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} - restore-keys: | - ${{ runner.os }}-composer- - - - run: | - cat > devenv.local.nix << EOF - { pkgs, lib, config, ... }: - - { - languages.php.version = "${{ matrix.php }}"; - services.mysql.package = ${{ matrix.mysql }}; - } - EOF - - run: cat devenv.local.nix - - - run: devenv shell info-setup - - run: sudo mount -t tmpfs tmpfs $(pwd)/.devenv/profile/lib/mysql -o size=4G - - run: devenv up & - - run: devenv shell ./.github/check-mysql.sh - - run: devenv shell test-phpunit + - uses: actions/checkout@v2 + + - uses: cachix/install-nix-action@v20 + with: + github_access_token: ${{ secrets.GITHUB_TOKEN }} + - uses: cachix/cachix-action@v12 + with: + name: devenv + + - name: Use Shopware Cache + uses: cachix/cachix-action@v12 + with: + name: shopware + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + + - name: Install devenv.sh + run: nix-env -if https://github.com/cachix/devenv/tarball/main + + - name: Get Composer Cache Directory + id: composer-cache + run: | + echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + - uses: actions/cache@v3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: | + ${{ runner.os }}-composer- + + - run: | + cat > devenv.local.nix << EOF + { pkgs, lib, config, ... }: + + { + languages.php.version = "${{ matrix.php }}"; + services.mysql.package = ${{ matrix.mysql }}; + } + EOF + - run: cat devenv.local.nix + + - run: devenv shell info-setup + - run: sudo mount -t tmpfs tmpfs $(pwd)/.devenv/profile/lib/mysql -o size=4G + - run: devenv up & + - run: devenv shell ./.github/check-mysql.sh + - run: devenv shell test-phpunit Code-Coverage: runs-on: ubuntu-latest env: TESTSUITE: 'all' steps: - - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v20 - with: - github_access_token: ${{ secrets.GITHUB_TOKEN }} + - uses: actions/checkout@v2 + - uses: cachix/install-nix-action@v20 + with: + github_access_token: ${{ secrets.GITHUB_TOKEN }} - - uses: cachix/cachix-action@v12 - with: - name: devenv + - uses: cachix/cachix-action@v12 + with: + name: devenv - name: Use Shopware Cache uses: cachix/cachix-action@v12 @@ -123,25 +123,25 @@ jobs: name: shopware authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - name: Install devenv.sh - run: nix-env -if https://github.com/cachix/devenv/tarball/main - - - name: Get Composer Cache Directory - id: composer-cache - run: | - echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - - uses: actions/cache@v3 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} - restore-keys: | - ${{ runner.os }}-composer- - - - run: devenv shell info-setup - - run: sudo mount -t tmpfs tmpfs $(pwd)/.devenv/profile/lib/mysql -o size=4G - - run: devenv up & - - run: devenv shell ./.github/check-mysql.sh - - run: devenv shell test-phpunit-coverage-statistic + - name: Install devenv.sh + run: nix-env -if https://github.com/cachix/devenv/tarball/main + + - name: Get Composer Cache Directory + id: composer-cache + run: | + echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + - uses: actions/cache@v3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: | + ${{ runner.os }}-composer- + + - run: devenv shell info-setup + - run: sudo mount -t tmpfs tmpfs $(pwd)/.devenv/profile/lib/mysql -o size=4G + - run: devenv up & + - run: devenv shell ./.github/check-mysql.sh + - run: devenv shell test-phpunit-coverage-statistic es: runs-on: ubuntu-latest @@ -186,9 +186,9 @@ jobs: } EOF - - run: devenv shell info-setup - - run: sudo mount -t tmpfs tmpfs $(pwd)/.devenv/profile/lib/mysql -o size=4G - - run: devenv up & - - run: devenv shell ./.github/check-mysql.sh - - run: devenv shell init-shopware - - run: devenv shell test-phpunit-elasticsearch + - run: devenv shell info-setup + - run: sudo mount -t tmpfs tmpfs $(pwd)/.devenv/profile/lib/mysql -o size=4G + - run: devenv up & + - run: devenv shell ./.github/check-mysql.sh + - run: devenv shell init-shopware + - run: devenv shell test-phpunit-elasticsearch diff --git a/.github/workflows/tests-launcher.yml b/.github/workflows/tests-launcher.yml new file mode 100644 index 00000000000..24fd26ed372 --- /dev/null +++ b/.github/workflows/tests-launcher.yml @@ -0,0 +1,34 @@ +name: Run + +on: + workflow_dispatch: + push: + schedule: + - cron: '30 02 * * *' + +concurrency: + group: ${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +jobs: + check-php-code: + name: PHPStan and CSFixer + uses: ./.github/workflows/check-php-code.yml + secrets: inherit + + check-js-code: + name: JsLinter and Jest tests + uses: ./.github/workflows/check-js-code.yml + secrets: inherit + + php-unit: + name: PHPUnit tests + uses: ./.github/workflows/phpunit.yml + secrets: inherit + needs: [ check-php-code, check-js-code ] + + e2e-tests: + name: E2E + uses: ./.github/workflows/end-to-end.yml + secrets: inherit + needs: [ php-unit ] From 740b1f4b504fc984767c9235975f75b6f5cb9c09 Mon Sep 17 00:00:00 2001 From: Dennis Garding Date: Tue, 4 Jul 2023 09:44:36 +0200 Subject: [PATCH 437/730] ci(SW-27133): Cancel previous pipelines --- .github/workflows/cachix.yml | 4 ++++ .github/workflows/check-js-code.yml | 4 ++++ .github/workflows/check-php-code.yml | 4 ++++ .github/workflows/codeql-analysis.yml | 4 ++++ .github/workflows/danger.yml | 4 ++++ .github/workflows/end-to-end.yml | 4 ++++ .github/workflows/phpunit.yml | 4 ++++ .github/workflows/tests-launcher.yml | 4 ---- 8 files changed, 28 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml index 141feb40519..3858969323e 100644 --- a/.github/workflows/cachix.yml +++ b/.github/workflows/cachix.yml @@ -12,6 +12,10 @@ on: permissions: contents: read +concurrency: + group: ${{ github.ref }}-${{ github.workflow }} + cancel-in-progress: true + jobs: build: strategy: diff --git a/.github/workflows/check-js-code.yml b/.github/workflows/check-js-code.yml index abd9ce327c3..db9ea2b88e1 100644 --- a/.github/workflows/check-js-code.yml +++ b/.github/workflows/check-js-code.yml @@ -6,6 +6,10 @@ on: permissions: contents: read +concurrency: + group: js-lint-and-jest-${{ github.ref }}-${{ github.workflow }} + cancel-in-progress: true + jobs: js: runs-on: ubuntu-latest diff --git a/.github/workflows/check-php-code.yml b/.github/workflows/check-php-code.yml index a77d91aa723..52835f6272e 100644 --- a/.github/workflows/check-php-code.yml +++ b/.github/workflows/check-php-code.yml @@ -6,6 +6,10 @@ on: permissions: contents: read +concurrency: + group: php-unit-${{ github.ref }}-${{ github.workflow }} + cancel-in-progress: true + jobs: php: runs-on: ubuntu-latest diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a2fc2dcafa9..43c45ef042b 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -7,6 +7,10 @@ on: permissions: contents: read +concurrency: + group: code-ql-${{ github.ref }}-${{ github.workflow }} + cancel-in-progress: true + jobs: analyze: permissions: diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index b98de2194b8..11db430b137 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -3,6 +3,10 @@ name: Danger on: pull_request: +concurrency: + group: danger-php-${{ github.ref }}-${{ github.workflow }} + cancel-in-progress: true + jobs: check: runs-on: ubuntu-latest diff --git a/.github/workflows/end-to-end.yml b/.github/workflows/end-to-end.yml index 4e9ea403679..439d0e6200e 100644 --- a/.github/workflows/end-to-end.yml +++ b/.github/workflows/end-to-end.yml @@ -6,6 +6,10 @@ on: permissions: contents: read +concurrency: + group: end-to-end-${{ github.ref }}-${{ github.workflow }} + cancel-in-progress: true + jobs: Mink: strategy: diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 77b88ac0e87..febd1f0a405 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -6,6 +6,10 @@ on: permissions: contents: read +concurrency: + group: php-unit-${{ github.ref }}-${{ github.workflow }} + cancel-in-progress: true + jobs: php: strategy: diff --git a/.github/workflows/tests-launcher.yml b/.github/workflows/tests-launcher.yml index 24fd26ed372..5e57f7b1c53 100644 --- a/.github/workflows/tests-launcher.yml +++ b/.github/workflows/tests-launcher.yml @@ -6,10 +6,6 @@ on: schedule: - cron: '30 02 * * *' -concurrency: - group: ${{ github.head_ref || github.run_id }} - cancel-in-progress: true - jobs: check-php-code: name: PHPStan and CSFixer From 1728d91158e1db63129597634b73ac8626523857 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 6 Jul 2023 09:03:32 +0200 Subject: [PATCH 438/730] ci(SW-27065): Change cachix key --- .github/workflows/cachix.yml | 10 +++------- .github/workflows/check-js-code.yml | 4 ++-- .github/workflows/check-php-code.yml | 4 ++-- .github/workflows/end-to-end.yml | 4 ++-- .github/workflows/phpunit.yml | 14 +++++++------- 5 files changed, 16 insertions(+), 20 deletions(-) diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml index 3858969323e..87e9a771bcf 100644 --- a/.github/workflows/cachix.yml +++ b/.github/workflows/cachix.yml @@ -12,10 +12,6 @@ on: permissions: contents: read -concurrency: - group: ${{ github.ref }}-${{ github.workflow }} - cancel-in-progress: true - jobs: build: strategy: @@ -28,7 +24,7 @@ jobs: uses: actions/checkout@v3 - name: Install Nix - uses: cachix/install-nix-action@v20 + uses: cachix/install-nix-action@v22 with: extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} @@ -40,13 +36,13 @@ jobs: - name: Use Shopware Cache uses: cachix/cachix-action@v12 with: - name: shopware + name: shopware5-shopware authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - name: Install Devenv run: nix-env -if https://github.com/cachix/devenv/tarball/main - name: Warmup cache - run: cachix watch-exec shopware devenv shell php -v + run: cachix watch-exec shopware5-shopware devenv shell php -v env: NIXPKGS_ALLOW_UNFREE: 1 diff --git a/.github/workflows/check-js-code.yml b/.github/workflows/check-js-code.yml index db9ea2b88e1..2c3e0d2d070 100644 --- a/.github/workflows/check-js-code.yml +++ b/.github/workflows/check-js-code.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: cachix/install-nix-action@v20 + - uses: cachix/install-nix-action@v22 with: github_access_token: ${{ secrets.GITHUB_TOKEN }} @@ -26,7 +26,7 @@ jobs: - name: Use Shopware Cache uses: cachix/cachix-action@v12 with: - name: shopware + name: shopware5-shopware authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - name: Install devenv.sh diff --git a/.github/workflows/check-php-code.yml b/.github/workflows/check-php-code.yml index 52835f6272e..72af5801e30 100644 --- a/.github/workflows/check-php-code.yml +++ b/.github/workflows/check-php-code.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: cachix/install-nix-action@v20 + - uses: cachix/install-nix-action@v22 with: github_access_token: ${{ secrets.GITHUB_TOKEN }} @@ -26,7 +26,7 @@ jobs: - name: Use Shopware Cache uses: cachix/cachix-action@v12 with: - name: shopware + name: shopware5-shopware authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' diff --git a/.github/workflows/end-to-end.yml b/.github/workflows/end-to-end.yml index 439d0e6200e..bed2ab23edf 100644 --- a/.github/workflows/end-to-end.yml +++ b/.github/workflows/end-to-end.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v20 + - uses: cachix/install-nix-action@v22 with: github_access_token: ${{ secrets.GITHUB_TOKEN }} @@ -29,7 +29,7 @@ jobs: - name: Use Shopware Cache uses: cachix/cachix-action@v12 with: - name: shopware + name: shopware5-shopware authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - name: Install devenv.sh diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index febd1f0a405..878ca6f3531 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v20 + - uses: cachix/install-nix-action@v22 with: github_access_token: ${{ secrets.GITHUB_TOKEN }} - uses: cachix/cachix-action@v12 @@ -63,7 +63,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: cachix/install-nix-action@v20 + - uses: cachix/install-nix-action@v22 with: github_access_token: ${{ secrets.GITHUB_TOKEN }} - uses: cachix/cachix-action@v12 @@ -73,7 +73,7 @@ jobs: - name: Use Shopware Cache uses: cachix/cachix-action@v12 with: - name: shopware + name: shopware5-shopware authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - name: Install devenv.sh @@ -113,7 +113,7 @@ jobs: TESTSUITE: 'all' steps: - uses: actions/checkout@v2 - - uses: cachix/install-nix-action@v20 + - uses: cachix/install-nix-action@v22 with: github_access_token: ${{ secrets.GITHUB_TOKEN }} @@ -124,7 +124,7 @@ jobs: - name: Use Shopware Cache uses: cachix/cachix-action@v12 with: - name: shopware + name: shopware5-shopware authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - name: Install devenv.sh @@ -152,7 +152,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v20 + - uses: cachix/install-nix-action@v22 with: github_access_token: ${{ secrets.GITHUB_TOKEN }} - uses: cachix/cachix-action@v12 @@ -162,7 +162,7 @@ jobs: - name: Use Shopware Cache uses: cachix/cachix-action@v12 with: - name: shopware + name: shopware5-shopware authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - name: Install devenv.sh From 969379fb851c2621b5347d3debc1df2674db2991 Mon Sep 17 00:00:00 2001 From: Susanne Hartung Date: Thu, 6 Jul 2023 16:44:55 +0200 Subject: [PATCH 439/730] fix(SW-27151): split emails before validation Separates the transmitted addresses before passing them to the validation. Otherwise they will always be validated to false. --- engine/Shopware/Controllers/Backend/Base.php | 15 +++++--- .../Controllers/Backend/BaseTest.php | 38 +++++++++++++++++++ 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/engine/Shopware/Controllers/Backend/Base.php b/engine/Shopware/Controllers/Backend/Base.php index ec001c7705f..f4d977b1b37 100644 --- a/engine/Shopware/Controllers/Backend/Base.php +++ b/engine/Shopware/Controllers/Backend/Base.php @@ -1043,15 +1043,20 @@ public function validateEmailAction() $this->Front()->Plugins()->ViewRenderer()->setNoRender(); $this->Front()->Plugins()->Json()->setRenderer(false); - $email = $this->Request()->getParam('value'); + $emails = explode(',', (string) $this->Request()->getParam('value', '')); /** @var EmailValidatorInterface $emailValidator */ $emailValidator = $this->container->get(EmailValidator::class); - if ($emailValidator->isValid($email)) { - $this->Response()->setContent(1); - } else { - $this->Response()->setContent(''); + + foreach ($emails as $email) { + if (!$emailValidator->isValid($email)) { + $this->Response()->setContent(''); + + return; + } } + + $this->Response()->setContent(1); } public function getSalutationsAction() diff --git a/tests/Functional/Controllers/Backend/BaseTest.php b/tests/Functional/Controllers/Backend/BaseTest.php index b53d060aa6a..67949b84a2a 100644 --- a/tests/Functional/Controllers/Backend/BaseTest.php +++ b/tests/Functional/Controllers/Backend/BaseTest.php @@ -26,8 +26,10 @@ use Enlight_Components_Test_Controller_TestCase; use Enlight_Controller_Request_RequestTestCase; +use Enlight_Controller_Response_ResponseTestCase; use Enlight_Template_Manager; use Enlight_View_Default; +use Generator; use Shopware\Tests\Functional\Traits\ContainerTrait; use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour; use Shopware_Controllers_Backend_Base; @@ -214,6 +216,42 @@ public function provideSearchString(): array ]; } + /** + * @dataProvider provideEmails + */ + public function testValidateEmailAction(string $emails, bool $expectedIsValid): void + { + $request = new Enlight_Controller_Request_RequestTestCase(); + $response = new Enlight_Controller_Response_ResponseTestCase(); + $request->setParam('value', $emails); + + $controller = $this->createController(); + $controller->setRequest($request); + $controller->setResponse($response); + $controller->validateEmailAction(); + + static::assertSame($expectedIsValid, (bool) $response->getContent()); + } + + /** + * @return Generator + */ + public function provideEmails(): Generator + { + yield '1 mail shall be valid' => [ + 'emails' => 'email@shopware.com', + 'expectedIsValid' => true, + ]; + yield '3 mails shall be valid' => [ + 'emails' => 'email@shopware.com,email2@shopware.com,email3@shopware.com', + 'expectedIsValid' => true, + ]; + yield '3 mail shall be invalid' => [ + 'emails' => 'email@shopware.com,email2@shopware.com,email3@shopware.com||test', + 'expectedIsValid' => false, + ]; + } + private function createController(): Shopware_Controllers_Backend_Base { $controller = $this->getContainer()->get('shopware_controllers_backend_base'); From 09af3dec7b8909d26c837ecc1b931dbd3f57da23 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 10 Jul 2023 11:18:21 +0200 Subject: [PATCH 440/730] chore(SW-27143): Update php-cs-fixer to version 3.21.0 --- vendor-bin/cs-fixer/composer.json | 2 +- vendor-bin/cs-fixer/composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/vendor-bin/cs-fixer/composer.json b/vendor-bin/cs-fixer/composer.json index e137cea6219..c260e499734 100644 --- a/vendor-bin/cs-fixer/composer.json +++ b/vendor-bin/cs-fixer/composer.json @@ -1,6 +1,6 @@ { "require-dev": { - "friendsofphp/php-cs-fixer": "3.20.0", + "friendsofphp/php-cs-fixer": "3.21.0", "kubawerlos/php-cs-fixer-custom-fixers": "3.15.0" }, "sort-packages": true diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock index b06b6945df9..3c1045e834f 100644 --- a/vendor-bin/cs-fixer/composer.lock +++ b/vendor-bin/cs-fixer/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": "3f50182aa0db3152b162a0ea183c4041", + "content-hash": "948da8f09bc935c5c94227dfee539961", "packages": [], "packages-dev": [ { @@ -428,16 +428,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.20.0", + "version": "v3.21.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "0e8249e0b15e2bc022fbbd1090ce29d071481e69" + "reference": "f29a0598c022baf99d2136da533820fec63167ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/0e8249e0b15e2bc022fbbd1090ce29d071481e69", - "reference": "0e8249e0b15e2bc022fbbd1090ce29d071481e69", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/f29a0598c022baf99d2136da533820fec63167ed", + "reference": "f29a0598c022baf99d2136da533820fec63167ed", "shasum": "" }, "require": { @@ -512,7 +512,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.20.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.21.0" }, "funding": [ { @@ -520,7 +520,7 @@ "type": "github" } ], - "time": "2023-06-27T20:22:39+00:00" + "time": "2023-07-05T21:28:10+00:00" }, { "name": "kubawerlos/php-cs-fixer-custom-fixers", From 15ad3d5ae80a9857c60ba86781b7ca8a30bd258a Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 10 Jul 2023 12:10:39 +0200 Subject: [PATCH 441/730] chore(SW-27143): Update PHPStan --- composer.json | 2 +- composer.lock | 12 ++++++------ engine/Shopware/Core/sArticles.php | 3 +-- engine/Shopware/Core/sBasket.php | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index d0b31ea3b5d..48febddbc68 100644 --- a/composer.json +++ b/composer.json @@ -113,7 +113,7 @@ "php-parallel-lint/php-var-dump-check": "^0.5", "phpspec/prophecy-phpunit": "^2.0", "phpstan/extension-installer": "1.3.1", - "phpstan/phpstan": "1.10.21", + "phpstan/phpstan": "1.10.25", "phpstan/phpstan-doctrine": "1.3.40", "phpstan/phpstan-phpunit": "1.3.13", "phpstan/phpstan-symfony": "1.3.2", diff --git a/composer.lock b/composer.lock index c258904e65a..01ab9179ffc 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": "e0774859b68a3d0f2aa1d591e5e27341", + "content-hash": "9932de6f14b30f21379399fdd48b1bca", "packages": [ { "name": "aws/aws-crt-php", @@ -8624,16 +8624,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.21", + "version": "1.10.25", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "b2a30186be2e4d97dce754ae4e65eb0ec2f04eb5" + "reference": "578f4e70d117f9a90699324c555922800ac38d8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b2a30186be2e4d97dce754ae4e65eb0ec2f04eb5", - "reference": "b2a30186be2e4d97dce754ae4e65eb0ec2f04eb5", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/578f4e70d117f9a90699324c555922800ac38d8c", + "reference": "578f4e70d117f9a90699324c555922800ac38d8c", "shasum": "" }, "require": { @@ -8682,7 +8682,7 @@ "type": "tidelift" } ], - "time": "2023-06-21T20:07:58+00:00" + "time": "2023-07-06T12:11:37+00:00" }, { "name": "phpstan/phpstan-doctrine", diff --git a/engine/Shopware/Core/sArticles.php b/engine/Shopware/Core/sArticles.php index d35147656cf..cf4b6904fad 100644 --- a/engine/Shopware/Core/sArticles.php +++ b/engine/Shopware/Core/sArticles.php @@ -535,8 +535,7 @@ public function sCalculatingPrice($price, $tax, $taxId = 0, $article = []) */ public function getTaxRateByConditions($taxId) { - $context = $this->contextService->getShopContext(); - $taxRate = $context->getTaxRule($taxId); + $taxRate = $this->contextService->getShopContext()->getTaxRule($taxId); if ($taxRate) { return number_format($taxRate->getTax(), 2); } diff --git a/engine/Shopware/Core/sBasket.php b/engine/Shopware/Core/sBasket.php index 988e21b6518..3cd2159cab3 100644 --- a/engine/Shopware/Core/sBasket.php +++ b/engine/Shopware/Core/sBasket.php @@ -3104,7 +3104,7 @@ private function getPricesForItemUpdates(array $cartItems) private function getTaxesForUpdateProduct($quantity, array $queryNewPrice, array $queryAdditionalInfo) { // Determinate tax rate for this cart position - $taxRate = $this->moduleManager->Articles()->getTaxRateByConditions($queryNewPrice['taxID']); + $taxRate = (float) $this->moduleManager->Articles()->getTaxRateByConditions($queryNewPrice['taxID']); $netPrice = $queryNewPrice['price']; From 407a8762616b81ad67a93c26867134f7a2d478ef Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 10 Jul 2023 12:13:10 +0200 Subject: [PATCH 442/730] chore(SW-27143): Update google/cloud-storage to 1.33.0 --- UPGRADE-5.7.md | 2 +- composer.json | 2 +- composer.lock | 28 ++++++++++++++-------------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index dc7d5887bbb..52910be3990 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -10,7 +10,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Changed behaviour of the translation transfer while setting a product variant as the main variant * Changed the test kernel, so PHPUnit tests do no longer ignore PHP warnings and notices and are failing instead -* Updated `google/cloud-storage` to version 1.32.0 +* Updated `google/cloud-storage` to version 1.33.0 * Updated `doctrine/orm` to version 2.15.3 * Updated `setasign/fpdf` to version 1.8.6 diff --git a/composer.json b/composer.json index 48febddbc68..e7a4110828f 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,7 @@ "elasticsearch/elasticsearch": "^7", "fig/link-util": "1.1.2", "friendsofphp/proxy-manager-lts": "1.0.16", - "google/cloud-storage": "1.32.0", + "google/cloud-storage": "1.33.0", "guzzlehttp/guzzle": "~7.7.0", "guzzlehttp/psr7": "2.5.0", "laminas/laminas-code": "4.7.1 || 4.11.0", diff --git a/composer.lock b/composer.lock index 01ab9179ffc..4d4c4415a22 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": "9932de6f14b30f21379399fdd48b1bca", + "content-hash": "f4dfab328a0da35017a2056195de7422", "packages": [ { "name": "aws/aws-crt-php", @@ -1917,16 +1917,16 @@ }, { "name": "google/cloud-core", - "version": "v1.52.0", + "version": "v1.52.1", "source": { "type": "git", "url": "https://github.com/googleapis/google-cloud-php-core.git", - "reference": "bd87e418923e0d836c7e754d82e66bc0b79964ab" + "reference": "8214910f79b5508d4cd1cd48f39d7970443071d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/bd87e418923e0d836c7e754d82e66bc0b79964ab", - "reference": "bd87e418923e0d836c7e754d82e66bc0b79964ab", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/8214910f79b5508d4cd1cd48f39d7970443071d5", + "reference": "8214910f79b5508d4cd1cd48f39d7970443071d5", "shasum": "" }, "require": { @@ -1942,7 +1942,7 @@ "require-dev": { "erusev/parsedown": "^1.6", "google/cloud-common-protos": "^0.4", - "google/gax": "^1.9", + "google/gax": "^1.19.1", "opis/closure": "^3", "phpdocumentor/reflection": "^5.0", "phpspec/prophecy-phpunit": "^2.0", @@ -1976,22 +1976,22 @@ ], "description": "Google Cloud PHP shared dependency, providing functionality useful to all components.", "support": { - "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.0" + "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.1" }, - "time": "2023-06-21T21:05:25+00:00" + "time": "2023-07-07T20:46:38+00:00" }, { "name": "google/cloud-storage", - "version": "v1.32.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-cloud-php-storage.git", - "reference": "2dd5cee0da51e94bcf39c0af9cefd0ec6b931685" + "reference": "05ae33620feebe1107756b59fe0329cace3b5e13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/2dd5cee0da51e94bcf39c0af9cefd0ec6b931685", - "reference": "2dd5cee0da51e94bcf39c0af9cefd0ec6b931685", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/05ae33620feebe1107756b59fe0329cace3b5e13", + "reference": "05ae33620feebe1107756b59fe0329cace3b5e13", "shasum": "" }, "require": { @@ -2033,9 +2033,9 @@ ], "description": "Cloud Storage Client for PHP", "support": { - "source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.32.0" + "source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.33.0" }, - "time": "2023-06-21T21:05:25+00:00" + "time": "2023-07-07T20:46:38+00:00" }, { "name": "google/crc32", From 630623c6f972168340a0e5b2dc1450a8f6efefcc Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 10 Jul 2023 12:16:06 +0200 Subject: [PATCH 443/730] chore(SW-27143): Update several dependencies --- UPGRADE-5.7.md | 4 ++ composer.lock | 156 +++++++++++++++++++++++++------------------------ 2 files changed, 84 insertions(+), 76 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 52910be3990..e117a90e74d 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -12,7 +12,11 @@ This changelog references changes done in Shopware 5.7 patch versions. * Changed the test kernel, so PHPUnit tests do no longer ignore PHP warnings and notices and are failing instead * Updated `google/cloud-storage` to version 1.33.0 * Updated `doctrine/orm` to version 2.15.3 +* Updated `phpunit/phpunit` to version 9.6.10 * Updated `setasign/fpdf` to version 1.8.6 +* Updated `symfony/serializer` to version 5.4.25 +* Updated `voku/anti-xss` to version 4.1.42 +* Updated several indirect dependencies ## 5.7.18 diff --git a/composer.lock b/composer.lock index 4d4c4415a22..3b5d33cf433 100644 --- a/composer.lock +++ b/composer.lock @@ -62,16 +62,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.271.2", + "version": "3.275.5", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "17d7df5b89bb06e915931a65f643cf3469f8994c" + "reference": "d46961b82e857f77059c0c78160719ecb26f6cc6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/17d7df5b89bb06e915931a65f643cf3469f8994c", - "reference": "17d7df5b89bb06e915931a65f643cf3469f8994c", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d46961b82e857f77059c0c78160719ecb26f6cc6", + "reference": "d46961b82e857f77059c0c78160719ecb26f6cc6", "shasum": "" }, "require": { @@ -151,9 +151,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.271.2" + "source": "https://github.com/aws/aws-sdk-php/tree/3.275.5" }, - "time": "2023-05-25T18:19:34+00:00" + "time": "2023-07-07T18:20:11+00:00" }, { "name": "bcremer/line-reader", @@ -907,25 +907,29 @@ }, { "name": "doctrine/deprecations", - "version": "v1.0.0", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de" + "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", - "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", + "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", "shasum": "" }, "require": { - "php": "^7.1|^8.0" + "php": "^7.1 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^9", - "phpunit/phpunit": "^7.5|^8.5|^9.5", - "psr/log": "^1|^2|^3" + "phpstan/phpstan": "1.4.10 || 1.10.15", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "psalm/plugin-phpunit": "0.18.4", + "psr/log": "^1 || ^2 || ^3", + "vimeo/psalm": "4.30.0 || 5.12.0" }, "suggest": { "psr/log": "Allows logging deprecations via PSR-3 logger implementation" @@ -944,9 +948,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/v1.0.0" + "source": "https://github.com/doctrine/deprecations/tree/v1.1.1" }, - "time": "2022-05-02T15:47:09+00:00" + "time": "2023-06-03T09:27:29+00:00" }, { "name": "doctrine/event-manager", @@ -4086,16 +4090,16 @@ }, { "name": "symfony/cache", - "version": "v5.4.23", + "version": "v5.4.25", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "983c79ff28612cdfd66d8e44e1a06e5afc87e107" + "reference": "e2013521c0f07473ae69a01fce0af78fc3ec0f23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/983c79ff28612cdfd66d8e44e1a06e5afc87e107", - "reference": "983c79ff28612cdfd66d8e44e1a06e5afc87e107", + "url": "https://api.github.com/repos/symfony/cache/zipball/e2013521c0f07473ae69a01fce0af78fc3ec0f23", + "reference": "e2013521c0f07473ae69a01fce0af78fc3ec0f23", "shasum": "" }, "require": { @@ -4163,7 +4167,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v5.4.23" + "source": "https://github.com/symfony/cache/tree/v5.4.25" }, "funding": [ { @@ -4179,7 +4183,7 @@ "type": "tidelift" } ], - "time": "2023-04-21T15:38:51+00:00" + "time": "2023-06-22T08:06:06+00:00" }, { "name": "symfony/cache-contracts", @@ -5419,16 +5423,16 @@ }, { "name": "symfony/intl", - "version": "v5.4.23", + "version": "v5.4.25", "source": { "type": "git", "url": "https://github.com/symfony/intl.git", - "reference": "962789bbc76c82c266623321ffc24416f574b636" + "reference": "4c4cbf57c9623b55e7d19479488bd93fee68450a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/intl/zipball/962789bbc76c82c266623321ffc24416f574b636", - "reference": "962789bbc76c82c266623321ffc24416f574b636", + "url": "https://api.github.com/repos/symfony/intl/zipball/4c4cbf57c9623b55e7d19479488bd93fee68450a", + "reference": "4c4cbf57c9623b55e7d19479488bd93fee68450a", "shasum": "" }, "require": { @@ -5487,7 +5491,7 @@ "localization" ], "support": { - "source": "https://github.com/symfony/intl/tree/v5.4.23" + "source": "https://github.com/symfony/intl/tree/v5.4.25" }, "funding": [ { @@ -5503,7 +5507,7 @@ "type": "tidelift" } ], - "time": "2023-04-13T10:36:25+00:00" + "time": "2023-06-19T09:28:43+00:00" }, { "name": "symfony/mime", @@ -6294,16 +6298,16 @@ }, { "name": "symfony/property-info", - "version": "v5.4.23", + "version": "v5.4.24", "source": { "type": "git", "url": "https://github.com/symfony/property-info.git", - "reference": "ff45ebbfd781eab2571d9d4412d82a9a733fc2b3" + "reference": "d43b85b00699b4484964c297575b5c6f9dc5f6e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-info/zipball/ff45ebbfd781eab2571d9d4412d82a9a733fc2b3", - "reference": "ff45ebbfd781eab2571d9d4412d82a9a733fc2b3", + "url": "https://api.github.com/repos/symfony/property-info/zipball/d43b85b00699b4484964c297575b5c6f9dc5f6e1", + "reference": "d43b85b00699b4484964c297575b5c6f9dc5f6e1", "shasum": "" }, "require": { @@ -6365,7 +6369,7 @@ "validator" ], "support": { - "source": "https://github.com/symfony/property-info/tree/v5.4.23" + "source": "https://github.com/symfony/property-info/tree/v5.4.24" }, "funding": [ { @@ -6381,20 +6385,20 @@ "type": "tidelift" } ], - "time": "2023-04-17T14:20:34+00:00" + "time": "2023-05-15T20:11:03+00:00" }, { "name": "symfony/serializer", - "version": "v5.4.23", + "version": "v5.4.25", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "545da11697153c24c274b9a68cab550b2c0a9860" + "reference": "e528ace5951925459cb6620cc4d67c20ed616fdd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/545da11697153c24c274b9a68cab550b2c0a9860", - "reference": "545da11697153c24c274b9a68cab550b2c0a9860", + "url": "https://api.github.com/repos/symfony/serializer/zipball/e528ace5951925459cb6620cc4d67c20ed616fdd", + "reference": "e528ace5951925459cb6620cc4d67c20ed616fdd", "shasum": "" }, "require": { @@ -6468,7 +6472,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v5.4.23" + "source": "https://github.com/symfony/serializer/tree/v5.4.25" }, "funding": [ { @@ -6484,7 +6488,7 @@ "type": "tidelift" } ], - "time": "2023-04-17T13:59:16+00:00" + "time": "2023-05-31T11:43:23+00:00" }, { "name": "symfony/service-contracts", @@ -6841,16 +6845,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.23", + "version": "v5.4.25", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "9a8a5b6d6508928174ded2109e29328a55342a42" + "reference": "82269f73c0f0f9859ab9b6900eebacbe54954ede" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9a8a5b6d6508928174ded2109e29328a55342a42", - "reference": "9a8a5b6d6508928174ded2109e29328a55342a42", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/82269f73c0f0f9859ab9b6900eebacbe54954ede", + "reference": "82269f73c0f0f9859ab9b6900eebacbe54954ede", "shasum": "" }, "require": { @@ -6859,7 +6863,6 @@ "symfony/polyfill-php80": "^1.16" }, "conflict": { - "phpunit/phpunit": "<5.4.3", "symfony/console": "<4.4" }, "require-dev": { @@ -6910,7 +6913,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.23" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.25" }, "funding": [ { @@ -6926,7 +6929,7 @@ "type": "tidelift" } ], - "time": "2023-04-18T09:26:27+00:00" + "time": "2023-06-20T20:56:26+00:00" }, { "name": "symfony/var-exporter", @@ -7092,16 +7095,16 @@ }, { "name": "voku/anti-xss", - "version": "4.1.41", + "version": "4.1.42", "source": { "type": "git", "url": "https://github.com/voku/anti-xss.git", - "reference": "55a403436494e44a2547a8d42de68e6cad4bca1d" + "reference": "bca1f8607e55a3c5077483615cd93bd8f11bd675" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/anti-xss/zipball/55a403436494e44a2547a8d42de68e6cad4bca1d", - "reference": "55a403436494e44a2547a8d42de68e6cad4bca1d", + "url": "https://api.github.com/repos/voku/anti-xss/zipball/bca1f8607e55a3c5077483615cd93bd8f11bd675", + "reference": "bca1f8607e55a3c5077483615cd93bd8f11bd675", "shasum": "" }, "require": { @@ -7147,7 +7150,7 @@ ], "support": { "issues": "https://github.com/voku/anti-xss/issues", - "source": "https://github.com/voku/anti-xss/tree/4.1.41" + "source": "https://github.com/voku/anti-xss/tree/4.1.42" }, "funding": [ { @@ -7171,7 +7174,7 @@ "type": "tidelift" } ], - "time": "2023-02-12T15:56:55+00:00" + "time": "2023-07-03T14:40:46+00:00" }, { "name": "voku/portable-ascii", @@ -8026,16 +8029,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.5", + "version": "v4.16.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e" + "reference": "19526a33fb561ef417e822e85f08a00db4059c17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e", - "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17", + "reference": "19526a33fb561ef417e822e85f08a00db4059c17", "shasum": "" }, "require": { @@ -8076,9 +8079,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0" }, - "time": "2023-05-19T20:20:00+00:00" + "time": "2023-06-25T14:52:30+00:00" }, { "name": "phar-io/manifest", @@ -8356,16 +8359,16 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.7.1", + "version": "1.7.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "dfc078e8af9c99210337325ff5aa152872c98714" + "reference": "b2fe4d22a5426f38e014855322200b97b5362c0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/dfc078e8af9c99210337325ff5aa152872c98714", - "reference": "dfc078e8af9c99210337325ff5aa152872c98714", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b2fe4d22a5426f38e014855322200b97b5362c0d", + "reference": "b2fe4d22a5426f38e014855322200b97b5362c0d", "shasum": "" }, "require": { @@ -8408,9 +8411,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.1" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.2" }, - "time": "2023-03-27T19:02:04+00:00" + "time": "2023-05-30T18:13:47+00:00" }, { "name": "phpspec/prophecy", @@ -8578,22 +8581,23 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.21.0", + "version": "1.22.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "6df62b08faef4f899772bc7c3bbabb93d2b7a21c" + "reference": "65c39594fbd8c67abfc68bb323f86447bab79cc0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6df62b08faef4f899772bc7c3bbabb93d2b7a21c", - "reference": "6df62b08faef4f899772bc7c3bbabb93d2b7a21c", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/65c39594fbd8c67abfc68bb323f86447bab79cc0", + "reference": "65c39594fbd8c67abfc68bb323f86447bab79cc0", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { + "doctrine/annotations": "^2.0", "nikic/php-parser": "^4.15", "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", @@ -8618,9 +8622,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.21.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.22.1" }, - "time": "2023-05-17T13:13:44+00:00" + "time": "2023-06-29T20:46:06+00:00" }, { "name": "phpstan/phpstan", @@ -9197,16 +9201,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.8", + "version": "9.6.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e" + "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/17d621b3aff84d0c8b62539e269e87d8d5baa76e", - "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a6d351645c3fe5a30f5e86be6577d946af65a328", + "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328", "shasum": "" }, "require": { @@ -9280,7 +9284,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.8" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.10" }, "funding": [ { @@ -9296,7 +9300,7 @@ "type": "tidelift" } ], - "time": "2023-05-11T05:14:45+00:00" + "time": "2023-07-10T04:04:23+00:00" }, { "name": "sebastian/cli-parser", From e0200c7f7d2cd9d5463e11c7d306adfb646d34cc Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 10 Jul 2023 12:31:34 +0200 Subject: [PATCH 444/730] chore(SW-27143): Update npm dependencies --- UPGRADE-5.7.md | 2 + themes/Frontend/Responsive/package-lock.json | 7156 +++--------------- themes/Frontend/Responsive/package.json | 4 +- themes/package-lock.json | 4519 +---------- 4 files changed, 1308 insertions(+), 10373 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index e117a90e74d..f282dcbd6e5 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -52,6 +52,8 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `voku/anti-xss` to version 4.1.41 * Updated `wikimedia/less.php` to version 4.1.0 * Updated several indirect dependencies +* Updated npm dependencies in `themes/package.json` +* Updated npm dependencies in `themes/Frontend/Responsive/package.json` ### Removals diff --git a/themes/Frontend/Responsive/package-lock.json b/themes/Frontend/Responsive/package-lock.json index 8268fbe002d..ffcee454342 100644 --- a/themes/Frontend/Responsive/package-lock.json +++ b/themes/Frontend/Responsive/package-lock.json @@ -1,7 +1,7 @@ { "name": "shopwareresponsivetheme", "version": "1.0.0", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { @@ -24,17 +24,17 @@ "grunt-contrib-clean": "^2.0.1", "grunt-contrib-copy": "1.0.0", "grunt-modernizr": "^3.0.3", - "jest": "28.1.3", - "jest-environment-jsdom": "28.1.3" + "jest": "^29.6.1", + "jest-environment-jsdom": "^29.6.1" } }, "node_modules/@ampproject/remapping": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", - "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", + "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", "dev": true, "dependencies": { - "@jridgewell/gen-mapping": "^0.1.0", + "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" }, "engines": { @@ -42,47 +42,47 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", - "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz", + "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==", "dev": true, "dependencies": { - "@babel/highlight": "^7.18.6" + "@babel/highlight": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/compat-data": { - "version": "7.20.10", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.10.tgz", - "integrity": "sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.6.tgz", + "integrity": "sha512-29tfsWTq2Ftu7MXmimyC0C5FDZv5DYxOZkh3XD3+QW4V/BYuv/LyEsjj3c0hqedEaDt6DBfDvexMKU8YevdqFg==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz", - "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==", - "dev": true, - "dependencies": { - "@ampproject/remapping": "^2.1.0", - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helpers": "^7.20.7", - "@babel/parser": "^7.20.7", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.12", - "@babel/types": "^7.20.7", + "version": "7.22.8", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.8.tgz", + "integrity": "sha512-75+KxFB4CZqYRXjx4NlR4J7yGvKumBuZTmV4NV6v09dVXXkuYVYLT68N6HCzLvfJ+fWCxQsntNzKwwIXL4bHnw==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.22.5", + "@babel/generator": "^7.22.7", + "@babel/helper-compilation-targets": "^7.22.6", + "@babel/helper-module-transforms": "^7.22.5", + "@babel/helpers": "^7.22.6", + "@babel/parser": "^7.22.7", + "@babel/template": "^7.22.5", + "@babel/traverse": "^7.22.8", + "@babel/types": "^7.22.5", + "@nicolo-ribaudo/semver-v6": "^6.3.3", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", - "json5": "^2.2.2", - "semver": "^6.3.0" + "json5": "^2.2.2" }, "engines": { "node": ">=6.9.0" @@ -92,45 +92,38 @@ "url": "https://opencollective.com/babel" } }, + "node_modules/@babel/core/node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true + }, "node_modules/@babel/generator": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz", - "integrity": "sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==", + "version": "7.22.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.7.tgz", + "integrity": "sha512-p+jPjMG+SI8yvIaxGgeW24u7q9+5+TGpZh8/CuB7RhBKd7RCy8FayNEFNNKrNK/eUcY/4ExQqLmyrvBXKsIcwQ==", "dev": true, "dependencies": { - "@babel/types": "^7.20.7", + "@babel/types": "^7.22.5", "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", - "dev": true, - "dependencies": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz", - "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.6.tgz", + "integrity": "sha512-534sYEqWD9VfUm3IPn2SLcH4Q3P86XL+QvqdC7ZsFrzyyPF3T4XGiVghF6PTYNdWg6pXuoqXxNQAhbYeEInTzA==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.20.5", - "@babel/helper-validator-option": "^7.18.6", - "browserslist": "^4.21.3", - "lru-cache": "^5.1.1", - "semver": "^6.3.0" + "@babel/compat-data": "^7.22.6", + "@babel/helper-validator-option": "^7.22.5", + "@nicolo-ribaudo/semver-v6": "^6.3.3", + "browserslist": "^4.21.9", + "lru-cache": "^5.1.1" }, "engines": { "node": ">=6.9.0" @@ -140,151 +133,151 @@ } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", - "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz", + "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", - "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz", + "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==", "dev": true, "dependencies": { - "@babel/template": "^7.18.10", - "@babel/types": "^7.19.0" + "@babel/template": "^7.22.5", + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-hoist-variables": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", - "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", + "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", - "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz", + "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz", - "integrity": "sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==", - "dev": true, - "dependencies": { - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-simple-access": "^7.20.2", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/helper-validator-identifier": "^7.19.1", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.10", - "@babel/types": "^7.20.7" + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz", + "integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==", + "dev": true, + "dependencies": { + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-simple-access": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.5", + "@babel/template": "^7.22.5", + "@babel/traverse": "^7.22.5", + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", - "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz", + "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-simple-access": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", - "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", + "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", "dev": true, "dependencies": { - "@babel/types": "^7.20.2" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-split-export-declaration": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", - "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", + "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", - "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", + "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", + "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz", - "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz", + "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz", - "integrity": "sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz", + "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==", "dev": true, "dependencies": { - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.7", - "@babel/types": "^7.20.7" + "@babel/template": "^7.22.5", + "@babel/traverse": "^7.22.6", + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz", + "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.18.6", + "@babel/helper-validator-identifier": "^7.22.5", "chalk": "^2.0.0", "js-tokens": "^4.0.0" }, @@ -318,15 +311,6 @@ "node": ">=4" } }, - "node_modules/@babel/highlight/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/@babel/highlight/node_modules/supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -340,9 +324,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz", - "integrity": "sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==", + "version": "7.22.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz", + "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -411,6 +395,21 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/plugin-syntax-jsx": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz", + "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, "node_modules/@babel/plugin-syntax-logical-assignment-operators": { "version": "7.10.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", @@ -499,12 +498,12 @@ } }, "node_modules/@babel/plugin-syntax-typescript": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz", - "integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz", + "integrity": "sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.19.0" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -514,33 +513,33 @@ } }, "node_modules/@babel/template": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz", - "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", + "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7" + "@babel/code-frame": "^7.22.5", + "@babel/parser": "^7.22.5", + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.12.tgz", - "integrity": "sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7", + "version": "7.22.8", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz", + "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.22.5", + "@babel/generator": "^7.22.7", + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-function-name": "^7.22.5", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.22.7", + "@babel/types": "^7.22.5", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -549,13 +548,13 @@ } }, "node_modules/@babel/types": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz", - "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz", + "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==", "dev": true, "dependencies": { - "@babel/helper-string-parser": "^7.19.4", - "@babel/helper-validator-identifier": "^7.19.1", + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.5", "to-fast-properties": "^2.0.0" }, "engines": { @@ -594,20 +593,20 @@ } }, "node_modules/@jest/console": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz", - "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.1.tgz", + "integrity": "sha512-Aj772AYgwTSr5w8qnyoJ0eDYvN6bMsH3ORH1ivMotrInHLKdUz6BDlaEXHdM6kODaBIkNIyQGzsMvRdOv7VG7Q==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.1", "@types/node": "*", "chalk": "^4.0.0", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", + "jest-message-util": "^29.6.1", + "jest-util": "^29.6.1", "slash": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/console/node_modules/ansi-styles": { @@ -659,6 +658,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/@jest/console/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/@jest/console/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -672,43 +680,42 @@ } }, "node_modules/@jest/core": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-28.1.3.tgz", - "integrity": "sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.1.tgz", + "integrity": "sha512-CcowHypRSm5oYQ1obz1wfvkjZZ2qoQlrKKvlfPwh5jUXVU12TWr2qMeH8chLMuTFzHh5a1g2yaqlqDICbr+ukQ==", "dev": true, "dependencies": { - "@jest/console": "^28.1.3", - "@jest/reporters": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/console": "^29.6.1", + "@jest/reporters": "^29.6.1", + "@jest/test-result": "^29.6.1", + "@jest/transform": "^29.6.1", + "@jest/types": "^29.6.1", "@types/node": "*", "ansi-escapes": "^4.2.1", "chalk": "^4.0.0", "ci-info": "^3.2.0", "exit": "^0.1.2", "graceful-fs": "^4.2.9", - "jest-changed-files": "^28.1.3", - "jest-config": "^28.1.3", - "jest-haste-map": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-resolve-dependencies": "^28.1.3", - "jest-runner": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "jest-watcher": "^28.1.3", + "jest-changed-files": "^29.5.0", + "jest-config": "^29.6.1", + "jest-haste-map": "^29.6.1", + "jest-message-util": "^29.6.1", + "jest-regex-util": "^29.4.3", + "jest-resolve": "^29.6.1", + "jest-resolve-dependencies": "^29.6.1", + "jest-runner": "^29.6.1", + "jest-runtime": "^29.6.1", + "jest-snapshot": "^29.6.1", + "jest-util": "^29.6.1", + "jest-validate": "^29.6.1", + "jest-watcher": "^29.6.1", "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "rimraf": "^3.0.0", + "pretty-format": "^29.6.1", "slash": "^3.0.0", "strip-ansi": "^6.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -777,6 +784,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/@jest/core/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/@jest/core/node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -802,88 +818,89 @@ } }, "node_modules/@jest/environment": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-28.1.3.tgz", - "integrity": "sha512-1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.1.tgz", + "integrity": "sha512-RMMXx4ws+Gbvw3DfLSuo2cfQlK7IwGbpuEWXCqyYDcqYTI+9Ju3a5hDnXaxjNsa6uKh9PQF2v+qg+RLe63tz5A==", "dev": true, "dependencies": { - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/fake-timers": "^29.6.1", + "@jest/types": "^29.6.1", "@types/node": "*", - "jest-mock": "^28.1.3" + "jest-mock": "^29.6.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.1.tgz", + "integrity": "sha512-N5xlPrAYaRNyFgVf2s9Uyyvr795jnB6rObuPx4QFvNJz8aAjpZUDfO4bh5G/xuplMID8PrnuF1+SfSyDxhsgYg==", "dev": true, "dependencies": { - "expect": "^28.1.3", - "jest-snapshot": "^28.1.3" + "expect": "^29.6.1", + "jest-snapshot": "^29.6.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/expect-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.3.tgz", - "integrity": "sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.1.tgz", + "integrity": "sha512-o319vIf5pEMx0LmzSxxkYYxo4wrRLKHq9dP1yJU7FoPTB0LfAKSz8SWD6D/6U3v/O52t9cF5t+MeJiRsfk7zMw==", "dev": true, "dependencies": { - "jest-get-type": "^28.0.2" + "jest-get-type": "^29.4.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/fake-timers": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.3.tgz", - "integrity": "sha512-D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.1.tgz", + "integrity": "sha512-RdgHgbXyosCDMVYmj7lLpUwXA4c69vcNzhrt69dJJdf8azUrpRh3ckFCaTPNjsEeRi27Cig0oKDGxy5j7hOgHg==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", - "@sinonjs/fake-timers": "^9.1.2", + "@jest/types": "^29.6.1", + "@sinonjs/fake-timers": "^10.0.2", "@types/node": "*", - "jest-message-util": "^28.1.3", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3" + "jest-message-util": "^29.6.1", + "jest-mock": "^29.6.1", + "jest-util": "^29.6.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/globals": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-28.1.3.tgz", - "integrity": "sha512-XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.1.tgz", + "integrity": "sha512-2VjpaGy78JY9n9370H8zGRCFbYVWwjY6RdDMhoJHa1sYfwe6XM/azGN0SjY8kk7BOZApIejQ1BFPyH7FPG0w3A==", "dev": true, "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/expect": "^28.1.3", - "@jest/types": "^28.1.3" + "@jest/environment": "^29.6.1", + "@jest/expect": "^29.6.1", + "@jest/types": "^29.6.1", + "jest-mock": "^29.6.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/reporters": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.3.tgz", - "integrity": "sha512-JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.1.tgz", + "integrity": "sha512-9zuaI9QKr9JnoZtFQlw4GREQbxgmNYXU6QuWtmuODvk5nvPUeBYapVR/VYMyi2WSx3jXTLJTJji8rN6+Cm4+FA==", "dev": true, "dependencies": { "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@jridgewell/trace-mapping": "^0.3.13", + "@jest/console": "^29.6.1", + "@jest/test-result": "^29.6.1", + "@jest/transform": "^29.6.1", + "@jest/types": "^29.6.1", + "@jridgewell/trace-mapping": "^0.3.18", "@types/node": "*", "chalk": "^4.0.0", "collect-v8-coverage": "^1.0.0", @@ -895,17 +912,16 @@ "istanbul-lib-report": "^3.0.0", "istanbul-lib-source-maps": "^4.0.0", "istanbul-reports": "^3.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", - "jest-worker": "^28.1.3", + "jest-message-util": "^29.6.1", + "jest-util": "^29.6.1", + "jest-worker": "^29.6.1", "slash": "^3.0.0", "string-length": "^4.0.1", "strip-ansi": "^6.0.0", - "terminal-link": "^2.0.0", "v8-to-istanbul": "^9.0.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -974,6 +990,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/@jest/reporters/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/@jest/reporters/node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -999,85 +1024,85 @@ } }, "node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "version": "29.6.0", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.0.tgz", + "integrity": "sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==", "dev": true, "dependencies": { - "@sinclair/typebox": "^0.24.1" + "@sinclair/typebox": "^0.27.8" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/source-map": { - "version": "28.1.2", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-28.1.2.tgz", - "integrity": "sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww==", + "version": "29.6.0", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.0.tgz", + "integrity": "sha512-oA+I2SHHQGxDCZpbrsCQSoMLb3Bz547JnM+jUr9qEbuw0vQlWZfpPS7CO9J7XiwKicEz9OFn/IYoLkkiUD7bzA==", "dev": true, "dependencies": { - "@jridgewell/trace-mapping": "^0.3.13", + "@jridgewell/trace-mapping": "^0.3.18", "callsites": "^3.0.0", "graceful-fs": "^4.2.9" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/test-result": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz", - "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.1.tgz", + "integrity": "sha512-Ynr13ZRcpX6INak0TPUukU8GWRfm/vAytE3JbJNGAvINySWYdfE7dGZMbk36oVuK4CigpbhMn8eg1dixZ7ZJOw==", "dev": true, "dependencies": { - "@jest/console": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/console": "^29.6.1", + "@jest/types": "^29.6.1", "@types/istanbul-lib-coverage": "^2.0.0", "collect-v8-coverage": "^1.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/test-sequencer": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz", - "integrity": "sha512-NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.1.tgz", + "integrity": "sha512-oBkC36PCDf/wb6dWeQIhaviU0l5u6VCsXa119yqdUosYAt7/FbQU2M2UoziO3igj/HBDEgp57ONQ3fm0v9uyyg==", "dev": true, "dependencies": { - "@jest/test-result": "^28.1.3", + "@jest/test-result": "^29.6.1", "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", + "jest-haste-map": "^29.6.1", "slash": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/transform": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-28.1.3.tgz", - "integrity": "sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.1.tgz", + "integrity": "sha512-URnTneIU3ZjRSaf906cvf6Hpox3hIeJXRnz3VDSw5/X93gR8ycdfSIEy19FlVx8NFmpN7fe3Gb1xF+NjXaQLWg==", "dev": true, "dependencies": { "@babel/core": "^7.11.6", - "@jest/types": "^28.1.3", - "@jridgewell/trace-mapping": "^0.3.13", + "@jest/types": "^29.6.1", + "@jridgewell/trace-mapping": "^0.3.18", "babel-plugin-istanbul": "^6.1.1", "chalk": "^4.0.0", - "convert-source-map": "^1.4.0", - "fast-json-stable-stringify": "^2.0.0", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-util": "^28.1.3", + "jest-haste-map": "^29.6.1", + "jest-regex-util": "^29.4.3", + "jest-util": "^29.6.1", "micromatch": "^4.0.4", "pirates": "^4.0.4", "slash": "^3.0.0", - "write-file-atomic": "^4.0.1" + "write-file-atomic": "^4.0.2" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/transform/node_modules/ansi-styles": { @@ -1129,6 +1154,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/@jest/transform/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/@jest/transform/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -1142,12 +1176,12 @@ } }, "node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz", + "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.0", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -1155,7 +1189,7 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/types/node_modules/ansi-styles": { @@ -1207,6 +1241,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/@jest/types/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/@jest/types/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -1220,13 +1263,14 @@ } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", - "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", "dev": true, "dependencies": { - "@jridgewell/set-array": "^1.0.0", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" }, "engines": { "node": ">=6.0.0" @@ -1251,43 +1295,58 @@ } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", - "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", + "version": "0.3.18", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz", + "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==", "dev": true, "dependencies": { "@jridgewell/resolve-uri": "3.1.0", "@jridgewell/sourcemap-codec": "1.4.14" } }, + "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": { + "version": "1.4.14", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", + "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", + "dev": true + }, + "node_modules/@nicolo-ribaudo/semver-v6": { + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/semver-v6/-/semver-v6-6.3.3.tgz", + "integrity": "sha512-3Yc1fUTs69MG/uZbJlLSI3JISMn2UV2rg+1D/vROUqZyh3l6iYHCs7GMp+M40ZD7yOdDbYjJcU1oTJhrc+dGKg==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", "dev": true }, "node_modules/@sinonjs/commons": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", - "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz", + "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==", "dev": true, "dependencies": { "type-detect": "4.0.8" } }, "node_modules/@sinonjs/fake-timers": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz", - "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", + "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", "dev": true, "dependencies": { - "@sinonjs/commons": "^1.7.0" + "@sinonjs/commons": "^3.0.0" } }, "node_modules/@tootallnate/once": { @@ -1300,13 +1359,13 @@ } }, "node_modules/@types/babel__core": { - "version": "7.1.20", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.20.tgz", - "integrity": "sha512-PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ==", + "version": "7.20.1", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.1.tgz", + "integrity": "sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==", "dev": true, "dependencies": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0", + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", "@types/babel__generator": "*", "@types/babel__template": "*", "@types/babel__traverse": "*" @@ -1332,12 +1391,12 @@ } }, "node_modules/@types/babel__traverse": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz", - "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==", + "version": "7.20.1", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.1.tgz", + "integrity": "sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==", "dev": true, "dependencies": { - "@babel/types": "^7.3.0" + "@babel/types": "^7.20.7" } }, "node_modules/@types/graceful-fs": { @@ -1374,32 +1433,26 @@ } }, "node_modules/@types/jsdom": { - "version": "16.2.15", - "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-16.2.15.tgz", - "integrity": "sha512-nwF87yjBKuX/roqGYerZZM0Nv1pZDMAT5YhOHYeM/72Fic+VEqJh4nyoqoapzJnW3pUlfxPY5FhgsJtM+dRnQQ==", + "version": "20.0.1", + "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.1.tgz", + "integrity": "sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==", "dev": true, "dependencies": { "@types/node": "*", - "@types/parse5": "^6.0.3", - "@types/tough-cookie": "*" + "@types/tough-cookie": "*", + "parse5": "^7.0.0" } }, "node_modules/@types/node": { - "version": "18.11.18", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", - "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==", - "dev": true - }, - "node_modules/@types/parse5": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.3.tgz", - "integrity": "sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==", + "version": "20.4.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.1.tgz", + "integrity": "sha512-JIzsAvJeA/5iY6Y/OxZbv1lUcc8dNSE77lb2gnBH+/PJ3lFR1Ccvgwl5JWnHAkNHcRsT0TbpVOsiMKZ1F/yyJg==", "dev": true }, "node_modules/@types/prettier": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.2.tgz", - "integrity": "sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==", + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz", + "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==", "dev": true }, "node_modules/@types/stack-utils": { @@ -1415,9 +1468,9 @@ "dev": true }, "node_modules/@types/yargs": { - "version": "17.0.19", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.19.tgz", - "integrity": "sha512-cAx3qamwaYX9R0fzOIZAlFpo4A+1uBVCxqpKz9D26uTF4srRXaGTTsikQmaotCtNdbhzyUH7ft6p9ktz9s6UNQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" @@ -1442,9 +1495,9 @@ "dev": true }, "node_modules/acorn": { - "version": "8.8.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", - "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", + "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -1454,31 +1507,19 @@ } }, "node_modules/acorn-globals": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", - "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz", + "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==", "dev": true, "dependencies": { - "acorn": "^7.1.1", - "acorn-walk": "^7.1.1" - } - }, - "node_modules/acorn-globals/node_modules/acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" + "acorn": "^8.1.0", + "acorn-walk": "^8.0.2" } }, "node_modules/acorn-walk": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", - "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", + "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", "dev": true, "engines": { "node": ">=0.4.0" @@ -1582,21 +1623,21 @@ "dev": true }, "node_modules/babel-jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.3.tgz", - "integrity": "sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.1.tgz", + "integrity": "sha512-qu+3bdPEQC6KZSPz+4Fyjbga5OODNcp49j6GKzG1EKbkfyJBxEYGVUmVGpwCSeGouG52R4EgYMLb6p9YeEEQ4A==", "dev": true, "dependencies": { - "@jest/transform": "^28.1.3", + "@jest/transform": "^29.6.1", "@types/babel__core": "^7.1.14", "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^28.1.3", + "babel-preset-jest": "^29.5.0", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", "slash": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "@babel/core": "^7.8.0" @@ -1651,6 +1692,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/babel-jest/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/babel-jest/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -1680,9 +1730,9 @@ } }, "node_modules/babel-plugin-jest-hoist": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz", - "integrity": "sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q==", + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz", + "integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==", "dev": true, "dependencies": { "@babel/template": "^7.3.3", @@ -1691,7 +1741,7 @@ "@types/babel__traverse": "^7.0.6" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/babel-preset-current-node-syntax": { @@ -1718,16 +1768,16 @@ } }, "node_modules/babel-preset-jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz", - "integrity": "sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A==", + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz", + "integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==", "dev": true, "dependencies": { - "babel-plugin-jest-hoist": "^28.1.3", + "babel-plugin-jest-hoist": "^29.5.0", "babel-preset-current-node-syntax": "^1.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "@babel/core": "^7.0.0" @@ -1761,16 +1811,10 @@ "node": ">=8" } }, - "node_modules/browser-process-hrtime": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", - "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", - "dev": true - }, "node_modules/browserslist": { - "version": "4.21.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", - "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", + "version": "4.21.9", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz", + "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==", "dev": true, "funding": [ { @@ -1780,13 +1824,17 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "caniuse-lite": "^1.0.30001400", - "electron-to-chromium": "^1.4.251", - "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.9" + "caniuse-lite": "^1.0.30001503", + "electron-to-chromium": "^1.4.431", + "node-releases": "^2.0.12", + "update-browserslist-db": "^1.0.11" }, "bin": { "browserslist": "cli.js" @@ -1829,9 +1877,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001442", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz", - "integrity": "sha512-239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow==", + "version": "1.0.30001514", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001514.tgz", + "integrity": "sha512-ENcIpYBmwAAOm/V2cXgM7rZUrKKaqisZl4ZAI520FIkqGXUxJjmaIssbRW5HVVR5tyV6ygTLIm15aU8LUmQSaQ==", "dev": true, "funding": [ { @@ -1841,6 +1889,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ] }, @@ -1870,9 +1922,9 @@ } }, "node_modules/ci-info": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.1.tgz", - "integrity": "sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==", + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz", + "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==", "dev": true, "funding": [ { @@ -1885,9 +1937,9 @@ } }, "node_modules/cjs-module-lexer": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz", - "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz", + "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==", "dev": true }, "node_modules/cliui": { @@ -1936,9 +1988,9 @@ } }, "node_modules/collect-v8-coverage": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", - "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", + "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", "dev": true }, "node_modules/color-convert": { @@ -1984,9 +2036,9 @@ "dev": true }, "node_modules/convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", "dev": true }, "node_modules/cross-spawn": { @@ -2123,23 +2175,10 @@ "node": ">=12" } }, - "node_modules/data-urls/node_modules/whatwg-url": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", - "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", - "dev": true, - "dependencies": { - "tr46": "^3.0.0", - "webidl-conversions": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, "node_modules/dateformat": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", - "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==", + "version": "4.6.3", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz", + "integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==", "dev": true, "engines": { "node": "*" @@ -2183,16 +2222,10 @@ "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", "dev": true }, - "node_modules/deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true - }, "node_modules/deepmerge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", - "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", "dev": true, "engines": { "node": ">=0.10.0" @@ -2226,12 +2259,12 @@ } }, "node_modules/diff-sequences": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz", - "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==", + "version": "29.4.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz", + "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==", "dev": true, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/doctrine": { @@ -2259,15 +2292,15 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.284", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", - "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==", + "version": "1.4.454", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.454.tgz", + "integrity": "sha512-pmf1rbAStw8UEQ0sr2cdJtWl48ZMuPD9Sto8HVQOq9vx9j2WgDEN6lYoaqFvqEHYOmGA9oRGn7LqWI9ta0YugQ==", "dev": true }, "node_modules/emittery": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz", - "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==", + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", + "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", "dev": true, "engines": { "node": ">=12" @@ -2319,15 +2352,14 @@ } }, "node_modules/escodegen": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", - "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", + "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", "dev": true, "dependencies": { "esprima": "^4.0.1", "estraverse": "^5.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1" + "esutils": "^2.0.2" }, "bin": { "escodegen": "bin/escodegen.js", @@ -2422,19 +2454,20 @@ } }, "node_modules/expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.1.tgz", + "integrity": "sha512-XEdDLonERCU1n9uR56/Stx9OqojaLAQtZf9PrCHH9Hl8YXiEIka3H4NXJ3NOIBmQJTg7+j7buh34PMHfJujc8g==", "dev": true, "dependencies": { - "@jest/expect-utils": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3" + "@jest/expect-utils": "^29.6.1", + "@types/node": "*", + "jest-get-type": "^29.4.3", + "jest-matcher-utils": "^29.6.1", + "jest-message-util": "^29.6.1", + "jest-util": "^29.6.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/extend": { @@ -2455,12 +2488,6 @@ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", "dev": true }, - "node_modules/fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true - }, "node_modules/fb-watchman": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", @@ -2508,31 +2535,18 @@ } }, "node_modules/findup-sync": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz", - "integrity": "sha512-z8Nrwhi6wzxNMIbxlrTzuUW6KWuKkogZ/7OdDVq+0+kxn77KUH1nipx8iU6suqkHqc4y6n7a9A8IpmxY/pTjWg==", - "dev": true, - "dependencies": { - "glob": "~5.0.0" - }, - "engines": { - "node": ">= 0.6.0" - } - }, - "node_modules/findup-sync/node_modules/glob": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz", + "integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==", "dev": true, "dependencies": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "detect-file": "^1.0.0", + "is-glob": "^4.0.3", + "micromatch": "^4.0.4", + "resolve-dir": "^1.0.1" }, "engines": { - "node": "*" + "node": ">= 10.13.0" } }, "node_modules/fined": { @@ -2746,38 +2760,36 @@ } }, "node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true }, "node_modules/grunt": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.3.tgz", - "integrity": "sha512-mKwmo4X2d8/4c/BmcOETHek675uOqw0RuA/zy12jaspWqvTp4+ZeQF1W+OTpcbncnaBsfbQJ6l0l4j+Sn/GmaQ==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.6.1.tgz", + "integrity": "sha512-/ABUy3gYWu5iBmrUSRBP97JLpQUm0GgVveDCp6t3yRNIoltIYw7rEj3g5y1o2PGPR2vfTRGa7WC/LZHLTXnEzA==", "dev": true, "dependencies": { - "dateformat": "~3.0.3", + "dateformat": "~4.6.2", "eventemitter2": "~0.4.13", "exit": "~0.1.2", - "findup-sync": "~0.3.0", + "findup-sync": "~5.0.0", "glob": "~7.1.6", "grunt-cli": "~1.4.3", "grunt-known-options": "~2.0.0", "grunt-legacy-log": "~3.0.0", "grunt-legacy-util": "~2.0.1", - "iconv-lite": "~0.4.13", + "iconv-lite": "~0.6.3", "js-yaml": "~3.14.0", "minimatch": "~3.0.4", - "mkdirp": "~1.0.4", - "nopt": "~3.0.6", - "rimraf": "~3.0.2" + "nopt": "~3.0.6" }, "bin": { "grunt": "bin/grunt" }, "engines": { - "node": ">=8" + "node": ">=16" } }, "node_modules/grunt-cli": { @@ -2828,18 +2840,6 @@ "grunt": ">=0.4.5" } }, - "node_modules/grunt-contrib-clean/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, "node_modules/grunt-contrib-copy": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-1.0.0.tgz", @@ -2939,6 +2939,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/grunt-legacy-log-utils/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/grunt-legacy-log-utils/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -2970,9 +2979,9 @@ } }, "node_modules/grunt-modernizr": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/grunt-modernizr/-/grunt-modernizr-3.0.3.tgz", - "integrity": "sha512-EvcLpa/ohGVSWbK+QaWF6eVgX+jAa4TiU06MaZyZDdhG/wvJAphWFDf0DwsEt/bIfL2svw01O2fuhdfW9gah6g==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/grunt-modernizr/-/grunt-modernizr-3.0.4.tgz", + "integrity": "sha512-+DCKYS7MUAcqDLVEgymXb7lnvzPyUZxju2N4xqvPQl3SO132VmQYMjfKJLOw7uwc+blGSd6QdMD5RFwEY4sZVA==", "dev": true, "dependencies": { "customizr": "^2.0.4", @@ -3010,12 +3019,12 @@ } }, "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true, "engines": { - "node": ">=8" + "node": ">=4" } }, "node_modules/homedir-polyfill": { @@ -3094,12 +3103,12 @@ } }, "node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": ">= 2.1.2 < 3.0.0" }, "engines": { "node": ">=0.10.0" @@ -3181,9 +3190,9 @@ "dev": true }, "node_modules/is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz", + "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==", "dev": true, "dependencies": { "has": "^1.0.3" @@ -3357,6 +3366,15 @@ "node": ">=8" } }, + "node_modules/istanbul-lib-report/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/istanbul-lib-report/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -3397,21 +3415,21 @@ } }, "node_modules/jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest/-/jest-28.1.3.tgz", - "integrity": "sha512-N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.1.tgz", + "integrity": "sha512-Nirw5B4nn69rVUZtemCQhwxOBhm0nsp3hmtF4rzCeWD7BkjAXRIji7xWQfnTNbz9g0aVsBX6aZK3n+23LM6uDw==", "dev": true, "dependencies": { - "@jest/core": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/core": "^29.6.1", + "@jest/types": "^29.6.1", "import-local": "^3.0.2", - "jest-cli": "^28.1.3" + "jest-cli": "^29.6.1" }, "bin": { "jest": "bin/jest.js" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -3423,46 +3441,47 @@ } }, "node_modules/jest-changed-files": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.1.3.tgz", - "integrity": "sha512-esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA==", + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.5.0.tgz", + "integrity": "sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==", "dev": true, "dependencies": { "execa": "^5.0.0", "p-limit": "^3.1.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-circus": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.3.tgz", - "integrity": "sha512-cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.1.tgz", + "integrity": "sha512-tPbYLEiBU4MYAL2XoZme/bgfUeotpDBd81lgHLCbDZZFaGmECk0b+/xejPFtmiBP87GgP/y4jplcRpbH+fgCzQ==", "dev": true, "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/expect": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/environment": "^29.6.1", + "@jest/expect": "^29.6.1", + "@jest/test-result": "^29.6.1", + "@jest/types": "^29.6.1", "@types/node": "*", "chalk": "^4.0.0", "co": "^4.6.0", "dedent": "^0.7.0", "is-generator-fn": "^2.0.0", - "jest-each": "^28.1.3", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", + "jest-each": "^29.6.1", + "jest-matcher-utils": "^29.6.1", + "jest-message-util": "^29.6.1", + "jest-runtime": "^29.6.1", + "jest-snapshot": "^29.6.1", + "jest-util": "^29.6.1", "p-limit": "^3.1.0", - "pretty-format": "^28.1.3", + "pretty-format": "^29.6.1", + "pure-rand": "^6.0.0", "slash": "^3.0.0", "stack-utils": "^2.0.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-circus/node_modules/ansi-styles": { @@ -3514,6 +3533,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/jest-circus/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-circus/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -3527,21 +3555,21 @@ } }, "node_modules/jest-cli": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.3.tgz", - "integrity": "sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.1.tgz", + "integrity": "sha512-607dSgTA4ODIN6go9w6xY3EYkyPFGicx51a69H7yfvt7lN53xNswEVLovq+E77VsTRi5fWprLH0yl4DJgE8Ing==", "dev": true, "dependencies": { - "@jest/core": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/core": "^29.6.1", + "@jest/test-result": "^29.6.1", + "@jest/types": "^29.6.1", "chalk": "^4.0.0", "exit": "^0.1.2", "graceful-fs": "^4.2.9", "import-local": "^3.0.2", - "jest-config": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", + "jest-config": "^29.6.1", + "jest-util": "^29.6.1", + "jest-validate": "^29.6.1", "prompts": "^2.0.1", "yargs": "^17.3.1" }, @@ -3549,7 +3577,7 @@ "jest": "bin/jest.js" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -3609,6 +3637,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/jest-cli/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-cli/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -3622,36 +3659,36 @@ } }, "node_modules/jest-config": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-28.1.3.tgz", - "integrity": "sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.1.tgz", + "integrity": "sha512-XdjYV2fy2xYixUiV2Wc54t3Z4oxYPAELUzWnV6+mcbq0rh742X2p52pii5A3oeRzYjLnQxCsZmp0qpI6klE2cQ==", "dev": true, "dependencies": { "@babel/core": "^7.11.6", - "@jest/test-sequencer": "^28.1.3", - "@jest/types": "^28.1.3", - "babel-jest": "^28.1.3", + "@jest/test-sequencer": "^29.6.1", + "@jest/types": "^29.6.1", + "babel-jest": "^29.6.1", "chalk": "^4.0.0", "ci-info": "^3.2.0", "deepmerge": "^4.2.2", "glob": "^7.1.3", "graceful-fs": "^4.2.9", - "jest-circus": "^28.1.3", - "jest-environment-node": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-runner": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", + "jest-circus": "^29.6.1", + "jest-environment-node": "^29.6.1", + "jest-get-type": "^29.4.3", + "jest-regex-util": "^29.4.3", + "jest-resolve": "^29.6.1", + "jest-runner": "^29.6.1", + "jest-util": "^29.6.1", + "jest-validate": "^29.6.1", "micromatch": "^4.0.4", "parse-json": "^5.2.0", - "pretty-format": "^28.1.3", + "pretty-format": "^29.6.1", "slash": "^3.0.0", "strip-json-comments": "^3.1.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "@types/node": "*", @@ -3715,6 +3752,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/jest-config/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-config/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -3728,18 +3774,18 @@ } }, "node_modules/jest-diff": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz", - "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.1.tgz", + "integrity": "sha512-FsNCvinvl8oVxpNLttNQX7FAq7vR+gMDGj90tiP7siWw1UdakWUGqrylpsYrpvj908IYckm5Y0Q7azNAozU1Kg==", "dev": true, "dependencies": { "chalk": "^4.0.0", - "diff-sequences": "^28.1.1", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" + "diff-sequences": "^29.4.3", + "jest-get-type": "^29.4.3", + "pretty-format": "^29.6.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-diff/node_modules/ansi-styles": { @@ -3791,6 +3837,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/jest-diff/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-diff/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -3804,31 +3859,31 @@ } }, "node_modules/jest-docblock": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-28.1.1.tgz", - "integrity": "sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==", + "version": "29.4.3", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.4.3.tgz", + "integrity": "sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==", "dev": true, "dependencies": { "detect-newline": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-each": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-28.1.3.tgz", - "integrity": "sha512-arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.6.1.tgz", + "integrity": "sha512-n5eoj5eiTHpKQCAVcNTT7DRqeUmJ01hsAL0Q1SMiBHcBcvTKDELixQOGMCpqhbIuTcfC4kMfSnpmDqRgRJcLNQ==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.1", "chalk": "^4.0.0", - "jest-get-type": "^28.0.2", - "jest-util": "^28.1.3", - "pretty-format": "^28.1.3" + "jest-get-type": "^29.4.3", + "jest-util": "^29.6.1", + "pretty-format": "^29.6.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-each/node_modules/ansi-styles": { @@ -3880,6 +3935,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/jest-each/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-each/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -3893,101 +3957,109 @@ } }, "node_modules/jest-environment-jsdom": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-28.1.3.tgz", - "integrity": "sha512-HnlGUmZRdxfCByd3GM2F100DgQOajUBzEitjGqIREcb45kGjZvRrKUdlaF6escXBdcXNl0OBh+1ZrfeZT3GnAg==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.1.tgz", + "integrity": "sha512-PoY+yLaHzVRhVEjcVKSfJ7wXmJW4UqPYNhR05h7u/TK0ouf6DmRNZFBL/Z00zgQMyWGMBXn69/FmOvhEJu8cIw==", "dev": true, "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/jsdom": "^16.2.4", + "@jest/environment": "^29.6.1", + "@jest/fake-timers": "^29.6.1", + "@jest/types": "^29.6.1", + "@types/jsdom": "^20.0.0", "@types/node": "*", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3", - "jsdom": "^19.0.0" + "jest-mock": "^29.6.1", + "jest-util": "^29.6.1", + "jsdom": "^20.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } } }, "node_modules/jest-environment-node": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.3.tgz", - "integrity": "sha512-ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.1.tgz", + "integrity": "sha512-ZNIfAiE+foBog24W+2caIldl4Irh8Lx1PUhg/GZ0odM1d/h2qORAsejiFc7zb+SEmYPn1yDZzEDSU5PmDkmVLQ==", "dev": true, "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/environment": "^29.6.1", + "@jest/fake-timers": "^29.6.1", + "@jest/types": "^29.6.1", "@types/node": "*", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3" + "jest-mock": "^29.6.1", + "jest-util": "^29.6.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", + "version": "29.4.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz", + "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==", "dev": true, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-haste-map": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.3.tgz", - "integrity": "sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.1.tgz", + "integrity": "sha512-0m7f9PZXxOCk1gRACiVgX85knUKPKLPg4oRCjLoqIm9brTHXaorMA0JpmtmVkQiT8nmXyIVoZd/nnH1cfC33ig==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.1", "@types/graceful-fs": "^4.1.3", "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", "graceful-fs": "^4.2.9", - "jest-regex-util": "^28.0.2", - "jest-util": "^28.1.3", - "jest-worker": "^28.1.3", + "jest-regex-util": "^29.4.3", + "jest-util": "^29.6.1", + "jest-worker": "^29.6.1", "micromatch": "^4.0.4", "walker": "^1.0.8" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "optionalDependencies": { "fsevents": "^2.3.2" } }, "node_modules/jest-leak-detector": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz", - "integrity": "sha512-WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.6.1.tgz", + "integrity": "sha512-OrxMNyZirpOEwkF3UHnIkAiZbtkBWiye+hhBweCHkVbCgyEy71Mwbb5zgeTNYWJBi1qgDVfPC1IwO9dVEeTLwQ==", "dev": true, "dependencies": { - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" + "jest-get-type": "^29.4.3", + "pretty-format": "^29.6.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-matcher-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz", - "integrity": "sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.1.tgz", + "integrity": "sha512-SLaztw9d2mfQQKHmJXKM0HCbl2PPVld/t9Xa6P9sgiExijviSp7TnZZpw2Fpt+OI3nwUO/slJbOfzfUMKKC5QA==", "dev": true, "dependencies": { "chalk": "^4.0.0", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" + "jest-diff": "^29.6.1", + "jest-get-type": "^29.4.3", + "pretty-format": "^29.6.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-matcher-utils/node_modules/ansi-styles": { @@ -4039,6 +4111,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/jest-matcher-utils/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-matcher-utils/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -4052,23 +4133,23 @@ } }, "node_modules/jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.1.tgz", + "integrity": "sha512-KoAW2zAmNSd3Gk88uJ56qXUWbFk787QKmjjJVOjtGFmmGSZgDBrlIL4AfQw1xyMYPNVD7dNInfIbur9B2rd/wQ==", "dev": true, "dependencies": { "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.1", "@types/stack-utils": "^2.0.0", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", + "pretty-format": "^29.6.1", "slash": "^3.0.0", "stack-utils": "^2.0.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-message-util/node_modules/ansi-styles": { @@ -4120,6 +4201,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/jest-message-util/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-message-util/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -4133,16 +4223,17 @@ } }, "node_modules/jest-mock": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.3.tgz", - "integrity": "sha512-o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.1.tgz", + "integrity": "sha512-brovyV9HBkjXAEdRooaTQK42n8usKoSRR3gihzUpYeV/vwqgSoNfrksO7UfSACnPmxasO/8TmHM3w9Hp3G1dgw==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*" + "@jest/types": "^29.6.1", + "@types/node": "*", + "jest-util": "^29.6.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-pnp-resolver": { @@ -4163,45 +4254,45 @@ } }, "node_modules/jest-regex-util": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz", - "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==", + "version": "29.4.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz", + "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==", "dev": true, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-resolve": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.3.tgz", - "integrity": "sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.1.tgz", + "integrity": "sha512-AeRkyS8g37UyJiP9w3mmI/VXU/q8l/IH52vj/cDAyScDcemRbSBhfX/NMYIGilQgSVwsjxrCHf3XJu4f+lxCMg==", "dev": true, "dependencies": { "chalk": "^4.0.0", "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", + "jest-haste-map": "^29.6.1", "jest-pnp-resolver": "^1.2.2", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", + "jest-util": "^29.6.1", + "jest-validate": "^29.6.1", "resolve": "^1.20.0", - "resolve.exports": "^1.1.0", + "resolve.exports": "^2.0.0", "slash": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-resolve-dependencies": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz", - "integrity": "sha512-qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.1.tgz", + "integrity": "sha512-BbFvxLXtcldaFOhNMXmHRWx1nXQO5LoXiKSGQcA1LxxirYceZT6ch8KTE1bK3X31TNG/JbkI7OkS/ABexVahiw==", "dev": true, "dependencies": { - "jest-regex-util": "^28.0.2", - "jest-snapshot": "^28.1.3" + "jest-regex-util": "^29.4.3", + "jest-snapshot": "^29.6.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-resolve/node_modules/ansi-styles": { @@ -4253,6 +4344,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/jest-resolve/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-resolve/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -4266,35 +4366,35 @@ } }, "node_modules/jest-runner": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.3.tgz", - "integrity": "sha512-GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.1.tgz", + "integrity": "sha512-tw0wb2Q9yhjAQ2w8rHRDxteryyIck7gIzQE4Reu3JuOBpGp96xWgF0nY8MDdejzrLCZKDcp8JlZrBN/EtkQvPQ==", "dev": true, "dependencies": { - "@jest/console": "^28.1.3", - "@jest/environment": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/console": "^29.6.1", + "@jest/environment": "^29.6.1", + "@jest/test-result": "^29.6.1", + "@jest/transform": "^29.6.1", + "@jest/types": "^29.6.1", "@types/node": "*", "chalk": "^4.0.0", - "emittery": "^0.10.2", + "emittery": "^0.13.1", "graceful-fs": "^4.2.9", - "jest-docblock": "^28.1.1", - "jest-environment-node": "^28.1.3", - "jest-haste-map": "^28.1.3", - "jest-leak-detector": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-resolve": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-util": "^28.1.3", - "jest-watcher": "^28.1.3", - "jest-worker": "^28.1.3", + "jest-docblock": "^29.4.3", + "jest-environment-node": "^29.6.1", + "jest-haste-map": "^29.6.1", + "jest-leak-detector": "^29.6.1", + "jest-message-util": "^29.6.1", + "jest-resolve": "^29.6.1", + "jest-runtime": "^29.6.1", + "jest-util": "^29.6.1", + "jest-watcher": "^29.6.1", + "jest-worker": "^29.6.1", "p-limit": "^3.1.0", "source-map-support": "0.5.13" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-runner/node_modules/ansi-styles": { @@ -4346,6 +4446,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/jest-runner/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-runner/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -4359,36 +4468,36 @@ } }, "node_modules/jest-runtime": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.3.tgz", - "integrity": "sha512-NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw==", - "dev": true, - "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/globals": "^28.1.3", - "@jest/source-map": "^28.1.2", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.1.tgz", + "integrity": "sha512-D6/AYOA+Lhs5e5il8+5pSLemjtJezUr+8zx+Sn8xlmOux3XOqx4d8l/2udBea8CRPqqrzhsKUsN/gBDE/IcaPQ==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.6.1", + "@jest/fake-timers": "^29.6.1", + "@jest/globals": "^29.6.1", + "@jest/source-map": "^29.6.0", + "@jest/test-result": "^29.6.1", + "@jest/transform": "^29.6.1", + "@jest/types": "^29.6.1", + "@types/node": "*", "chalk": "^4.0.0", "cjs-module-lexer": "^1.0.0", "collect-v8-coverage": "^1.0.0", - "execa": "^5.0.0", "glob": "^7.1.3", "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-mock": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", + "jest-haste-map": "^29.6.1", + "jest-message-util": "^29.6.1", + "jest-mock": "^29.6.1", + "jest-regex-util": "^29.4.3", + "jest-resolve": "^29.6.1", + "jest-snapshot": "^29.6.1", + "jest-util": "^29.6.1", "slash": "^3.0.0", "strip-bom": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-runtime/node_modules/ansi-styles": { @@ -4440,6 +4549,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/jest-runtime/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-runtime/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -4453,37 +4571,35 @@ } }, "node_modules/jest-snapshot": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.3.tgz", - "integrity": "sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.1.tgz", + "integrity": "sha512-G4UQE1QQ6OaCgfY+A0uR1W2AY0tGXUPQpoUClhWHq1Xdnx1H6JOrC2nH5lqnOEqaDgbHFgIwZ7bNq24HpB180A==", "dev": true, "dependencies": { "@babel/core": "^7.11.6", "@babel/generator": "^7.7.2", + "@babel/plugin-syntax-jsx": "^7.7.2", "@babel/plugin-syntax-typescript": "^7.7.2", - "@babel/traverse": "^7.7.2", "@babel/types": "^7.3.3", - "@jest/expect-utils": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/babel__traverse": "^7.0.6", + "@jest/expect-utils": "^29.6.1", + "@jest/transform": "^29.6.1", + "@jest/types": "^29.6.1", "@types/prettier": "^2.1.5", "babel-preset-current-node-syntax": "^1.0.0", "chalk": "^4.0.0", - "expect": "^28.1.3", + "expect": "^29.6.1", "graceful-fs": "^4.2.9", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-haste-map": "^28.1.3", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", + "jest-diff": "^29.6.1", + "jest-get-type": "^29.4.3", + "jest-matcher-utils": "^29.6.1", + "jest-message-util": "^29.6.1", + "jest-util": "^29.6.1", "natural-compare": "^1.4.0", - "pretty-format": "^28.1.3", - "semver": "^7.3.5" + "pretty-format": "^29.6.1", + "semver": "^7.5.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-snapshot/node_modules/ansi-styles": { @@ -4535,6 +4651,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/jest-snapshot/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-snapshot/node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -4548,9 +4673,9 @@ } }, "node_modules/jest-snapshot/node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -4581,12 +4706,12 @@ "dev": true }, "node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.1.tgz", + "integrity": "sha512-NRFCcjc+/uO3ijUVyNOQJluf8PtGCe/W6cix36+M3cTFgiYqFOOW5MgN4JOOcvbUhcKTYVd1CvHz/LWi8d16Mg==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.1", "@types/node": "*", "chalk": "^4.0.0", "ci-info": "^3.2.0", @@ -4594,7 +4719,7 @@ "picomatch": "^2.2.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-util/node_modules/ansi-styles": { @@ -4646,6 +4771,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/jest-util/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-util/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -4659,20 +4793,20 @@ } }, "node_modules/jest-validate": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.3.tgz", - "integrity": "sha512-SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.1.tgz", + "integrity": "sha512-r3Ds69/0KCN4vx4sYAbGL1EVpZ7MSS0vLmd3gV78O+NAx3PDQQukRU5hNHPXlyqCgFY8XUk7EuTMLugh0KzahA==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.1", "camelcase": "^6.2.0", "chalk": "^4.0.0", - "jest-get-type": "^28.0.2", + "jest-get-type": "^29.4.3", "leven": "^3.1.0", - "pretty-format": "^28.1.3" + "pretty-format": "^29.6.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-validate/node_modules/ansi-styles": { @@ -4736,6 +4870,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/jest-validate/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-validate/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -4749,22 +4892,22 @@ } }, "node_modules/jest-watcher": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz", - "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.1.tgz", + "integrity": "sha512-d4wpjWTS7HEZPaaj8m36QiaP856JthRZkrgcIY/7ISoUWPIillrXM23WPboZVLbiwZBt4/qn2Jke84Sla6JhFA==", "dev": true, "dependencies": { - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/test-result": "^29.6.1", + "@jest/types": "^29.6.1", "@types/node": "*", "ansi-escapes": "^4.2.1", "chalk": "^4.0.0", - "emittery": "^0.10.2", - "jest-util": "^28.1.3", + "emittery": "^0.13.1", + "jest-util": "^29.6.1", "string-length": "^4.0.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-watcher/node_modules/ansi-styles": { @@ -4816,6 +4959,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/jest-watcher/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-watcher/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -4829,17 +4981,27 @@ } }, "node_modules/jest-worker": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", - "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.1.tgz", + "integrity": "sha512-U+Wrbca7S8ZAxAe9L6nb6g8kPdia5hj32Puu5iOqBCMTMWFHXuK6dOV2IFrpedbTV8fjMFLdWNttQTBL6u2MRA==", "dev": true, "dependencies": { "@types/node": "*", + "jest-util": "^29.6.1", "merge-stream": "^2.0.0", "supports-color": "^8.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-worker/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" } }, "node_modules/jest-worker/node_modules/supports-color": { @@ -4914,41 +5076,40 @@ } }, "node_modules/jsdom": { - "version": "19.0.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz", - "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==", + "version": "20.0.3", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz", + "integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==", "dev": true, "dependencies": { - "abab": "^2.0.5", - "acorn": "^8.5.0", - "acorn-globals": "^6.0.0", + "abab": "^2.0.6", + "acorn": "^8.8.1", + "acorn-globals": "^7.0.0", "cssom": "^0.5.0", "cssstyle": "^2.3.0", - "data-urls": "^3.0.1", - "decimal.js": "^10.3.1", + "data-urls": "^3.0.2", + "decimal.js": "^10.4.2", "domexception": "^4.0.0", "escodegen": "^2.0.0", "form-data": "^4.0.0", "html-encoding-sniffer": "^3.0.0", "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.1", "is-potential-custom-element-name": "^1.0.1", - "nwsapi": "^2.2.0", - "parse5": "6.0.1", - "saxes": "^5.0.1", + "nwsapi": "^2.2.2", + "parse5": "^7.1.1", + "saxes": "^6.0.0", "symbol-tree": "^3.2.4", - "tough-cookie": "^4.0.0", - "w3c-hr-time": "^1.0.2", - "w3c-xmlserializer": "^3.0.0", + "tough-cookie": "^4.1.2", + "w3c-xmlserializer": "^4.0.0", "webidl-conversions": "^7.0.0", "whatwg-encoding": "^2.0.0", "whatwg-mimetype": "^3.0.0", - "whatwg-url": "^10.0.0", - "ws": "^8.2.3", + "whatwg-url": "^11.0.0", + "ws": "^8.11.0", "xml-name-validator": "^4.0.0" }, "engines": { - "node": ">=12" + "node": ">=14" }, "peerDependencies": { "canvas": "^2.5.0" @@ -5016,19 +5177,6 @@ "node": ">=6" } }, - "node_modules/levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", - "dev": true, - "dependencies": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, "node_modules/liftup": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/liftup/-/liftup-3.0.1.tgz", @@ -5246,9 +5394,9 @@ } }, "node_modules/minimist": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", - "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5438,9 +5586,9 @@ "dev": true }, "node_modules/node-releases": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz", - "integrity": "sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==", + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", + "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", "dev": true }, "node_modules/nopt": { @@ -5482,9 +5630,9 @@ } }, "node_modules/nwsapi": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz", - "integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==", + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz", + "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==", "dev": true }, "node_modules/object.defaults": { @@ -5556,23 +5704,6 @@ "resolved": "git+ssh://git@github.com/FontFaceKit/open-sans.git#59493162b016dae6ef0d06693ccf3c93c1e96091", "license": "Apache-2.0" }, - "node_modules/optionator": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", - "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", - "dev": true, - "dependencies": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.6", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "word-wrap": "~1.2.3" - }, - "engines": { - "node": ">= 0.8.0" - } - }, "node_modules/os-homedir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", @@ -5694,10 +5825,28 @@ } }, "node_modules/parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", - "dev": true + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", + "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", + "dev": true, + "dependencies": { + "entities": "^4.4.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, + "node_modules/parse5/node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true, + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } }, "node_modules/path-exists": { "version": "4.0.0", @@ -5781,9 +5930,9 @@ } }, "node_modules/pirates": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz", - "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", + "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", "dev": true, "engines": { "node": ">= 6" @@ -5806,37 +5955,18 @@ "resolved": "https://registry.npmjs.org/pocketgrid-less/-/pocketgrid-less-1.0.1.tgz", "integrity": "sha512-89F9g6RuIfc7fWO5fuBkf8gb1LqxwCuukCDojBpjbgbHA6utnX+UEwGUn92rXciCFQTtkIzewYjtRzLLg2adpQ==" }, - "node_modules/prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, "node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.1.tgz", + "integrity": "sha512-7jRj+yXO0W7e4/tSJKoR7HRIHLPPjtNaUGG2xxKQnGvPNRkgWcQ0AZX6P4KBRJN4FcTBWb3sa7DVUJmocYuoog==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", + "@jest/schemas": "^29.6.0", "ansi-styles": "^5.0.0", "react-is": "^18.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/pretty-format/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "engines": { - "node": ">=8" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/pretty-format/node_modules/ansi-styles": { @@ -5877,14 +6007,30 @@ "dev": true }, "node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", "dev": true, "engines": { "node": ">=6" } }, + "node_modules/pure-rand": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.2.tgz", + "integrity": "sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/dubzzz" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fast-check" + } + ] + }, "node_modules/querystringify": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", @@ -5944,12 +6090,12 @@ "dev": true }, "node_modules/resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "version": "1.22.2", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz", + "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==", "dev": true, "dependencies": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.11.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -5995,27 +6141,24 @@ } }, "node_modules/resolve.exports": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz", - "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz", + "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==", "dev": true, "engines": { "node": ">=10" } }, "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "dependencies": { "glob": "^7.1.3" }, "bin": { "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" } }, "node_modules/safer-buffer": { @@ -6025,15 +6168,15 @@ "dev": true }, "node_modules/saxes": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", - "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", + "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==", "dev": true, "dependencies": { "xmlchars": "^2.2.0" }, "engines": { - "node": ">=10" + "node": ">=v12.22.7" } }, "node_modules/semver": { @@ -6259,31 +6402,6 @@ "node": ">=0.8.0" } }, - "node_modules/supports-hyperlinks": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz", - "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0", - "supports-color": "^7.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/supports-hyperlinks/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", @@ -6302,22 +6420,6 @@ "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", "dev": true }, - "node_modules/terminal-link": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", - "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==", - "dev": true, - "dependencies": { - "ansi-escapes": "^4.2.1", - "supports-hyperlinks": "^2.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", @@ -6360,9 +6462,9 @@ } }, "node_modules/tough-cookie": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz", - "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", "dev": true, "dependencies": { "psl": "^1.1.33", @@ -6386,18 +6488,6 @@ "node": ">=12" } }, - "node_modules/type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", - "dev": true, - "dependencies": { - "prelude-ls": "~1.1.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, "node_modules/type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", @@ -6463,9 +6553,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", - "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", + "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", "dev": true, "funding": [ { @@ -6475,6 +6565,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { @@ -6482,7 +6576,7 @@ "picocolors": "^1.0.0" }, "bin": { - "browserslist-lint": "cli.js" + "update-browserslist-db": "cli.js" }, "peerDependencies": { "browserslist": ">= 4.21.0" @@ -6505,9 +6599,9 @@ "dev": true }, "node_modules/v8-to-istanbul": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz", - "integrity": "sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz", + "integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==", "dev": true, "dependencies": { "@jridgewell/trace-mapping": "^0.3.12", @@ -6518,6 +6612,12 @@ "node": ">=10.12.0" } }, + "node_modules/v8-to-istanbul/node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true + }, "node_modules/v8flags": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz", @@ -6530,26 +6630,16 @@ "node": ">= 0.10" } }, - "node_modules/w3c-hr-time": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", - "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", - "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.", - "dev": true, - "dependencies": { - "browser-process-hrtime": "^1.0.0" - } - }, "node_modules/w3c-xmlserializer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz", - "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz", + "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==", "dev": true, "dependencies": { "xml-name-validator": "^4.0.0" }, "engines": { - "node": ">=12" + "node": ">=14" } }, "node_modules/walker": { @@ -6582,18 +6672,6 @@ "node": ">=12" } }, - "node_modules/whatwg-encoding/node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/whatwg-mimetype": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", @@ -6604,9 +6682,9 @@ } }, "node_modules/whatwg-url": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz", - "integrity": "sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", + "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", "dev": true, "dependencies": { "tr46": "^3.0.0", @@ -6632,20 +6710,11 @@ } }, "node_modules/which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz", + "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==", "dev": true }, - "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -6737,9 +6806,9 @@ } }, "node_modules/ws": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz", - "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==", + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", + "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", "dev": true, "engines": { "node": ">=10.0.0" @@ -6788,9 +6857,9 @@ "dev": true }, "node_modules/yargs": { - "version": "17.6.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz", - "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==", + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dev": true, "dependencies": { "cliui": "^8.0.1", @@ -6826,5184 +6895,5 @@ "url": "https://github.com/sponsors/sindresorhus" } } - }, - "dependencies": { - "@ampproject/remapping": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", - "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", - "dev": true, - "requires": { - "@jridgewell/gen-mapping": "^0.1.0", - "@jridgewell/trace-mapping": "^0.3.9" - } - }, - "@babel/code-frame": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", - "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", - "dev": true, - "requires": { - "@babel/highlight": "^7.18.6" - } - }, - "@babel/compat-data": { - "version": "7.20.10", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.10.tgz", - "integrity": "sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==", - "dev": true - }, - "@babel/core": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz", - "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==", - "dev": true, - "requires": { - "@ampproject/remapping": "^2.1.0", - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helpers": "^7.20.7", - "@babel/parser": "^7.20.7", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.12", - "@babel/types": "^7.20.7", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.2", - "semver": "^6.3.0" - } - }, - "@babel/generator": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz", - "integrity": "sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==", - "dev": true, - "requires": { - "@babel/types": "^7.20.7", - "@jridgewell/gen-mapping": "^0.3.2", - "jsesc": "^2.5.1" - }, - "dependencies": { - "@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", - "dev": true, - "requires": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - } - } - } - }, - "@babel/helper-compilation-targets": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz", - "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==", - "dev": true, - "requires": { - "@babel/compat-data": "^7.20.5", - "@babel/helper-validator-option": "^7.18.6", - "browserslist": "^4.21.3", - "lru-cache": "^5.1.1", - "semver": "^6.3.0" - } - }, - "@babel/helper-environment-visitor": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", - "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", - "dev": true - }, - "@babel/helper-function-name": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", - "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", - "dev": true, - "requires": { - "@babel/template": "^7.18.10", - "@babel/types": "^7.19.0" - } - }, - "@babel/helper-hoist-variables": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", - "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", - "dev": true, - "requires": { - "@babel/types": "^7.18.6" - } - }, - "@babel/helper-module-imports": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", - "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", - "dev": true, - "requires": { - "@babel/types": "^7.18.6" - } - }, - "@babel/helper-module-transforms": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz", - "integrity": "sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==", - "dev": true, - "requires": { - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-simple-access": "^7.20.2", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/helper-validator-identifier": "^7.19.1", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.10", - "@babel/types": "^7.20.7" - } - }, - "@babel/helper-plugin-utils": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", - "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==", - "dev": true - }, - "@babel/helper-simple-access": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", - "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", - "dev": true, - "requires": { - "@babel/types": "^7.20.2" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", - "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", - "dev": true, - "requires": { - "@babel/types": "^7.18.6" - } - }, - "@babel/helper-string-parser": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", - "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", - "dev": true - }, - "@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", - "dev": true - }, - "@babel/helper-validator-option": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz", - "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==", - "dev": true - }, - "@babel/helpers": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz", - "integrity": "sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==", - "dev": true, - "requires": { - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.7", - "@babel/types": "^7.20.7" - } - }, - "@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.18.6", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "@babel/parser": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz", - "integrity": "sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==", - "dev": true - }, - "@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-bigint": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", - "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-class-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "@babel/plugin-syntax-import-meta": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", - "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-top-level-await": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.14.5" - } - }, - "@babel/plugin-syntax-typescript": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz", - "integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.19.0" - } - }, - "@babel/template": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz", - "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7" - } - }, - "@babel/traverse": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.12.tgz", - "integrity": "sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7", - "debug": "^4.1.0", - "globals": "^11.1.0" - } - }, - "@babel/types": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz", - "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==", - "dev": true, - "requires": { - "@babel/helper-string-parser": "^7.19.4", - "@babel/helper-validator-identifier": "^7.19.1", - "to-fast-properties": "^2.0.0" - } - }, - "@bcoe/v8-coverage": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", - "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", - "dev": true - }, - "@istanbuljs/load-nyc-config": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", - "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", - "dev": true, - "requires": { - "camelcase": "^5.3.1", - "find-up": "^4.1.0", - "get-package-type": "^0.1.0", - "js-yaml": "^3.13.1", - "resolve-from": "^5.0.0" - } - }, - "@istanbuljs/schema": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", - "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", - "dev": true - }, - "@jest/console": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz", - "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", - "slash": "^3.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "@jest/core": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-28.1.3.tgz", - "integrity": "sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==", - "dev": true, - "requires": { - "@jest/console": "^28.1.3", - "@jest/reporters": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.9", - "jest-changed-files": "^28.1.3", - "jest-config": "^28.1.3", - "jest-haste-map": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-resolve-dependencies": "^28.1.3", - "jest-runner": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "jest-watcher": "^28.1.3", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "rimraf": "^3.0.0", - "slash": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "@jest/environment": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-28.1.3.tgz", - "integrity": "sha512-1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA==", - "dev": true, - "requires": { - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "jest-mock": "^28.1.3" - } - }, - "@jest/expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw==", - "dev": true, - "requires": { - "expect": "^28.1.3", - "jest-snapshot": "^28.1.3" - } - }, - "@jest/expect-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.3.tgz", - "integrity": "sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==", - "dev": true, - "requires": { - "jest-get-type": "^28.0.2" - } - }, - "@jest/fake-timers": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.3.tgz", - "integrity": "sha512-D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "@sinonjs/fake-timers": "^9.1.2", - "@types/node": "*", - "jest-message-util": "^28.1.3", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3" - } - }, - "@jest/globals": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-28.1.3.tgz", - "integrity": "sha512-XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA==", - "dev": true, - "requires": { - "@jest/environment": "^28.1.3", - "@jest/expect": "^28.1.3", - "@jest/types": "^28.1.3" - } - }, - "@jest/reporters": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.3.tgz", - "integrity": "sha512-JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg==", - "dev": true, - "requires": { - "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@jridgewell/trace-mapping": "^0.3.13", - "@types/node": "*", - "chalk": "^4.0.0", - "collect-v8-coverage": "^1.0.0", - "exit": "^0.1.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^5.1.0", - "istanbul-lib-report": "^3.0.0", - "istanbul-lib-source-maps": "^4.0.0", - "istanbul-reports": "^3.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", - "jest-worker": "^28.1.3", - "slash": "^3.0.0", - "string-length": "^4.0.1", - "strip-ansi": "^6.0.0", - "terminal-link": "^2.0.0", - "v8-to-istanbul": "^9.0.1" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "requires": { - "@sinclair/typebox": "^0.24.1" - } - }, - "@jest/source-map": { - "version": "28.1.2", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-28.1.2.tgz", - "integrity": "sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww==", - "dev": true, - "requires": { - "@jridgewell/trace-mapping": "^0.3.13", - "callsites": "^3.0.0", - "graceful-fs": "^4.2.9" - } - }, - "@jest/test-result": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz", - "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==", - "dev": true, - "requires": { - "@jest/console": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "collect-v8-coverage": "^1.0.0" - } - }, - "@jest/test-sequencer": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz", - "integrity": "sha512-NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw==", - "dev": true, - "requires": { - "@jest/test-result": "^28.1.3", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "slash": "^3.0.0" - } - }, - "@jest/transform": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-28.1.3.tgz", - "integrity": "sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==", - "dev": true, - "requires": { - "@babel/core": "^7.11.6", - "@jest/types": "^28.1.3", - "@jridgewell/trace-mapping": "^0.3.13", - "babel-plugin-istanbul": "^6.1.1", - "chalk": "^4.0.0", - "convert-source-map": "^1.4.0", - "fast-json-stable-stringify": "^2.0.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-util": "^28.1.3", - "micromatch": "^4.0.4", - "pirates": "^4.0.4", - "slash": "^3.0.0", - "write-file-atomic": "^4.0.1" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", - "dev": true, - "requires": { - "@jest/schemas": "^28.1.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "@jridgewell/gen-mapping": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", - "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", - "dev": true, - "requires": { - "@jridgewell/set-array": "^1.0.0", - "@jridgewell/sourcemap-codec": "^1.4.10" - } - }, - "@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", - "dev": true - }, - "@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", - "dev": true - }, - "@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", - "dev": true - }, - "@jridgewell/trace-mapping": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", - "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", - "dev": true, - "requires": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" - } - }, - "@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, - "@sinonjs/commons": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", - "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", - "dev": true, - "requires": { - "type-detect": "4.0.8" - } - }, - "@sinonjs/fake-timers": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz", - "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==", - "dev": true, - "requires": { - "@sinonjs/commons": "^1.7.0" - } - }, - "@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", - "dev": true - }, - "@types/babel__core": { - "version": "7.1.20", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.20.tgz", - "integrity": "sha512-PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ==", - "dev": true, - "requires": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0", - "@types/babel__generator": "*", - "@types/babel__template": "*", - "@types/babel__traverse": "*" - } - }, - "@types/babel__generator": { - "version": "7.6.4", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz", - "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==", - "dev": true, - "requires": { - "@babel/types": "^7.0.0" - } - }, - "@types/babel__template": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz", - "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", - "dev": true, - "requires": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0" - } - }, - "@types/babel__traverse": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz", - "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==", - "dev": true, - "requires": { - "@babel/types": "^7.3.0" - } - }, - "@types/graceful-fs": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz", - "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/istanbul-lib-coverage": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", - "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==", - "dev": true - }, - "@types/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", - "dev": true, - "requires": { - "@types/istanbul-lib-coverage": "*" - } - }, - "@types/istanbul-reports": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", - "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", - "dev": true, - "requires": { - "@types/istanbul-lib-report": "*" - } - }, - "@types/jsdom": { - "version": "16.2.15", - "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-16.2.15.tgz", - "integrity": "sha512-nwF87yjBKuX/roqGYerZZM0Nv1pZDMAT5YhOHYeM/72Fic+VEqJh4nyoqoapzJnW3pUlfxPY5FhgsJtM+dRnQQ==", - "dev": true, - "requires": { - "@types/node": "*", - "@types/parse5": "^6.0.3", - "@types/tough-cookie": "*" - } - }, - "@types/node": { - "version": "18.11.18", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", - "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==", - "dev": true - }, - "@types/parse5": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.3.tgz", - "integrity": "sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==", - "dev": true - }, - "@types/prettier": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.2.tgz", - "integrity": "sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==", - "dev": true - }, - "@types/stack-utils": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", - "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", - "dev": true - }, - "@types/tough-cookie": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz", - "integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==", - "dev": true - }, - "@types/yargs": { - "version": "17.0.19", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.19.tgz", - "integrity": "sha512-cAx3qamwaYX9R0fzOIZAlFpo4A+1uBVCxqpKz9D26uTF4srRXaGTTsikQmaotCtNdbhzyUH7ft6p9ktz9s6UNQ==", - "dev": true, - "requires": { - "@types/yargs-parser": "*" - } - }, - "@types/yargs-parser": { - "version": "21.0.0", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", - "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", - "dev": true - }, - "abab": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", - "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==", - "dev": true - }, - "abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true - }, - "acorn": { - "version": "8.8.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", - "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", - "dev": true - }, - "acorn-globals": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", - "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", - "dev": true, - "requires": { - "acorn": "^7.1.1", - "acorn-walk": "^7.1.1" - }, - "dependencies": { - "acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", - "dev": true - } - } - }, - "acorn-walk": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", - "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", - "dev": true - }, - "agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "requires": { - "debug": "4" - } - }, - "ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "dev": true, - "requires": { - "type-fest": "^0.21.3" - } - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==", - "dev": true - }, - "anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dev": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "array-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", - "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==", - "dev": true - }, - "array-slice": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz", - "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==", - "dev": true - }, - "async": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", - "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==", - "dev": true - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true - }, - "babel-jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.3.tgz", - "integrity": "sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q==", - "dev": true, - "requires": { - "@jest/transform": "^28.1.3", - "@types/babel__core": "^7.1.14", - "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^28.1.3", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "slash": "^3.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "babel-plugin-istanbul": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", - "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^5.0.4", - "test-exclude": "^6.0.0" - } - }, - "babel-plugin-jest-hoist": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz", - "integrity": "sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q==", - "dev": true, - "requires": { - "@babel/template": "^7.3.3", - "@babel/types": "^7.3.3", - "@types/babel__core": "^7.1.14", - "@types/babel__traverse": "^7.0.6" - } - }, - "babel-preset-current-node-syntax": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", - "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", - "dev": true, - "requires": { - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-bigint": "^7.8.3", - "@babel/plugin-syntax-class-properties": "^7.8.3", - "@babel/plugin-syntax-import-meta": "^7.8.3", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.8.3", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-top-level-await": "^7.8.3" - } - }, - "babel-preset-jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz", - "integrity": "sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A==", - "dev": true, - "requires": { - "babel-plugin-jest-hoist": "^28.1.3", - "babel-preset-current-node-syntax": "^1.0.0" - } - }, - "balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "requires": { - "fill-range": "^7.0.1" - } - }, - "browser-process-hrtime": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", - "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", - "dev": true - }, - "browserslist": { - "version": "4.21.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", - "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", - "dev": true, - "requires": { - "caniuse-lite": "^1.0.30001400", - "electron-to-chromium": "^1.4.251", - "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.9" - } - }, - "bser": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", - "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", - "dev": true, - "requires": { - "node-int64": "^0.4.0" - } - }, - "buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true - }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "caniuse-lite": { - "version": "1.0.30001442", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz", - "integrity": "sha512-239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow==", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "char-regex": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", - "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", - "dev": true - }, - "ci-info": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.1.tgz", - "integrity": "sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==", - "dev": true - }, - "cjs-module-lexer": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz", - "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==", - "dev": true - }, - "cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dev": true, - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - } - } - }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", - "dev": true - }, - "collect-v8-coverage": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", - "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==", - "dev": true - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "colors": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "integrity": "sha512-ENwblkFQpqqia6b++zLD/KUWafYlVY/UNnAp7oz7LY7E924wmpye416wBOmvv/HMWzl8gL1kJlfvId/1Dg176w==", - "dev": true - }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true - }, - "convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", - "dev": true - }, - "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - } - }, - "cssom": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz", - "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==", - "dev": true - }, - "cssstyle": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", - "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", - "dev": true, - "requires": { - "cssom": "~0.3.6" - }, - "dependencies": { - "cssom": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", - "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", - "dev": true - } - } - }, - "customizr": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/customizr/-/customizr-2.0.4.tgz", - "integrity": "sha512-GR1e6adxd88Qe1FoK+gSnh133daCFjuuKKntLjOFd5KmMxEW4OrPNDVivkMwT6A8sKOewyhXekpYbBZoMzEtug==", - "dev": true, - "requires": { - "colors": "^1.4.0", - "cross-spawn": "^7.0.3", - "fast-deep-equal": "^3.1.3", - "fsevents": "^2.3.2", - "glob": "^7.2.0", - "lodash": "^4.17.21", - "mkdirp": "^1.0.4", - "modernizr": "^3", - "nopt": "^5.0.0", - "promised-io": "^0.3.6" - }, - "dependencies": { - "colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", - "dev": true - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "nopt": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", - "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", - "dev": true, - "requires": { - "abbrev": "1" - } - } - } - }, - "data-urls": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz", - "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==", - "dev": true, - "requires": { - "abab": "^2.0.6", - "whatwg-mimetype": "^3.0.0", - "whatwg-url": "^11.0.0" - }, - "dependencies": { - "whatwg-url": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", - "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", - "dev": true, - "requires": { - "tr46": "^3.0.0", - "webidl-conversions": "^7.0.0" - } - } - } - }, - "dateformat": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", - "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==", - "dev": true - }, - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", - "dev": true - }, - "decimal.js": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", - "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==", - "dev": true - }, - "dedent": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", - "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", - "dev": true - }, - "deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true - }, - "deepmerge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", - "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", - "dev": true - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true - }, - "detect-file": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", - "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==", - "dev": true - }, - "detect-newline": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", - "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", - "dev": true - }, - "diff-sequences": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz", - "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==", - "dev": true - }, - "doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "requires": { - "esutils": "^2.0.2" - } - }, - "domexception": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz", - "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==", - "dev": true, - "requires": { - "webidl-conversions": "^7.0.0" - } - }, - "electron-to-chromium": { - "version": "1.4.284", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", - "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==", - "dev": true - }, - "emittery": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz", - "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==", - "dev": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "entities": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz", - "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==", - "dev": true - }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true - }, - "escodegen": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", - "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==", - "dev": true, - "requires": { - "esprima": "^4.0.1", - "estraverse": "^5.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" - } - }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - }, - "esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true - }, - "eventemitter2": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz", - "integrity": "sha512-K7J4xq5xAD5jHsGM5ReWXRTFa3JRGofHiMcVgQ8PRwgWxzjHpMWCIzsmyf60+mh8KLsqYPcjUMa0AC4hd6lPyQ==", - "dev": true - }, - "execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - } - }, - "exit": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", - "dev": true - }, - "expand-tilde": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==", - "dev": true, - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, - "expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==", - "dev": true, - "requires": { - "@jest/expect-utils": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3" - } - }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, - "fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true - }, - "fb-watchman": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", - "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", - "dev": true, - "requires": { - "bser": "2.1.1" - } - }, - "file": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/file/-/file-0.2.2.tgz", - "integrity": "sha512-gwabMtChzdnpDJdPEpz8Vr/PX0pU85KailuPV71Zw/un5yJVKvzukhB3qf6O3lnTwIe5CxlMYLh3jOK3w5xrLA==", - "dev": true - }, - "file-sync-cmp": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz", - "integrity": "sha512-0k45oWBokCqh2MOexeYKpyqmGKG+8mQ2Wd8iawx+uWd/weWJQAZ6SoPybagdCI4xFisag8iAR77WPm4h3pTfxA==", - "dev": true - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "findup-sync": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz", - "integrity": "sha512-z8Nrwhi6wzxNMIbxlrTzuUW6KWuKkogZ/7OdDVq+0+kxn77KUH1nipx8iU6suqkHqc4y6n7a9A8IpmxY/pTjWg==", - "dev": true, - "requires": { - "glob": "~5.0.0" - }, - "dependencies": { - "glob": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==", - "dev": true, - "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - } - } - }, - "fined": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz", - "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==", - "dev": true, - "requires": { - "expand-tilde": "^2.0.2", - "is-plain-object": "^2.0.3", - "object.defaults": "^1.1.0", - "object.pick": "^1.2.0", - "parse-filepath": "^1.0.1" - } - }, - "flagged-respawn": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz", - "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==", - "dev": true - }, - "flatpickr": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-2.6.3.tgz", - "integrity": "sha512-+Mm/LJPFoAGwjZ+Ash4+IMIYMGelEJnspSu1+USuPV9stv51F+/C8wo3SKE7CRco+jKgZe3rsI7/87msCh/QkQ==" - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==", - "dev": true - }, - "for-own": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==", - "dev": true, - "requires": { - "for-in": "^1.0.1" - } - }, - "form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true - }, - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "optional": true - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true - }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true - }, - "get-package-type": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", - "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", - "dev": true - }, - "get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true - }, - "getobject": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/getobject/-/getobject-1.0.2.tgz", - "integrity": "sha512-2zblDBaFcb3rB4rF77XVnuINOE2h2k/OnqXAiy0IrTxUfV1iFp3la33oAQVY9pCpWU268WFYVt2t71hlMuLsOg==", - "dev": true - }, - "glob": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", - "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "global-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "dev": true, - "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" - } - }, - "global-prefix": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==", - "dev": true, - "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" - }, - "dependencies": { - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } - } - }, - "globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true - }, - "graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true - }, - "grunt": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.3.tgz", - "integrity": "sha512-mKwmo4X2d8/4c/BmcOETHek675uOqw0RuA/zy12jaspWqvTp4+ZeQF1W+OTpcbncnaBsfbQJ6l0l4j+Sn/GmaQ==", - "dev": true, - "requires": { - "dateformat": "~3.0.3", - "eventemitter2": "~0.4.13", - "exit": "~0.1.2", - "findup-sync": "~0.3.0", - "glob": "~7.1.6", - "grunt-cli": "~1.4.3", - "grunt-known-options": "~2.0.0", - "grunt-legacy-log": "~3.0.0", - "grunt-legacy-util": "~2.0.1", - "iconv-lite": "~0.4.13", - "js-yaml": "~3.14.0", - "minimatch": "~3.0.4", - "mkdirp": "~1.0.4", - "nopt": "~3.0.6", - "rimraf": "~3.0.2" - } - }, - "grunt-cli": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz", - "integrity": "sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==", - "dev": true, - "requires": { - "grunt-known-options": "~2.0.0", - "interpret": "~1.1.0", - "liftup": "~3.0.1", - "nopt": "~4.0.1", - "v8flags": "~3.2.0" - }, - "dependencies": { - "nopt": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", - "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==", - "dev": true, - "requires": { - "abbrev": "1", - "osenv": "^0.1.4" - } - } - } - }, - "grunt-contrib-clean": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-2.0.1.tgz", - "integrity": "sha512-uRvnXfhiZt8akb/ZRDHJpQQtkkVkqc/opWO4Po/9ehC2hPxgptB9S6JHDC/Nxswo4CJSM0iFPT/Iym3cEMWzKA==", - "dev": true, - "requires": { - "async": "^3.2.3", - "rimraf": "^2.6.2" - }, - "dependencies": { - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - } - } - }, - "grunt-contrib-copy": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-1.0.0.tgz", - "integrity": "sha512-gFRFUB0ZbLcjKb67Magz1yOHGBkyU6uL29hiEW1tdQ9gQt72NuMKIy/kS6dsCbV0cZ0maNCb0s6y+uT1FKU7jA==", - "dev": true, - "requires": { - "chalk": "^1.1.1", - "file-sync-cmp": "^0.1.0" - } - }, - "grunt-known-options": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz", - "integrity": "sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==", - "dev": true - }, - "grunt-legacy-log": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz", - "integrity": "sha512-GHZQzZmhyq0u3hr7aHW4qUH0xDzwp2YXldLPZTCjlOeGscAOWWPftZG3XioW8MasGp+OBRIu39LFx14SLjXRcA==", - "dev": true, - "requires": { - "colors": "~1.1.2", - "grunt-legacy-log-utils": "~2.1.0", - "hooker": "~0.2.3", - "lodash": "~4.17.19" - } - }, - "grunt-legacy-log-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz", - "integrity": "sha512-lwquaPXJtKQk0rUM1IQAop5noEpwFqOXasVoedLeNzaibf/OPWjKYvvdqnEHNmU+0T0CaReAXIbGo747ZD+Aaw==", - "dev": true, - "requires": { - "chalk": "~4.1.0", - "lodash": "~4.17.19" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "grunt-legacy-util": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz", - "integrity": "sha512-2bQiD4fzXqX8rhNdXkAywCadeqiPiay0oQny77wA2F3WF4grPJXCvAcyoWUJV+po/b15glGkxuSiQCK299UC2w==", - "dev": true, - "requires": { - "async": "~3.2.0", - "exit": "~0.1.2", - "getobject": "~1.0.0", - "hooker": "~0.2.3", - "lodash": "~4.17.21", - "underscore.string": "~3.3.5", - "which": "~2.0.2" - } - }, - "grunt-modernizr": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/grunt-modernizr/-/grunt-modernizr-3.0.3.tgz", - "integrity": "sha512-EvcLpa/ohGVSWbK+QaWF6eVgX+jAa4TiU06MaZyZDdhG/wvJAphWFDf0DwsEt/bIfL2svw01O2fuhdfW9gah6g==", - "dev": true, - "requires": { - "customizr": "^2.0.4", - "lodash.merge": "^4.6.2" - } - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "homedir-polyfill": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", - "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", - "dev": true, - "requires": { - "parse-passwd": "^1.0.0" - } - }, - "hooker": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz", - "integrity": "sha512-t+UerCsQviSymAInD01Pw+Dn/usmz1sRO+3Zk1+lx8eg+WKpD2ulcwWqHHL0+aseRBr+3+vIhiG1K1JTwaIcTA==", - "dev": true - }, - "html-encoding-sniffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", - "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==", - "dev": true, - "requires": { - "whatwg-encoding": "^2.0.0" - } - }, - "html-escaper": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", - "dev": true - }, - "http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "dev": true, - "requires": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - } - }, - "https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, - "requires": { - "agent-base": "6", - "debug": "4" - } - }, - "human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true - }, - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "import-local": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", - "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", - "dev": true, - "requires": { - "pkg-dir": "^4.2.0", - "resolve-cwd": "^3.0.0" - } - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true - }, - "interpret": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz", - "integrity": "sha512-CLM8SNMDu7C5psFCn6Wg/tgpj/bKAg7hc2gWqcuR9OD5Ft9PhBpIu8PLicPeis+xDd6YX2ncI8MCA64I9tftIA==", - "dev": true - }, - "is-absolute": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", - "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", - "dev": true, - "requires": { - "is-relative": "^1.0.0", - "is-windows": "^1.0.1" - } - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true - }, - "is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", - "dev": true, - "requires": { - "has": "^1.0.3" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "is-generator-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", - "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", - "dev": true - }, - "is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - }, - "is-potential-custom-element-name": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", - "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", - "dev": true - }, - "is-relative": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", - "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", - "dev": true, - "requires": { - "is-unc-path": "^1.0.0" - } - }, - "is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "dev": true - }, - "is-unc-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", - "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", - "dev": true, - "requires": { - "unc-path-regex": "^0.1.2" - } - }, - "is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", - "dev": true - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", - "dev": true - }, - "istanbul-lib-coverage": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", - "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==", - "dev": true - }, - "istanbul-lib-instrument": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", - "dev": true, - "requires": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" - } - }, - "istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", - "dev": true, - "requires": { - "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^3.0.0", - "supports-color": "^7.1.0" - }, - "dependencies": { - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "istanbul-lib-source-maps": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", - "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", - "dev": true, - "requires": { - "debug": "^4.1.1", - "istanbul-lib-coverage": "^3.0.0", - "source-map": "^0.6.1" - } - }, - "istanbul-reports": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz", - "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==", - "dev": true, - "requires": { - "html-escaper": "^2.0.0", - "istanbul-lib-report": "^3.0.0" - } - }, - "jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest/-/jest-28.1.3.tgz", - "integrity": "sha512-N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA==", - "dev": true, - "requires": { - "@jest/core": "^28.1.3", - "@jest/types": "^28.1.3", - "import-local": "^3.0.2", - "jest-cli": "^28.1.3" - } - }, - "jest-changed-files": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.1.3.tgz", - "integrity": "sha512-esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA==", - "dev": true, - "requires": { - "execa": "^5.0.0", - "p-limit": "^3.1.0" - } - }, - "jest-circus": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.3.tgz", - "integrity": "sha512-cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow==", - "dev": true, - "requires": { - "@jest/environment": "^28.1.3", - "@jest/expect": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "co": "^4.6.0", - "dedent": "^0.7.0", - "is-generator-fn": "^2.0.0", - "jest-each": "^28.1.3", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", - "p-limit": "^3.1.0", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-cli": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.3.tgz", - "integrity": "sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==", - "dev": true, - "requires": { - "@jest/core": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", - "chalk": "^4.0.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.9", - "import-local": "^3.0.2", - "jest-config": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "prompts": "^2.0.1", - "yargs": "^17.3.1" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-config": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-28.1.3.tgz", - "integrity": "sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==", - "dev": true, - "requires": { - "@babel/core": "^7.11.6", - "@jest/test-sequencer": "^28.1.3", - "@jest/types": "^28.1.3", - "babel-jest": "^28.1.3", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "deepmerge": "^4.2.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "jest-circus": "^28.1.3", - "jest-environment-node": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-runner": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "micromatch": "^4.0.4", - "parse-json": "^5.2.0", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "strip-json-comments": "^3.1.1" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-diff": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz", - "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "diff-sequences": "^28.1.1", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-docblock": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-28.1.1.tgz", - "integrity": "sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==", - "dev": true, - "requires": { - "detect-newline": "^3.0.0" - } - }, - "jest-each": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-28.1.3.tgz", - "integrity": "sha512-arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "chalk": "^4.0.0", - "jest-get-type": "^28.0.2", - "jest-util": "^28.1.3", - "pretty-format": "^28.1.3" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-environment-jsdom": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-28.1.3.tgz", - "integrity": "sha512-HnlGUmZRdxfCByd3GM2F100DgQOajUBzEitjGqIREcb45kGjZvRrKUdlaF6escXBdcXNl0OBh+1ZrfeZT3GnAg==", - "dev": true, - "requires": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/jsdom": "^16.2.4", - "@types/node": "*", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3", - "jsdom": "^19.0.0" - } - }, - "jest-environment-node": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.3.tgz", - "integrity": "sha512-ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A==", - "dev": true, - "requires": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3" - } - }, - "jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", - "dev": true - }, - "jest-haste-map": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.3.tgz", - "integrity": "sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "@types/graceful-fs": "^4.1.3", - "@types/node": "*", - "anymatch": "^3.0.3", - "fb-watchman": "^2.0.0", - "fsevents": "^2.3.2", - "graceful-fs": "^4.2.9", - "jest-regex-util": "^28.0.2", - "jest-util": "^28.1.3", - "jest-worker": "^28.1.3", - "micromatch": "^4.0.4", - "walker": "^1.0.8" - } - }, - "jest-leak-detector": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz", - "integrity": "sha512-WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA==", - "dev": true, - "requires": { - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - } - }, - "jest-matcher-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz", - "integrity": "sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-mock": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.3.tgz", - "integrity": "sha512-o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "@types/node": "*" - } - }, - "jest-pnp-resolver": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", - "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", - "dev": true, - "requires": {} - }, - "jest-regex-util": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz", - "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==", - "dev": true - }, - "jest-resolve": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.3.tgz", - "integrity": "sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-pnp-resolver": "^1.2.2", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "resolve": "^1.20.0", - "resolve.exports": "^1.1.0", - "slash": "^3.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-resolve-dependencies": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz", - "integrity": "sha512-qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA==", - "dev": true, - "requires": { - "jest-regex-util": "^28.0.2", - "jest-snapshot": "^28.1.3" - } - }, - "jest-runner": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.3.tgz", - "integrity": "sha512-GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA==", - "dev": true, - "requires": { - "@jest/console": "^28.1.3", - "@jest/environment": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "emittery": "^0.10.2", - "graceful-fs": "^4.2.9", - "jest-docblock": "^28.1.1", - "jest-environment-node": "^28.1.3", - "jest-haste-map": "^28.1.3", - "jest-leak-detector": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-resolve": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-util": "^28.1.3", - "jest-watcher": "^28.1.3", - "jest-worker": "^28.1.3", - "p-limit": "^3.1.0", - "source-map-support": "0.5.13" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-runtime": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.3.tgz", - "integrity": "sha512-NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw==", - "dev": true, - "requires": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/globals": "^28.1.3", - "@jest/source-map": "^28.1.2", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "chalk": "^4.0.0", - "cjs-module-lexer": "^1.0.0", - "collect-v8-coverage": "^1.0.0", - "execa": "^5.0.0", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-mock": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", - "slash": "^3.0.0", - "strip-bom": "^4.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-snapshot": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.3.tgz", - "integrity": "sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg==", - "dev": true, - "requires": { - "@babel/core": "^7.11.6", - "@babel/generator": "^7.7.2", - "@babel/plugin-syntax-typescript": "^7.7.2", - "@babel/traverse": "^7.7.2", - "@babel/types": "^7.3.3", - "@jest/expect-utils": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/babel__traverse": "^7.0.6", - "@types/prettier": "^2.1.5", - "babel-preset-current-node-syntax": "^1.0.0", - "chalk": "^4.0.0", - "expect": "^28.1.3", - "graceful-fs": "^4.2.9", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-haste-map": "^28.1.3", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", - "natural-compare": "^1.4.0", - "pretty-format": "^28.1.3", - "semver": "^7.3.5" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } - } - }, - "jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-validate": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.3.tgz", - "integrity": "sha512-SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "camelcase": "^6.2.0", - "chalk": "^4.0.0", - "jest-get-type": "^28.0.2", - "leven": "^3.1.0", - "pretty-format": "^28.1.3" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "camelcase": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", - "dev": true - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-watcher": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz", - "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==", - "dev": true, - "requires": { - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "emittery": "^0.10.2", - "jest-util": "^28.1.3", - "string-length": "^4.0.1" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-worker": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", - "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==", - "dev": true, - "requires": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "dependencies": { - "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jquery": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", - "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" - }, - "jquery.event.move": { - "version": "git+ssh://git@github.com/stephband/jquery.event.move.git#e91477e2e6a880116f179e124dbb50a92ee4d667", - "from": "jquery.event.move@git+https://github.com/stephband/jquery.event.move.git", - "requires": { - "jquery": ">=1.7.0" - } - }, - "jquery.event.swipe": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/jquery.event.swipe/-/jquery.event.swipe-0.5.4.tgz", - "integrity": "sha512-A/h+3c/ByYGEaDShb0/I2D9EJKzK4RqrLLbMJjnwrx88fTK4Q2kx8dsMTtiiBQ/5CfsSPf9h5LNa597pwvlvNw==", - "requires": { - "jquery": ">=1.7.0", - "jquery.event.move": "1.x" - }, - "dependencies": { - "jquery.event.move": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/jquery.event.move/-/jquery.event.move-1.3.6.tgz", - "integrity": "sha512-3wRpftn86GuShjpPCNJ+xAjGikLV7HoPXBXSvD3JjmQHKhIGItslhZ02swHDdZxtz1vat2/wa26dBdSF1a3Uig==", - "requires": { - "jquery": ">=1.7.0" - } - } - } - }, - "jquery.transit": { - "version": "0.9.12", - "resolved": "https://registry.npmjs.org/jquery.transit/-/jquery.transit-0.9.12.tgz", - "integrity": "sha512-wn2kHOZWBOJOc8ozEPvBPTNF6tCJTAQfRFLfm0H2p3cM7pdbzkKZYGzqmGeYka7yLmQ27ckiddyVzq+/jfbwcA==", - "requires": {} - }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - }, - "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "jsdom": { - "version": "19.0.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz", - "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==", - "dev": true, - "requires": { - "abab": "^2.0.5", - "acorn": "^8.5.0", - "acorn-globals": "^6.0.0", - "cssom": "^0.5.0", - "cssstyle": "^2.3.0", - "data-urls": "^3.0.1", - "decimal.js": "^10.3.1", - "domexception": "^4.0.0", - "escodegen": "^2.0.0", - "form-data": "^4.0.0", - "html-encoding-sniffer": "^3.0.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-potential-custom-element-name": "^1.0.1", - "nwsapi": "^2.2.0", - "parse5": "6.0.1", - "saxes": "^5.0.1", - "symbol-tree": "^3.2.4", - "tough-cookie": "^4.0.0", - "w3c-hr-time": "^1.0.2", - "w3c-xmlserializer": "^3.0.0", - "webidl-conversions": "^7.0.0", - "whatwg-encoding": "^2.0.0", - "whatwg-mimetype": "^3.0.0", - "whatwg-url": "^10.0.0", - "ws": "^8.2.3", - "xml-name-validator": "^4.0.0" - } - }, - "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true - }, - "json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true - }, - "json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true - }, - "kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true - }, - "kleur": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", - "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", - "dev": true - }, - "leven": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", - "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", - "dev": true - }, - "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - } - }, - "liftup": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/liftup/-/liftup-3.0.1.tgz", - "integrity": "sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw==", - "dev": true, - "requires": { - "extend": "^3.0.2", - "findup-sync": "^4.0.0", - "fined": "^1.2.0", - "flagged-respawn": "^1.0.1", - "is-plain-object": "^2.0.4", - "object.map": "^1.0.1", - "rechoir": "^0.7.0", - "resolve": "^1.19.0" - }, - "dependencies": { - "findup-sync": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz", - "integrity": "sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==", - "dev": true, - "requires": { - "detect-file": "^1.0.0", - "is-glob": "^4.0.0", - "micromatch": "^4.0.2", - "resolve-dir": "^1.0.1" - } - } - } - }, - "lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true - }, - "linkify-it": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz", - "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==", - "dev": true, - "requires": { - "uc.micro": "^1.0.1" - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, - "lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "requires": { - "yallist": "^3.0.2" - } - }, - "make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, - "requires": { - "semver": "^6.0.0" - } - }, - "make-iterator": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz", - "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==", - "dev": true, - "requires": { - "kind-of": "^6.0.2" - } - }, - "makeerror": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", - "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", - "dev": true, - "requires": { - "tmpl": "1.0.5" - } - }, - "map-cache": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==", - "dev": true - }, - "markdown-it": { - "version": "12.3.2", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz", - "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==", - "dev": true, - "requires": { - "argparse": "^2.0.1", - "entities": "~2.1.0", - "linkify-it": "^3.0.1", - "mdurl": "^1.0.1", - "uc.micro": "^1.0.5" - }, - "dependencies": { - "argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - } - } - }, - "mdurl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", - "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==", - "dev": true - }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, - "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dev": true, - "requires": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - } - }, - "mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true - }, - "mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "requires": { - "mime-db": "1.52.0" - } - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - }, - "minimatch": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz", - "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", - "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", - "dev": true - }, - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true - }, - "modernizr": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/modernizr/-/modernizr-3.12.0.tgz", - "integrity": "sha512-i5f5xfnxMOb3cePoBpwk4bWjVAyIB3hgm7QrDvZx/R7zUUS8PO9zlyQF7vJKn8kCVxEvL0nRWeZ0PPqVbY31sw==", - "dev": true, - "requires": { - "doctrine": "^3.0.0", - "file": "^0.2.2", - "lodash": "^4.17.21", - "markdown-it": "^12.3.2", - "mkdirp": "0.5.5", - "requirejs": "^2.3.6", - "yargs": "^15.4.1" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "cliui": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", - "dev": true, - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - }, - "wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - } - }, - "y18n": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", - "dev": true - }, - "yargs": { - "version": "15.4.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", - "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", - "dev": true, - "requires": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^18.1.2" - } - }, - "yargs-parser": { - "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - } - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true - }, - "node-int64": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", - "dev": true - }, - "node-releases": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz", - "integrity": "sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==", - "dev": true - }, - "nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==", - "dev": true, - "requires": { - "abbrev": "1" - } - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true - }, - "normalize.css.less": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/normalize.css.less/-/normalize.css.less-3.0.3.tgz", - "integrity": "sha512-il3czlF4CXiZZIUi7ny3eCwy6YFhBkqNq8be68bxEhBbR7h4wBaWwkEmUVGIyYsO5DrghNVy+5zv8qyZ0TwR7w==" - }, - "npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dev": true, - "requires": { - "path-key": "^3.0.0" - } - }, - "nwsapi": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz", - "integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==", - "dev": true - }, - "object.defaults": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", - "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==", - "dev": true, - "requires": { - "array-each": "^1.0.1", - "array-slice": "^1.0.0", - "for-own": "^1.0.0", - "isobject": "^3.0.0" - } - }, - "object.map": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz", - "integrity": "sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==", - "dev": true, - "requires": { - "for-own": "^1.0.0", - "make-iterator": "^1.0.0" - } - }, - "object.pick": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==", - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "open-sans-fontface": { - "version": "git+ssh://git@github.com/FontFaceKit/open-sans.git#59493162b016dae6ef0d06693ccf3c93c1e96091", - "from": "open-sans-fontface@git+https://github.com/FontFaceKit/open-sans.git#gh-pages" - }, - "optionator": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", - "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", - "dev": true, - "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.6", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "word-wrap": "~1.2.3" - } - }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==", - "dev": true - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", - "dev": true - }, - "osenv": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", - "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", - "dev": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - }, - "dependencies": { - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - } - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "parse-filepath": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", - "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==", - "dev": true, - "requires": { - "is-absolute": "^1.0.0", - "map-cache": "^0.2.0", - "path-root": "^0.1.1" - } - }, - "parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - } - }, - "parse-passwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==", - "dev": true - }, - "parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", - "dev": true - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true - }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true - }, - "path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true - }, - "path-root": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", - "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==", - "dev": true, - "requires": { - "path-root-regex": "^0.1.0" - } - }, - "path-root-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", - "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==", - "dev": true - }, - "picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true - }, - "picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true - }, - "picturefill": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/picturefill/-/picturefill-3.0.3.tgz", - "integrity": "sha512-JDdx+3i4fs2pkqwWZJgGEM2vFWsq+01YsQFT9CKPGuv2Q0xSdrQZoxi9XwyNARTgxiOdgoAwWQRluLRe/JQX2g==" - }, - "pirates": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz", - "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==", - "dev": true - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "requires": { - "find-up": "^4.0.0" - } - }, - "pocketgrid-less": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/pocketgrid-less/-/pocketgrid-less-1.0.1.tgz", - "integrity": "sha512-89F9g6RuIfc7fWO5fuBkf8gb1LqxwCuukCDojBpjbgbHA6utnX+UEwGUn92rXciCFQTtkIzewYjtRzLLg2adpQ==" - }, - "prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", - "dev": true - }, - "pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "requires": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true - } - } - }, - "promised-io": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/promised-io/-/promised-io-0.3.6.tgz", - "integrity": "sha512-bNwZusuNIW4m0SPR8jooSyndD35ggirHlxVl/UhIaZD/F0OBv9ebfc6tNmbpZts3QXHggkjIBH8lvtnzhtcz0A==", - "dev": true - }, - "prompts": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", - "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", - "dev": true, - "requires": { - "kleur": "^3.0.3", - "sisteransi": "^1.0.5" - } - }, - "psl": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", - "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", - "dev": true - }, - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true - }, - "querystringify": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", - "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", - "dev": true - }, - "react-is": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", - "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", - "dev": true - }, - "rechoir": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", - "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", - "dev": true, - "requires": { - "resolve": "^1.9.0" - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true - }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, - "requirejs": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz", - "integrity": "sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==", - "dev": true - }, - "requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", - "dev": true - }, - "resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", - "dev": true, - "requires": { - "is-core-module": "^2.9.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - } - }, - "resolve-cwd": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", - "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", - "dev": true, - "requires": { - "resolve-from": "^5.0.0" - } - }, - "resolve-dir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==", - "dev": true, - "requires": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" - } - }, - "resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true - }, - "resolve.exports": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz", - "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==", - "dev": true - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "saxes": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", - "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", - "dev": true, - "requires": { - "xmlchars": "^2.2.0" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", - "dev": true - }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true - }, - "signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "sisteransi": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "source-map-support": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", - "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true - }, - "stack-utils": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", - "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", - "dev": true, - "requires": { - "escape-string-regexp": "^2.0.0" - }, - "dependencies": { - "escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "dev": true - } - } - }, - "string-length": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", - "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", - "dev": true, - "requires": { - "char-regex": "^1.0.2", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - } - } - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - } - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", - "dev": true - }, - "strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true - }, - "strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==", - "dev": true - }, - "supports-hyperlinks": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz", - "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==", - "dev": true, - "requires": { - "has-flag": "^4.0.0", - "supports-color": "^7.0.0" - }, - "dependencies": { - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true - }, - "symbol-tree": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", - "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", - "dev": true - }, - "terminal-link": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", - "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==", - "dev": true, - "requires": { - "ansi-escapes": "^4.2.1", - "supports-hyperlinks": "^2.0.0" - } - }, - "test-exclude": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", - "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", - "dev": true, - "requires": { - "@istanbuljs/schema": "^0.1.2", - "glob": "^7.1.4", - "minimatch": "^3.0.4" - } - }, - "tmpl": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", - "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", - "dev": true - }, - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "dev": true - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } - }, - "tough-cookie": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz", - "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==", - "dev": true, - "requires": { - "psl": "^1.1.33", - "punycode": "^2.1.1", - "universalify": "^0.2.0", - "url-parse": "^1.5.3" - } - }, - "tr46": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", - "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", - "dev": true, - "requires": { - "punycode": "^2.1.1" - } - }, - "type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2" - } - }, - "type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true - }, - "type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "dev": true - }, - "uc.micro": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", - "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==", - "dev": true - }, - "unc-path-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", - "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==", - "dev": true - }, - "underscore.string": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.6.tgz", - "integrity": "sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ==", - "dev": true, - "requires": { - "sprintf-js": "^1.1.1", - "util-deprecate": "^1.0.2" - }, - "dependencies": { - "sprintf-js": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", - "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", - "dev": true - } - } - }, - "universalify": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", - "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", - "dev": true - }, - "update-browserslist-db": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", - "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", - "dev": true, - "requires": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" - } - }, - "url-parse": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", - "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", - "dev": true, - "requires": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true - }, - "v8-to-istanbul": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz", - "integrity": "sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==", - "dev": true, - "requires": { - "@jridgewell/trace-mapping": "^0.3.12", - "@types/istanbul-lib-coverage": "^2.0.1", - "convert-source-map": "^1.6.0" - } - }, - "v8flags": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz", - "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==", - "dev": true, - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, - "w3c-hr-time": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", - "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", - "dev": true, - "requires": { - "browser-process-hrtime": "^1.0.0" - } - }, - "w3c-xmlserializer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz", - "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==", - "dev": true, - "requires": { - "xml-name-validator": "^4.0.0" - } - }, - "walker": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", - "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", - "dev": true, - "requires": { - "makeerror": "1.0.12" - } - }, - "webidl-conversions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", - "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", - "dev": true - }, - "whatwg-encoding": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", - "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==", - "dev": true, - "requires": { - "iconv-lite": "0.6.3" - }, - "dependencies": { - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - } - } - }, - "whatwg-mimetype": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", - "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", - "dev": true - }, - "whatwg-url": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz", - "integrity": "sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==", - "dev": true, - "requires": { - "tr46": "^3.0.0", - "webidl-conversions": "^7.0.0" - } - }, - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==", - "dev": true - }, - "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true - }, - "wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - } - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true - }, - "write-file-atomic": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", - "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", - "dev": true, - "requires": { - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.7" - } - }, - "ws": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz", - "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==", - "dev": true, - "requires": {} - }, - "xml-name-validator": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", - "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==", - "dev": true - }, - "xmlchars": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", - "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", - "dev": true - }, - "y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true - }, - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true - }, - "yargs": { - "version": "17.6.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz", - "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==", - "dev": true, - "requires": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - } - }, - "yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "dev": true - }, - "yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true - } } } diff --git a/themes/Frontend/Responsive/package.json b/themes/Frontend/Responsive/package.json index c8535dc43db..8c14903c954 100644 --- a/themes/Frontend/Responsive/package.json +++ b/themes/Frontend/Responsive/package.json @@ -43,7 +43,7 @@ "grunt-contrib-clean": "^2.0.1", "grunt-contrib-copy": "1.0.0", "grunt-modernizr": "^3.0.3", - "jest": "28.1.3", - "jest-environment-jsdom": "28.1.3" + "jest": "^29.6.1", + "jest-environment-jsdom": "^29.6.1" } } diff --git a/themes/package-lock.json b/themes/package-lock.json index 44ab44ae478..0f1ab12cbfc 100644 --- a/themes/package-lock.json +++ b/themes/package-lock.json @@ -1,6 +1,6 @@ { "name": "themes", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { @@ -25,6 +25,15 @@ "md5-file": "^4.0.0" } }, + "node_modules/@aashutoshrathi/word-wrap": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/@babel/code-frame": { "version": "7.12.11", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", @@ -35,21 +44,21 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", + "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz", + "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.18.6", + "@babel/helper-validator-identifier": "^7.22.5", "chalk": "^2.0.0", "js-tokens": "^4.0.0" }, @@ -128,6 +137,33 @@ "node": ">=4" } }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz", + "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/@eslint/eslintrc": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", @@ -204,9 +240,9 @@ } }, "node_modules/@types/json-schema": { - "version": "7.0.11", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "version": "7.0.12", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz", + "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==", "dev": true }, "node_modules/@types/json5": { @@ -222,19 +258,19 @@ "dev": true }, "node_modules/@types/semver": { - "version": "7.3.13", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz", - "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz", + "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==", "dev": true }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.48.1.tgz", - "integrity": "sha512-S035ueRrbxRMKvSTv9vJKIWgr86BD8s3RqoRZmsSh/s8HhIs90g6UlK8ZabUSjUZQkhVxt7nmZ63VJ9dcZhtDQ==", + "version": "5.61.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.61.0.tgz", + "integrity": "sha512-W8VoMjoSg7f7nqAROEmTt6LoBpn81AegP7uKhhW5KzYlehs8VV0ZW0fIDVbcZRcaP3aPSW+JZFua+ysQN+m/Nw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.48.1", - "@typescript-eslint/visitor-keys": "5.48.1" + "@typescript-eslint/types": "5.61.0", + "@typescript-eslint/visitor-keys": "5.61.0" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -245,9 +281,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.48.1.tgz", - "integrity": "sha512-xHyDLU6MSuEEdIlzrrAerCGS3T7AA/L8Hggd0RCYBi0w3JMvGYxlLlXHeg50JI9Tfg5MrtsfuNxbS/3zF1/ATg==", + "version": "5.61.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.61.0.tgz", + "integrity": "sha512-ldyueo58KjngXpzloHUog/h9REmHl59G1b3a5Sng1GfBo14BkS3ZbMEb3693gnP1k//97lh7bKsp6/V/0v1veQ==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -258,13 +294,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.1.tgz", - "integrity": "sha512-Hut+Osk5FYr+sgFh8J/FHjqX6HFcDzTlWLrFqGoK5kVUN3VBHF/QzZmAsIXCQ8T/W9nQNBTqalxi1P3LSqWnRA==", + "version": "5.61.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.61.0.tgz", + "integrity": "sha512-Fud90PxONnnLZ36oR5ClJBLTLfU4pIWBmnvGwTbEa2cXIqj70AEDEmOmpkFComjBZ/037ueKrOdHuYmSFVD7Rw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.48.1", - "@typescript-eslint/visitor-keys": "5.48.1", + "@typescript-eslint/types": "5.61.0", + "@typescript-eslint/visitor-keys": "5.61.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -285,18 +321,18 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.48.1.tgz", - "integrity": "sha512-SmQuSrCGUOdmGMwivW14Z0Lj8dxG1mOFZ7soeJ0TQZEJcs3n5Ndgkg0A4bcMFzBELqLJ6GTHnEU+iIoaD6hFGA==", + "version": "5.61.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.61.0.tgz", + "integrity": "sha512-mV6O+6VgQmVE6+xzlA91xifndPW9ElFW8vbSF0xCT/czPXVhwDewKila1jOyRwa9AE19zKnrr7Cg5S3pJVrTWQ==", "dev": true, "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", "@types/json-schema": "^7.0.9", "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.48.1", - "@typescript-eslint/types": "5.48.1", - "@typescript-eslint/typescript-estree": "5.48.1", + "@typescript-eslint/scope-manager": "5.61.0", + "@typescript-eslint/types": "5.61.0", + "@typescript-eslint/typescript-estree": "5.61.0", "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0", "semver": "^7.3.7" }, "engines": { @@ -310,31 +346,13 @@ "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, - "node_modules/@typescript-eslint/utils/node_modules/eslint-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", - "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^2.0.0" - }, - "engines": { - "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - }, - "peerDependencies": { - "eslint": ">=5" - } - }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.1.tgz", - "integrity": "sha512-Ns0XBwmfuX7ZknznfXozgnydyR8F6ev/KEGePP4i74uL3ArsKbEhJ7raeKr1JSa997DBDwol/4a0Y+At82c9dA==", + "version": "5.61.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.61.0.tgz", + "integrity": "sha512-50XQ5VdbWrX06mQXhy93WywSFZZGsv3EOjq+lqp6WC2t+j3mb6A9xYVdrRxafvK88vg9k9u+CT4l6D8PEatjKg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.48.1", + "@typescript-eslint/types": "5.61.0", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -346,12 +364,15 @@ } }, "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", - "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz", + "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, "node_modules/abbrev": { @@ -461,6 +482,19 @@ "sprintf-js": "~1.0.2" } }, + "node_modules/array-buffer-byte-length": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", + "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "is-array-buffer": "^3.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/array-differ": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz", @@ -534,6 +568,24 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/array.prototype.flatmap": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz", + "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "es-shim-unscopables": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/arrify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", @@ -827,9 +879,9 @@ } }, "node_modules/dateformat": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", - "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==", + "version": "4.6.3", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz", + "integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==", "dev": true, "engines": { "node": "*" @@ -859,9 +911,9 @@ "dev": true }, "node_modules/define-properties": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", - "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", + "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", "dev": true, "dependencies": { "has-property-descriptors": "^1.0.0", @@ -969,17 +1021,18 @@ } }, "node_modules/es-abstract": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.0.tgz", - "integrity": "sha512-GUGtW7eXQay0c+PRq0sGIKSdaBorfVqsCMhGHo4elP7YVqZu9nCZS4UkK4gv71gOWNMra/PaSKD3ao1oWExO0g==", + "version": "1.21.2", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz", + "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==", "dev": true, "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", - "es-set-tostringtag": "^2.0.0", + "es-set-tostringtag": "^2.0.1", "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.1.3", + "get-intrinsic": "^1.2.0", "get-symbol-description": "^1.0.0", "globalthis": "^1.0.3", "gopd": "^1.0.1", @@ -987,8 +1040,8 @@ "has-property-descriptors": "^1.0.0", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", - "internal-slot": "^1.0.4", - "is-array-buffer": "^3.0.0", + "internal-slot": "^1.0.5", + "is-array-buffer": "^3.0.2", "is-callable": "^1.2.7", "is-negative-zero": "^2.0.2", "is-regex": "^1.1.4", @@ -996,11 +1049,12 @@ "is-string": "^1.0.7", "is-typed-array": "^1.1.10", "is-weakref": "^1.0.2", - "object-inspect": "^1.12.2", + "object-inspect": "^1.12.3", "object-keys": "^1.1.1", "object.assign": "^4.1.4", "regexp.prototype.flags": "^1.4.3", "safe-regex-test": "^1.0.0", + "string.prototype.trim": "^1.2.7", "string.prototype.trimend": "^1.0.6", "string.prototype.trimstart": "^1.0.6", "typed-array-length": "^1.0.4", @@ -1150,13 +1204,14 @@ } }, "node_modules/eslint-import-resolver-node": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz", - "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==", + "version": "0.3.7", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz", + "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==", "dev": true, "dependencies": { "debug": "^3.2.7", - "resolve": "^1.20.0" + "is-core-module": "^2.11.0", + "resolve": "^1.22.1" } }, "node_modules/eslint-import-resolver-node/node_modules/debug": { @@ -1169,9 +1224,9 @@ } }, "node_modules/eslint-module-utils": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz", - "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", + "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==", "dev": true, "dependencies": { "debug": "^3.2.7" @@ -1214,23 +1269,25 @@ } }, "node_modules/eslint-plugin-import": { - "version": "2.26.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz", - "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==", + "version": "2.27.5", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz", + "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==", "dev": true, "dependencies": { - "array-includes": "^3.1.4", - "array.prototype.flat": "^1.2.5", - "debug": "^2.6.9", + "array-includes": "^3.1.6", + "array.prototype.flat": "^1.3.1", + "array.prototype.flatmap": "^1.3.1", + "debug": "^3.2.7", "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.6", - "eslint-module-utils": "^2.7.3", + "eslint-import-resolver-node": "^0.3.7", + "eslint-module-utils": "^2.7.4", "has": "^1.0.3", - "is-core-module": "^2.8.1", + "is-core-module": "^2.11.0", "is-glob": "^4.0.3", "minimatch": "^3.1.2", - "object.values": "^1.1.5", - "resolve": "^1.22.0", + "object.values": "^1.1.6", + "resolve": "^1.22.1", + "semver": "^6.3.0", "tsconfig-paths": "^3.14.1" }, "engines": { @@ -1241,12 +1298,12 @@ } }, "node_modules/eslint-plugin-import/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "dependencies": { - "ms": "2.0.0" + "ms": "^2.1.1" } }, "node_modules/eslint-plugin-import/node_modules/doctrine": { @@ -1261,11 +1318,14 @@ "node": ">=0.10.0" } }, - "node_modules/eslint-plugin-import/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "node_modules/eslint-plugin-import/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } }, "node_modules/eslint-plugin-jest": { "version": "26.9.0", @@ -1448,9 +1508,9 @@ } }, "node_modules/esquery": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", - "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", + "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", "dev": true, "dependencies": { "estraverse": "^5.1.0" @@ -1554,6 +1614,18 @@ "node": ">=4" } }, + "node_modules/external-editor/node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/extract-opts": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/extract-opts/-/extract-opts-4.3.0.tgz", @@ -1577,9 +1649,9 @@ "dev": true }, "node_modules/fast-glob": { - "version": "3.2.12", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", - "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz", + "integrity": "sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==", "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", @@ -1684,31 +1756,18 @@ } }, "node_modules/findup-sync": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz", - "integrity": "sha512-z8Nrwhi6wzxNMIbxlrTzuUW6KWuKkogZ/7OdDVq+0+kxn77KUH1nipx8iU6suqkHqc4y6n7a9A8IpmxY/pTjWg==", - "dev": true, - "dependencies": { - "glob": "~5.0.0" - }, - "engines": { - "node": ">= 0.6.0" - } - }, - "node_modules/findup-sync/node_modules/glob": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz", + "integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==", "dev": true, "dependencies": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "detect-file": "^1.0.0", + "is-glob": "^4.0.3", + "micromatch": "^4.0.4", + "resolve-dir": "^1.0.1" }, "engines": { - "node": "*" + "node": ">= 10.13.0" } }, "node_modules/fined": { @@ -1845,13 +1904,14 @@ } }, "node_modules/get-intrinsic": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", - "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", + "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", "dev": true, "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", + "has-proto": "^1.0.1", "has-symbols": "^1.0.3" }, "funding": { @@ -1958,9 +2018,9 @@ } }, "node_modules/globals": { - "version": "13.19.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz", - "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==", + "version": "13.20.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", + "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -2029,44 +2089,43 @@ } }, "node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true }, "node_modules/grunt": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.3.tgz", - "integrity": "sha512-mKwmo4X2d8/4c/BmcOETHek675uOqw0RuA/zy12jaspWqvTp4+ZeQF1W+OTpcbncnaBsfbQJ6l0l4j+Sn/GmaQ==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.6.1.tgz", + "integrity": "sha512-/ABUy3gYWu5iBmrUSRBP97JLpQUm0GgVveDCp6t3yRNIoltIYw7rEj3g5y1o2PGPR2vfTRGa7WC/LZHLTXnEzA==", "dev": true, "dependencies": { - "dateformat": "~3.0.3", + "dateformat": "~4.6.2", "eventemitter2": "~0.4.13", "exit": "~0.1.2", - "findup-sync": "~0.3.0", + "findup-sync": "~5.0.0", "glob": "~7.1.6", "grunt-cli": "~1.4.3", "grunt-known-options": "~2.0.0", "grunt-legacy-log": "~3.0.0", "grunt-legacy-util": "~2.0.1", - "iconv-lite": "~0.4.13", + "iconv-lite": "~0.6.3", "js-yaml": "~3.14.0", "minimatch": "~3.0.4", - "mkdirp": "~1.0.4", - "nopt": "~3.0.6", - "rimraf": "~3.0.2" + "nopt": "~3.0.6" }, "bin": { "grunt": "bin/grunt" }, "engines": { - "node": ">=8" + "node": ">=16" } }, "node_modules/grunt-chokidar": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/grunt-chokidar/-/grunt-chokidar-1.0.2.tgz", "integrity": "sha512-sU2QPx3nkJHhfp+yTORXLpNS8Oyq7ZoGoU6SaF/GCA4634aQvi0ZOXV6Uvm8QtjisVI+nWR4LNRxjW95LRRRVg==", + "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", "dev": true, "dependencies": { "async": "^3.1.0", @@ -2612,18 +2671,6 @@ "node": ">= 0.8.0" } }, - "node_modules/gruntify-eslint/node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, "node_modules/gruntify-eslint/node_modules/optionator": { "version": "0.8.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", @@ -2973,12 +3020,12 @@ "dev": true }, "node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": ">= 2.1.2 < 3.0.0" }, "engines": { "node": ">=0.10.0" @@ -3225,12 +3272,12 @@ } }, "node_modules/internal-slot": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz", - "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", + "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", "dev": true, "dependencies": { - "get-intrinsic": "^1.1.3", + "get-intrinsic": "^1.2.0", "has": "^1.0.3", "side-channel": "^1.0.4" }, @@ -3258,13 +3305,13 @@ } }, "node_modules/is-array-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz", - "integrity": "sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", + "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", + "get-intrinsic": "^1.2.0", "is-typed-array": "^1.1.10" }, "funding": { @@ -3324,9 +3371,9 @@ } }, "node_modules/is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz", + "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==", "dev": true, "dependencies": { "has": "^1.0.3" @@ -4012,24 +4059,24 @@ } }, "node_modules/minimist": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", - "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", "dev": true, + "dependencies": { + "minimist": "^1.2.6" + }, "bin": { "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" } }, "node_modules/ms": { @@ -4119,9 +4166,9 @@ } }, "node_modules/object-inspect": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", - "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==", + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -4233,17 +4280,17 @@ } }, "node_modules/optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "dev": true, "dependencies": { + "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" + "type-check": "^0.4.0" }, "engines": { "node": ">= 0.8.0" @@ -4489,18 +4536,18 @@ "optional": true }, "node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", "dev": true, "engines": { "node": ">=6" } }, "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", + "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==", "dev": true, "dependencies": { "side-channel": "^1.0.4" @@ -4570,14 +4617,14 @@ } }, "node_modules/regexp.prototype.flags": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", - "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", + "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "functions-have-names": "^1.2.3" }, "engines": { "node": ">= 0.4" @@ -4620,12 +4667,12 @@ } }, "node_modules/resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "version": "1.22.2", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz", + "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==", "dev": true, "dependencies": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.11.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -4823,9 +4870,9 @@ "dev": true }, "node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -4946,6 +4993,23 @@ "node": ">=8" } }, + "node_modules/string.prototype.trim": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", + "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/string.prototype.trimend": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", @@ -5129,13 +5193,13 @@ } }, "node_modules/tsconfig-paths": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", - "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==", + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz", + "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==", "dev": true, "dependencies": { "@types/json5": "^0.0.29", - "json5": "^1.0.1", + "json5": "^1.0.2", "minimist": "^1.2.6", "strip-bom": "^3.0.0" } @@ -5212,9 +5276,9 @@ } }, "node_modules/typescript": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", - "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", + "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", "dev": true, "peer": true, "bin": { @@ -5222,7 +5286,7 @@ "tsserver": "bin/tsserver" }, "engines": { - "node": ">=4.2.0" + "node": ">=14.17" } }, "node_modules/uglify-js": { @@ -5423,4032 +5487,11 @@ "node": ">=4" } }, - "node_modules/write/node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, "node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true } - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", - "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", - "dev": true, - "requires": { - "@babel/highlight": "^7.10.4" - } - }, - "@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", - "dev": true - }, - "@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.18.6", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "@eslint/eslintrc": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", - "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==", - "dev": true, - "requires": { - "ajv": "^6.12.4", - "debug": "^4.1.1", - "espree": "^7.3.0", - "globals": "^13.9.0", - "ignore": "^4.0.6", - "import-fresh": "^3.2.1", - "js-yaml": "^3.13.1", - "minimatch": "^3.0.4", - "strip-json-comments": "^3.1.1" - } - }, - "@humanwhocodes/config-array": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", - "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", - "dev": true, - "requires": { - "@humanwhocodes/object-schema": "^1.2.0", - "debug": "^4.1.1", - "minimatch": "^3.0.4" - } - }, - "@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", - "dev": true - }, - "@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - } - }, - "@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true - }, - "@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "requires": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - } - }, - "@types/json-schema": { - "version": "7.0.11", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", - "dev": true - }, - "@types/json5": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", - "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", - "dev": true - }, - "@types/minimatch": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", - "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==", - "dev": true - }, - "@types/semver": { - "version": "7.3.13", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz", - "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==", - "dev": true - }, - "@typescript-eslint/scope-manager": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.48.1.tgz", - "integrity": "sha512-S035ueRrbxRMKvSTv9vJKIWgr86BD8s3RqoRZmsSh/s8HhIs90g6UlK8ZabUSjUZQkhVxt7nmZ63VJ9dcZhtDQ==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.48.1", - "@typescript-eslint/visitor-keys": "5.48.1" - } - }, - "@typescript-eslint/types": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.48.1.tgz", - "integrity": "sha512-xHyDLU6MSuEEdIlzrrAerCGS3T7AA/L8Hggd0RCYBi0w3JMvGYxlLlXHeg50JI9Tfg5MrtsfuNxbS/3zF1/ATg==", - "dev": true - }, - "@typescript-eslint/typescript-estree": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.1.tgz", - "integrity": "sha512-Hut+Osk5FYr+sgFh8J/FHjqX6HFcDzTlWLrFqGoK5kVUN3VBHF/QzZmAsIXCQ8T/W9nQNBTqalxi1P3LSqWnRA==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.48.1", - "@typescript-eslint/visitor-keys": "5.48.1", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - } - }, - "@typescript-eslint/utils": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.48.1.tgz", - "integrity": "sha512-SmQuSrCGUOdmGMwivW14Z0Lj8dxG1mOFZ7soeJ0TQZEJcs3n5Ndgkg0A4bcMFzBELqLJ6GTHnEU+iIoaD6hFGA==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.48.1", - "@typescript-eslint/types": "5.48.1", - "@typescript-eslint/typescript-estree": "5.48.1", - "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0", - "semver": "^7.3.7" - }, - "dependencies": { - "eslint-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", - "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^2.0.0" - } - } - } - }, - "@typescript-eslint/visitor-keys": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.1.tgz", - "integrity": "sha512-Ns0XBwmfuX7ZknznfXozgnydyR8F6ev/KEGePP4i74uL3ArsKbEhJ7raeKr1JSa997DBDwol/4a0Y+At82c9dA==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.48.1", - "eslint-visitor-keys": "^3.3.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", - "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", - "dev": true - } - } - }, - "abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true - }, - "acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", - "dev": true - }, - "acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "requires": {} - }, - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ansi-colors": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", - "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", - "dev": true - }, - "ansi-escapes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", - "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", - "dev": true - }, - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dev": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "array-differ": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz", - "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==", - "dev": true - }, - "array-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", - "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==", - "dev": true - }, - "array-includes": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", - "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", - "is-string": "^1.0.7" - } - }, - "array-slice": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz", - "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==", - "dev": true - }, - "array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true - }, - "array.prototype.flat": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", - "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "es-shim-unscopables": "^1.0.0" - } - }, - "arrify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", - "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", - "dev": true - }, - "astral-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", - "dev": true - }, - "async": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", - "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==", - "dev": true - }, - "available-typed-arrays": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", - "dev": true - }, - "balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, - "binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", - "dev": true - }, - "body": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz", - "integrity": "sha512-chUsBxGRtuElD6fmw1gHLpvnKdVLK302peeFa9ZqAEk8TyzZ3fygLyUEDDPTJvL9+Bor0dIwn6ePOsRM2y0zQQ==", - "dev": true, - "requires": { - "continuable-cache": "^0.3.1", - "error": "^7.0.0", - "raw-body": "~1.1.0", - "safe-json-parse": "~1.0.1" - } - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "requires": { - "fill-range": "^7.0.1" - } - }, - "bytes": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz", - "integrity": "sha512-/x68VkHLeTl3/Ll8IvxdwzhrT+IyKc52e/oyHhA2RwqPqswSnjVbSddfPRwAsJtbilMAPSRWwAlpxdYsSWOTKQ==", - "dev": true - }, - "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, - "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - } - }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", - "dev": true - }, - "chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", - "dev": true, - "requires": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "fsevents": "~2.3.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - } - }, - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==", - "dev": true, - "requires": { - "restore-cursor": "^2.0.0" - } - }, - "cli-width": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz", - "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==", - "dev": true - }, - "coffeescript": { - "version": "1.12.7", - "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-1.12.7.tgz", - "integrity": "sha512-pLXHFxQMPklVoEekowk8b3erNynC+DVJzChxS/LCBBgR6/8AJkHivkm//zbowcfc7BTCAjryuhx6gPqPRfsFoA==", - "dev": true - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "colors": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "integrity": "sha512-ENwblkFQpqqia6b++zLD/KUWafYlVY/UNnAp7oz7LY7E924wmpye416wBOmvv/HMWzl8gL1kJlfvId/1Dg176w==", - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true - }, - "continuable-cache": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz", - "integrity": "sha512-TF30kpKhTH8AGCG3dut0rdd/19B7Z+qCnrMoBLpyQu/2drZdNrrpcjPEoJeSVsQM+8KmWG5O56oPDjSSUsuTyA==", - "dev": true - }, - "copy-anything": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz", - "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==", - "dev": true, - "requires": { - "is-what": "^3.14.1" - } - }, - "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - } - }, - "cson": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/cson/-/cson-7.20.0.tgz", - "integrity": "sha512-K7g/86vC77mJqi6PRFhd3p8U/y0R6SsCeTJb5RpOAaQdApHxCoK5JwfZ8WeJjpOZ6lyyi8tNvh3UuC184H3GWg==", - "dev": true, - "requires": { - "cson-parser": "^4.0.5", - "extract-opts": "^4.3.0", - "requirefresh": "^4.12.0", - "safefs": "^6.12.0" - } - }, - "cson-parser": { - "version": "4.0.9", - "resolved": "https://registry.npmjs.org/cson-parser/-/cson-parser-4.0.9.tgz", - "integrity": "sha512-I79SAcCYquWnEfXYj8hBqOOWKj6eH6zX1hhX3yqmS4K3bYp7jME3UFpHPzu3rUew0oyfc0s8T6IlWGXRAheHag==", - "dev": true, - "requires": { - "coffeescript": "1.12.7" - } - }, - "dateformat": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", - "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==", - "dev": true - }, - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true - }, - "define-properties": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", - "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", - "dev": true, - "requires": { - "has-property-descriptors": "^1.0.0", - "object-keys": "^1.1.1" - } - }, - "detect-file": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", - "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==", - "dev": true - }, - "dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "requires": { - "path-type": "^4.0.0" - } - }, - "doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "requires": { - "esutils": "^2.0.2" - } - }, - "duplexer": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", - "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", - "dev": true - }, - "eachr": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/eachr/-/eachr-4.5.0.tgz", - "integrity": "sha512-9I664RWp6p8jvcHZIwo7bWaiSaUmA1wNSLKwNZEiaYjqiTARq3cGjyRiIunsopZv4QMmX3T5Hs17QoPAzdYxfg==", - "dev": true, - "requires": { - "typechecker": "^6.2.0" - } - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "enquirer": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", - "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", - "dev": true, - "requires": { - "ansi-colors": "^4.1.1" - } - }, - "errno": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz", - "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==", - "dev": true, - "optional": true, - "requires": { - "prr": "~1.0.1" - } - }, - "error": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/error/-/error-7.2.1.tgz", - "integrity": "sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==", - "dev": true, - "requires": { - "string-template": "~0.2.1" - } - }, - "es-abstract": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.0.tgz", - "integrity": "sha512-GUGtW7eXQay0c+PRq0sGIKSdaBorfVqsCMhGHo4elP7YVqZu9nCZS4UkK4gv71gOWNMra/PaSKD3ao1oWExO0g==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "es-set-tostringtag": "^2.0.0", - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.1.3", - "get-symbol-description": "^1.0.0", - "globalthis": "^1.0.3", - "gopd": "^1.0.1", - "has": "^1.0.3", - "has-property-descriptors": "^1.0.0", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.4", - "is-array-buffer": "^3.0.0", - "is-callable": "^1.2.7", - "is-negative-zero": "^2.0.2", - "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.2", - "is-string": "^1.0.7", - "is-typed-array": "^1.1.10", - "is-weakref": "^1.0.2", - "object-inspect": "^1.12.2", - "object-keys": "^1.1.1", - "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.4.3", - "safe-regex-test": "^1.0.0", - "string.prototype.trimend": "^1.0.6", - "string.prototype.trimstart": "^1.0.6", - "typed-array-length": "^1.0.4", - "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.9" - } - }, - "es-set-tostringtag": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", - "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", - "dev": true, - "requires": { - "get-intrinsic": "^1.1.3", - "has": "^1.0.3", - "has-tostringtag": "^1.0.0" - } - }, - "es-shim-unscopables": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", - "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", - "dev": true, - "requires": { - "has": "^1.0.3" - } - }, - "es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, - "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - } - }, - "escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true - }, - "eslint": { - "version": "7.32.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", - "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", - "dev": true, - "requires": { - "@babel/code-frame": "7.12.11", - "@eslint/eslintrc": "^0.4.3", - "@humanwhocodes/config-array": "^0.5.0", - "ajv": "^6.10.0", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.0.1", - "doctrine": "^3.0.0", - "enquirer": "^2.3.5", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^5.1.1", - "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^2.0.0", - "espree": "^7.3.1", - "esquery": "^1.4.0", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.1.2", - "globals": "^13.6.0", - "ignore": "^4.0.6", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "js-yaml": "^3.13.1", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.0.4", - "natural-compare": "^1.4.0", - "optionator": "^0.9.1", - "progress": "^2.0.0", - "regexpp": "^3.1.0", - "semver": "^7.2.1", - "strip-ansi": "^6.0.0", - "strip-json-comments": "^3.1.0", - "table": "^6.0.9", - "text-table": "^0.2.0", - "v8-compile-cache": "^2.0.3" - } - }, - "eslint-config-standard": { - "version": "16.0.3", - "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz", - "integrity": "sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg==", - "dev": true, - "requires": {} - }, - "eslint-import-resolver-node": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz", - "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==", - "dev": true, - "requires": { - "debug": "^3.2.7", - "resolve": "^1.20.0" - }, - "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "eslint-module-utils": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz", - "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==", - "dev": true, - "requires": { - "debug": "^3.2.7" - }, - "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "eslint-plugin-es": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz", - "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==", - "dev": true, - "requires": { - "eslint-utils": "^2.0.0", - "regexpp": "^3.0.0" - } - }, - "eslint-plugin-import": { - "version": "2.26.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz", - "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==", - "dev": true, - "requires": { - "array-includes": "^3.1.4", - "array.prototype.flat": "^1.2.5", - "debug": "^2.6.9", - "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.6", - "eslint-module-utils": "^2.7.3", - "has": "^1.0.3", - "is-core-module": "^2.8.1", - "is-glob": "^4.0.3", - "minimatch": "^3.1.2", - "object.values": "^1.1.5", - "resolve": "^1.22.0", - "tsconfig-paths": "^3.14.1" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "dev": true, - "requires": { - "esutils": "^2.0.2" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - } - } - }, - "eslint-plugin-jest": { - "version": "26.9.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.9.0.tgz", - "integrity": "sha512-TWJxWGp1J628gxh2KhaH1H1paEdgE2J61BBF1I59c6xWeL5+D1BzMxGDN/nXAfX+aSkR5u80K+XhskK6Gwq9ng==", - "dev": true, - "requires": { - "@typescript-eslint/utils": "^5.10.0" - } - }, - "eslint-plugin-node": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz", - "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==", - "dev": true, - "requires": { - "eslint-plugin-es": "^3.0.0", - "eslint-utils": "^2.0.0", - "ignore": "^5.1.1", - "minimatch": "^3.0.4", - "resolve": "^1.10.1", - "semver": "^6.1.0" - }, - "dependencies": { - "ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", - "dev": true - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "eslint-plugin-promise": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.2.0.tgz", - "integrity": "sha512-SftLb1pUG01QYq2A/hGAWfDRXqYD82zE7j7TopDOyNdU+7SvvoXREls/+PRTY17vUXzXnZA/zfnyKgRH6x4JJw==", - "dev": true, - "requires": {} - }, - "eslint-plugin-standard": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-5.0.0.tgz", - "integrity": "sha512-eSIXPc9wBM4BrniMzJRBm2uoVuXz2EPa+NXPk2+itrVt+r5SbKFERx/IgrK/HmfjddyKVz2f+j+7gBRvu19xLg==", - "dev": true, - "requires": {} - }, - "eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - } - }, - "eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^1.1.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true - } - } - }, - "eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true - }, - "espree": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", - "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", - "dev": true, - "requires": { - "acorn": "^7.4.0", - "acorn-jsx": "^5.3.1", - "eslint-visitor-keys": "^1.3.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true - } - } - }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, - "esquery": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", - "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", - "dev": true, - "requires": { - "estraverse": "^5.1.0" - }, - "dependencies": { - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - } - } - }, - "esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "requires": { - "estraverse": "^5.2.0" - }, - "dependencies": { - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - } - } - }, - "estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true - }, - "esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true - }, - "eventemitter2": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz", - "integrity": "sha512-K7J4xq5xAD5jHsGM5ReWXRTFa3JRGofHiMcVgQ8PRwgWxzjHpMWCIzsmyf60+mh8KLsqYPcjUMa0AC4hd6lPyQ==", - "dev": true - }, - "exit": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", - "dev": true - }, - "expand-tilde": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==", - "dev": true, - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, - "external-editor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", - "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "dev": true, - "requires": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" - } - }, - "extract-opts": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/extract-opts/-/extract-opts-4.3.0.tgz", - "integrity": "sha512-Dmssi1tgKJkQsVmbP7TgW/kbdc42SAsNf6h9ClweP+dS7O24YYMTXsNwPelxhx0LF15npiWwY5ahKtyQiNgxWA==", - "dev": true, - "requires": { - "eachr": "^4.5.0", - "typechecker": "^6.2.0" - } - }, - "fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "fast-glob": { - "version": "3.2.12", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", - "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - } - }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true - }, - "fastq": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", - "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", - "dev": true, - "requires": { - "reusify": "^1.0.4" - } - }, - "faye-websocket": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", - "integrity": "sha512-Xhj93RXbMSq8urNCUq4p9l0P6hnySJ/7YNRhYNug0bLOuii7pKO7xQFb5mx9xZXWCar88pLPb805PvUkwrLZpQ==", - "dev": true, - "requires": { - "websocket-driver": ">=0.5.1" - } - }, - "figures": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", - "integrity": "sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.5", - "object-assign": "^4.1.0" - }, - "dependencies": { - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true - } - } - }, - "file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "requires": { - "flat-cache": "^3.0.4" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "^3.0.0" - } - }, - "findup-sync": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz", - "integrity": "sha512-z8Nrwhi6wzxNMIbxlrTzuUW6KWuKkogZ/7OdDVq+0+kxn77KUH1nipx8iU6suqkHqc4y6n7a9A8IpmxY/pTjWg==", - "dev": true, - "requires": { - "glob": "~5.0.0" - }, - "dependencies": { - "glob": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==", - "dev": true, - "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - } - } - }, - "fined": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz", - "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==", - "dev": true, - "requires": { - "expand-tilde": "^2.0.2", - "is-plain-object": "^2.0.3", - "object.defaults": "^1.1.0", - "object.pick": "^1.2.0", - "parse-filepath": "^1.0.1" - } - }, - "flagged-respawn": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz", - "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==", - "dev": true - }, - "flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", - "dev": true, - "requires": { - "flatted": "^3.1.0", - "rimraf": "^3.0.2" - } - }, - "flatted": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", - "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", - "dev": true - }, - "for-each": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", - "dev": true, - "requires": { - "is-callable": "^1.1.3" - } - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==", - "dev": true - }, - "for-own": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==", - "dev": true, - "requires": { - "for-in": "^1.0.1" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true - }, - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "optional": true - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "function.prototype.name": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", - "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" - } - }, - "functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==", - "dev": true - }, - "functions-have-names": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", - "dev": true - }, - "get-intrinsic": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", - "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", - "dev": true, - "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" - } - }, - "get-symbol-description": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", - "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" - } - }, - "getobject": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/getobject/-/getobject-1.0.2.tgz", - "integrity": "sha512-2zblDBaFcb3rB4rF77XVnuINOE2h2k/OnqXAiy0IrTxUfV1iFp3la33oAQVY9pCpWU268WFYVt2t71hlMuLsOg==", - "dev": true - }, - "glob": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", - "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "global-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "dev": true, - "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" - } - }, - "global-prefix": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==", - "dev": true, - "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" - }, - "dependencies": { - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } - } - }, - "globals": { - "version": "13.19.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz", - "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==", - "dev": true, - "requires": { - "type-fest": "^0.20.2" - } - }, - "globalthis": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", - "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", - "dev": true, - "requires": { - "define-properties": "^1.1.3" - } - }, - "globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "requires": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, - "dependencies": { - "ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", - "dev": true - } - } - }, - "gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dev": true, - "requires": { - "get-intrinsic": "^1.1.3" - } - }, - "graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true - }, - "grunt": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.3.tgz", - "integrity": "sha512-mKwmo4X2d8/4c/BmcOETHek675uOqw0RuA/zy12jaspWqvTp4+ZeQF1W+OTpcbncnaBsfbQJ6l0l4j+Sn/GmaQ==", - "dev": true, - "requires": { - "dateformat": "~3.0.3", - "eventemitter2": "~0.4.13", - "exit": "~0.1.2", - "findup-sync": "~0.3.0", - "glob": "~7.1.6", - "grunt-cli": "~1.4.3", - "grunt-known-options": "~2.0.0", - "grunt-legacy-log": "~3.0.0", - "grunt-legacy-util": "~2.0.1", - "iconv-lite": "~0.4.13", - "js-yaml": "~3.14.0", - "minimatch": "~3.0.4", - "mkdirp": "~1.0.4", - "nopt": "~3.0.6", - "rimraf": "~3.0.2" - }, - "dependencies": { - "minimatch": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz", - "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - } - } - }, - "grunt-chokidar": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/grunt-chokidar/-/grunt-chokidar-1.0.2.tgz", - "integrity": "sha512-sU2QPx3nkJHhfp+yTORXLpNS8Oyq7ZoGoU6SaF/GCA4634aQvi0ZOXV6Uvm8QtjisVI+nWR4LNRxjW95LRRRVg==", - "dev": true, - "requires": { - "async": "^3.1.0", - "chokidar": "^3.0.2", - "lodash": "^4.17.15", - "tiny-lr": "^1.1.1" - } - }, - "grunt-cli": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz", - "integrity": "sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==", - "dev": true, - "requires": { - "grunt-known-options": "~2.0.0", - "interpret": "~1.1.0", - "liftup": "~3.0.1", - "nopt": "~4.0.1", - "v8flags": "~3.2.0" - }, - "dependencies": { - "nopt": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", - "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==", - "dev": true, - "requires": { - "abbrev": "1", - "osenv": "^0.1.4" - } - } - } - }, - "grunt-contrib-eslint": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/grunt-contrib-eslint/-/grunt-contrib-eslint-0.0.5.tgz", - "integrity": "sha512-WUPRAqCB2bWwIehrg2OrNkLIAFDrUNAJzver0vfpy/teBsfuMHOyiyOvZ4R/L/PWO+U3zd7ronpt+JNRPr6/iA==", - "dev": true, - "requires": { - "eslint": ">0.7.3" - } - }, - "grunt-contrib-less": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-2.1.0.tgz", - "integrity": "sha512-+GNKFKpZfiopgUd5cDYNuzsVHZ7WFHM7MOUPKtmMDhfKQ4ZSFuVpNP5PoTFs669TARE6Rvgtv1izILKCpuhFZw==", - "dev": true, - "requires": { - "async": "^3.2.0", - "chalk": "^4.1.0", - "less": "^3.0.4", - "lodash": "^4.17.20" - } - }, - "grunt-contrib-uglify": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-5.0.0.tgz", - "integrity": "sha512-rIFFPJMWKnh6oxDe2b810Ysg5SKoiI0u/FvuvAVpvJ7VHILkKtGqA4jgJ1JWruWQ+1m5FtB1lVSK81YyzIgDUw==", - "dev": true, - "requires": { - "chalk": "^2.4.1", - "maxmin": "^2.1.0", - "uglify-js": "^3.5.0", - "uri-path": "^1.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "grunt-file-exists": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/grunt-file-exists/-/grunt-file-exists-0.1.4.tgz", - "integrity": "sha512-AKs+2aKdMtCfUYIhPMfj3trgr0ZJX9316Z8Hsno7xoZQ4sF6KdTgeTeYy8rV7zKjuob3+qAETTQEr1TFcvEZUg==", - "dev": true, - "requires": {} - }, - "grunt-known-options": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz", - "integrity": "sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==", - "dev": true - }, - "grunt-legacy-log": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz", - "integrity": "sha512-GHZQzZmhyq0u3hr7aHW4qUH0xDzwp2YXldLPZTCjlOeGscAOWWPftZG3XioW8MasGp+OBRIu39LFx14SLjXRcA==", - "dev": true, - "requires": { - "colors": "~1.1.2", - "grunt-legacy-log-utils": "~2.1.0", - "hooker": "~0.2.3", - "lodash": "~4.17.19" - } - }, - "grunt-legacy-log-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz", - "integrity": "sha512-lwquaPXJtKQk0rUM1IQAop5noEpwFqOXasVoedLeNzaibf/OPWjKYvvdqnEHNmU+0T0CaReAXIbGo747ZD+Aaw==", - "dev": true, - "requires": { - "chalk": "~4.1.0", - "lodash": "~4.17.19" - } - }, - "grunt-legacy-util": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz", - "integrity": "sha512-2bQiD4fzXqX8rhNdXkAywCadeqiPiay0oQny77wA2F3WF4grPJXCvAcyoWUJV+po/b15glGkxuSiQCK299UC2w==", - "dev": true, - "requires": { - "async": "~3.2.0", - "exit": "~0.1.2", - "getobject": "~1.0.0", - "hooker": "~0.2.3", - "lodash": "~4.17.21", - "underscore.string": "~3.3.5", - "which": "~2.0.2" - } - }, - "grunt-subgrunt": { - "version": "git+ssh://git@github.com/tusbar/grunt-subgrunt.git#c52da809fe78b1437ef3b194483c56c934b5fee1", - "dev": true, - "from": "grunt-subgrunt@github:tusbar/grunt-subgrunt#master", - "requires": { - "async": "^3.2.0", - "glob": "^7.0.0" - } - }, - "gruntify-eslint": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/gruntify-eslint/-/gruntify-eslint-5.0.0.tgz", - "integrity": "sha512-pa2sXHK9+U4dCGdGSIMkpJARNwRStdLBsddNxmSHSSWROUdhWMrXvFWm6pj48zJhyV3Qy068VIuF1seYIvc0cw==", - "dev": true, - "requires": { - "eslint": "^5.0.0" - }, - "dependencies": { - "acorn": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", - "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==", - "dev": true - }, - "ansi-regex": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", - "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "astral-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", - "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", - "dev": true - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dev": true, - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true - }, - "eslint": { - "version": "5.16.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz", - "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "ajv": "^6.9.1", - "chalk": "^2.1.0", - "cross-spawn": "^6.0.5", - "debug": "^4.0.1", - "doctrine": "^3.0.0", - "eslint-scope": "^4.0.3", - "eslint-utils": "^1.3.1", - "eslint-visitor-keys": "^1.0.0", - "espree": "^5.0.1", - "esquery": "^1.0.1", - "esutils": "^2.0.2", - "file-entry-cache": "^5.0.1", - "functional-red-black-tree": "^1.0.1", - "glob": "^7.1.2", - "globals": "^11.7.0", - "ignore": "^4.0.6", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "inquirer": "^6.2.2", - "js-yaml": "^3.13.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.3.0", - "lodash": "^4.17.11", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", - "natural-compare": "^1.4.0", - "optionator": "^0.8.2", - "path-is-inside": "^1.0.2", - "progress": "^2.0.0", - "regexpp": "^2.0.1", - "semver": "^5.5.1", - "strip-ansi": "^4.0.0", - "strip-json-comments": "^2.0.1", - "table": "^5.2.3", - "text-table": "^0.2.0" - } - }, - "eslint-scope": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", - "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", - "dev": true, - "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" - } - }, - "eslint-utils": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", - "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^1.1.0" - } - }, - "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true - }, - "espree": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz", - "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==", - "dev": true, - "requires": { - "acorn": "^6.0.7", - "acorn-jsx": "^5.0.0", - "eslint-visitor-keys": "^1.0.0" - } - }, - "file-entry-cache": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", - "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", - "dev": true, - "requires": { - "flat-cache": "^2.0.1" - } - }, - "flat-cache": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", - "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", - "dev": true, - "requires": { - "flatted": "^2.0.0", - "rimraf": "2.6.3", - "write": "1.0.3" - } - }, - "flatted": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz", - "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==", - "dev": true - }, - "globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", - "dev": true - }, - "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - } - }, - "mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "requires": { - "minimist": "^1.2.6" - } - }, - "optionator": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", - "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", - "dev": true, - "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.6", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "word-wrap": "~1.2.3" - } - }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==", - "dev": true - }, - "prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", - "dev": true - }, - "regexpp": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", - "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", - "dev": true - }, - "rimraf": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==", - "dev": true, - "requires": { - "shebang-regex": "^1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==", - "dev": true - }, - "slice-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", - "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.0", - "astral-regex": "^1.0.0", - "is-fullwidth-code-point": "^2.0.0" - } - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", - "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", - "dev": true - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - }, - "table": { - "version": "5.4.6", - "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", - "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", - "dev": true, - "requires": { - "ajv": "^6.10.2", - "lodash": "^4.17.14", - "slice-ansi": "^2.1.0", - "string-width": "^3.0.0" - } - }, - "type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2" - } - }, - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } - } - }, - "gzip-size": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-3.0.0.tgz", - "integrity": "sha512-6s8trQiK+OMzSaCSVXX+iqIcLV9tC+E73jrJrJTyS4h/AJhlxHvzFKqM1YLDJWRGgHX8uLkBeXkA0njNj39L4w==", - "dev": true, - "requires": { - "duplexer": "^0.1.1" - } - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", - "dev": true - } - } - }, - "has-bigints": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", - "dev": true, - "requires": { - "get-intrinsic": "^1.1.1" - } - }, - "has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", - "dev": true - }, - "has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "dev": true - }, - "has-tostringtag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", - "dev": true, - "requires": { - "has-symbols": "^1.0.2" - } - }, - "homedir-polyfill": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", - "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", - "dev": true, - "requires": { - "parse-passwd": "^1.0.0" - } - }, - "hooker": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz", - "integrity": "sha512-t+UerCsQviSymAInD01Pw+Dn/usmz1sRO+3Zk1+lx8eg+WKpD2ulcwWqHHL0+aseRBr+3+vIhiG1K1JTwaIcTA==", - "dev": true - }, - "http-parser-js": { - "version": "0.5.8", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz", - "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==", - "dev": true - }, - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", - "dev": true - }, - "image-size": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", - "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==", - "dev": true, - "optional": true - }, - "import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "requires": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - } - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true - }, - "inquirer": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz", - "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==", - "dev": true, - "requires": { - "ansi-escapes": "^3.2.0", - "chalk": "^2.4.2", - "cli-cursor": "^2.1.0", - "cli-width": "^2.0.0", - "external-editor": "^3.0.3", - "figures": "^2.0.0", - "lodash": "^4.17.12", - "mute-stream": "0.0.7", - "run-async": "^2.2.0", - "rxjs": "^6.4.0", - "string-width": "^2.1.0", - "strip-ansi": "^5.1.0", - "through": "^2.3.6" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", - "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true - }, - "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", - "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "internal-slot": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz", - "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==", - "dev": true, - "requires": { - "get-intrinsic": "^1.1.3", - "has": "^1.0.3", - "side-channel": "^1.0.4" - } - }, - "interpret": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz", - "integrity": "sha512-CLM8SNMDu7C5psFCn6Wg/tgpj/bKAg7hc2gWqcuR9OD5Ft9PhBpIu8PLicPeis+xDd6YX2ncI8MCA64I9tftIA==", - "dev": true - }, - "is-absolute": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", - "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", - "dev": true, - "requires": { - "is-relative": "^1.0.0", - "is-windows": "^1.0.1" - } - }, - "is-array-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz", - "integrity": "sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", - "is-typed-array": "^1.1.10" - } - }, - "is-bigint": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", - "dev": true, - "requires": { - "has-bigints": "^1.0.1" - } - }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-boolean-object": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - } - }, - "is-callable": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", - "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", - "dev": true - }, - "is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", - "dev": true, - "requires": { - "has": "^1.0.3" - } - }, - "is-date-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", - "dev": true, - "requires": { - "has-tostringtag": "^1.0.0" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-negative-zero": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", - "dev": true - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "is-number-object": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", - "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", - "dev": true, - "requires": { - "has-tostringtag": "^1.0.0" - } - }, - "is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - }, - "is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - } - }, - "is-relative": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", - "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", - "dev": true, - "requires": { - "is-unc-path": "^1.0.0" - } - }, - "is-shared-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", - "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2" - } - }, - "is-string": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", - "dev": true, - "requires": { - "has-tostringtag": "^1.0.0" - } - }, - "is-symbol": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", - "dev": true, - "requires": { - "has-symbols": "^1.0.2" - } - }, - "is-typed-array": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz", - "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==", - "dev": true, - "requires": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" - } - }, - "is-unc-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", - "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", - "dev": true, - "requires": { - "unc-path-regex": "^0.1.2" - } - }, - "is-weakref": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", - "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.2" - } - }, - "is-what": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz", - "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==", - "dev": true - }, - "is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", - "dev": true - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", - "dev": true - }, - "jit-grunt": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/jit-grunt/-/jit-grunt-0.10.0.tgz", - "integrity": "sha512-eT/f4c9wgZ3buXB7X1JY1w6uNtAV0bhrbOGf/mFmBb0CDNLUETJ/VRoydayWOI54tOoam0cz9RooVCn3QY1WoA==", - "dev": true, - "requires": {} - }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - }, - "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "js-yaml-js-types": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/js-yaml-js-types/-/js-yaml-js-types-1.0.0.tgz", - "integrity": "sha512-UNjPwuoaj4mcHkJCJSF6l4MgkzoFjG+JJkBXMYNvjgO3yE9gTeRt+E6PN022vduz/daZZ7HmlEiSEE36NrGE4w==", - "dev": true, - "requires": { - "esprima": "^4.0.1" - } - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true - }, - "json5": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", - "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", - "dev": true, - "requires": { - "minimist": "^1.2.0" - } - }, - "kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true - }, - "less": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/less/-/less-3.13.1.tgz", - "integrity": "sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==", - "dev": true, - "requires": { - "copy-anything": "^2.0.1", - "errno": "^0.1.1", - "graceful-fs": "^4.1.2", - "image-size": "~0.5.0", - "make-dir": "^2.1.0", - "mime": "^1.4.1", - "native-request": "^1.0.5", - "source-map": "~0.6.0", - "tslib": "^1.10.0" - } - }, - "levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "requires": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - } - }, - "liftup": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/liftup/-/liftup-3.0.1.tgz", - "integrity": "sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw==", - "dev": true, - "requires": { - "extend": "^3.0.2", - "findup-sync": "^4.0.0", - "fined": "^1.2.0", - "flagged-respawn": "^1.0.1", - "is-plain-object": "^2.0.4", - "object.map": "^1.0.1", - "rechoir": "^0.7.0", - "resolve": "^1.19.0" - }, - "dependencies": { - "findup-sync": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz", - "integrity": "sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==", - "dev": true, - "requires": { - "detect-file": "^1.0.0", - "is-glob": "^4.0.0", - "micromatch": "^4.0.2", - "resolve-dir": "^1.0.1" - } - } - } - }, - "livereload-js": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz", - "integrity": "sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==", - "dev": true - }, - "load-grunt-config": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/load-grunt-config/-/load-grunt-config-4.0.1.tgz", - "integrity": "sha512-F3CD28C1WFocVvdTRSKnV73q7JvGY2OrqoeUeflbOQg58AhkFROIFc2BQXOU2xdrYJqWZx53glT5PZp1vrr9qA==", - "dev": true, - "requires": { - "cson": "7.20.0", - "glob": "7.1.7", - "jit-grunt": "0.10.0", - "js-yaml": "4.1.0", - "js-yaml-js-types": "1.0.0", - "load-grunt-tasks": "5.1.0", - "lodash": "4.17.21" - }, - "dependencies": { - "argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "requires": { - "argparse": "^2.0.1" - } - } - } - }, - "load-grunt-tasks": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/load-grunt-tasks/-/load-grunt-tasks-5.1.0.tgz", - "integrity": "sha512-oNj0Jlka1TsfDe+9He0kcA1cRln+TMoTsEByW7ij6kyktNLxBKJtslCFEvFrLC2Dj0S19IWJh3fOCIjLby2Xrg==", - "dev": true, - "requires": { - "arrify": "^2.0.1", - "multimatch": "^4.0.0", - "pkg-up": "^3.1.0", - "resolve-pkg": "^2.0.0" - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, - "lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, - "lodash.truncate": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", - "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==", - "dev": true - }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", - "dev": true, - "optional": true, - "requires": { - "pify": "^4.0.1", - "semver": "^5.6.0" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "optional": true - } - } - }, - "make-iterator": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz", - "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==", - "dev": true, - "requires": { - "kind-of": "^6.0.2" - } - }, - "map-cache": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==", - "dev": true - }, - "maxmin": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-2.1.0.tgz", - "integrity": "sha512-NWlApBjW9az9qRPaeg7CX4sQBWwytqz32bIEo1PW9pRW+kBP9KLRfJO3UC+TV31EcQZEUq7eMzikC7zt3zPJcw==", - "dev": true, - "requires": { - "chalk": "^1.0.0", - "figures": "^1.0.1", - "gzip-size": "^3.0.0", - "pretty-bytes": "^3.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==", - "dev": true - } - } - }, - "md5-file": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/md5-file/-/md5-file-4.0.0.tgz", - "integrity": "sha512-UC0qFwyAjn4YdPpKaDNw6gNxRf7Mcx7jC1UGCY4boCzgvU2Aoc1mOGzTtrjjLKhM5ivsnhoKpQVxKPp+1j1qwg==", - "dev": true - }, - "merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true - }, - "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dev": true, - "requires": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - } - }, - "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "dev": true, - "optional": true - }, - "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", - "dev": true - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", - "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", - "dev": true - }, - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "multimatch": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz", - "integrity": "sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==", - "dev": true, - "requires": { - "@types/minimatch": "^3.0.3", - "array-differ": "^3.0.0", - "array-union": "^2.1.0", - "arrify": "^2.0.1", - "minimatch": "^3.0.4" - } - }, - "mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ==", - "dev": true - }, - "native-request": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.1.0.tgz", - "integrity": "sha512-uZ5rQaeRn15XmpgE0xoPL8YWqcX90VtCFglYwAgkvKM5e8fog+vePLAhHxuuv/gRkrQxIeh5U3q9sMNUrENqWw==", - "dev": true, - "optional": true - }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true - }, - "nice-try": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", - "dev": true - }, - "nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==", - "dev": true, - "requires": { - "abbrev": "1" - } - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==", - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true - }, - "object-inspect": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", - "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==", - "dev": true - }, - "object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true - }, - "object.assign": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", - "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "has-symbols": "^1.0.3", - "object-keys": "^1.1.1" - } - }, - "object.defaults": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", - "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==", - "dev": true, - "requires": { - "array-each": "^1.0.1", - "array-slice": "^1.0.0", - "for-own": "^1.0.0", - "isobject": "^3.0.0" - } - }, - "object.map": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz", - "integrity": "sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==", - "dev": true, - "requires": { - "for-own": "^1.0.0", - "make-iterator": "^1.0.0" - } - }, - "object.pick": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==", - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - }, - "object.values": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", - "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==", - "dev": true, - "requires": { - "mimic-fn": "^1.0.0" - } - }, - "optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", - "dev": true, - "requires": { - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" - } - }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==", - "dev": true - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", - "dev": true - }, - "osenv": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", - "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", - "dev": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "requires": { - "callsites": "^3.0.0" - } - }, - "parse-filepath": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", - "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==", - "dev": true, - "requires": { - "is-absolute": "^1.0.0", - "map-cache": "^0.2.0", - "path-root": "^0.1.1" - } - }, - "parse-passwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==", - "dev": true - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true - }, - "path-is-inside": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", - "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==", - "dev": true - }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true - }, - "path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true - }, - "path-root": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", - "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==", - "dev": true, - "requires": { - "path-root-regex": "^0.1.0" - } - }, - "path-root-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", - "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==", - "dev": true - }, - "path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true - }, - "picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true - }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true, - "optional": true - }, - "pkg-up": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz", - "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", - "dev": true, - "requires": { - "find-up": "^3.0.0" - } - }, - "prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true - }, - "pretty-bytes": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-3.0.1.tgz", - "integrity": "sha512-eb7ZAeUTgfh294cElcu51w+OTRp/6ItW758LjwJSK72LDevcuJn0P4eD71PLMDGPwwatXmAmYHTkzvpKlJE3ow==", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true - }, - "prr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==", - "dev": true, - "optional": true - }, - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true - }, - "qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", - "dev": true, - "requires": { - "side-channel": "^1.0.4" - } - }, - "queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true - }, - "raw-body": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz", - "integrity": "sha512-WmJJU2e9Y6M5UzTOkHaM7xJGAPQD8PNzx3bAd2+uhZAim6wDk6dAZxPVYLF67XhbR4hmKGh33Lpmh4XWrCH5Mg==", - "dev": true, - "requires": { - "bytes": "1", - "string_decoder": "0.10" - } - }, - "readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, - "requires": { - "picomatch": "^2.2.1" - } - }, - "rechoir": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", - "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", - "dev": true, - "requires": { - "resolve": "^1.9.0" - } - }, - "regexp.prototype.flags": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", - "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "functions-have-names": "^1.2.2" - } - }, - "regexpp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", - "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", - "dev": true - }, - "require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true - }, - "requirefresh": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/requirefresh/-/requirefresh-4.13.0.tgz", - "integrity": "sha512-APrzWWxqnwE2Bz3ysFepAU0Dc0aYjn8jsDLFIegedn+KVCS9LykAclkf+6YaJXk3ON9l6QAm04rN+bEA89cGIg==", - "dev": true - }, - "resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", - "dev": true, - "requires": { - "is-core-module": "^2.9.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - } - }, - "resolve-dir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==", - "dev": true, - "requires": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" - } - }, - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true - }, - "resolve-pkg": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-pkg/-/resolve-pkg-2.0.0.tgz", - "integrity": "sha512-+1lzwXehGCXSeryaISr6WujZzowloigEofRB+dj75y9RRa/obVcYgbHJd53tdYw8pvZj8GojXaaENws8Ktw/hQ==", - "dev": true, - "requires": { - "resolve-from": "^5.0.0" - }, - "dependencies": { - "resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true - } - } - }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==", - "dev": true, - "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" - } - }, - "reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, - "run-async": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", - "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", - "dev": true - }, - "run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "requires": { - "queue-microtask": "^1.2.2" - } - }, - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true - }, - "safe-json-parse": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz", - "integrity": "sha512-o0JmTu17WGUaUOHa1l0FPGXKBfijbxK6qoHzlkihsDXxzBHvJcA7zgviKR92Xs841rX9pK16unfphLq0/KqX7A==", - "dev": true - }, - "safe-regex-test": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", - "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", - "is-regex": "^1.1.4" - } - }, - "safefs": { - "version": "6.16.0", - "resolved": "https://registry.npmjs.org/safefs/-/safefs-6.16.0.tgz", - "integrity": "sha512-IUIN5h+r2acNVkbsM5VoBUsRnaSFwQFZnzyvQsiLlgFsncLi7rrtmM4FsEgwv+xDTJzsrp79rd+/GJu2zWcR9w==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.6" - } - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true - }, - "side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "dev": true, - "requires": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" - } - }, - "signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==", - "dev": true - }, - "string-template": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz", - "integrity": "sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==", - "dev": true - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, - "string.prototype.trimend": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", - "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - } - }, - "string.prototype.trimstart": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", - "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", - "dev": true - }, - "strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, - "supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true - }, - "table": { - "version": "6.8.1", - "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz", - "integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==", - "dev": true, - "requires": { - "ajv": "^8.0.1", - "lodash.truncate": "^4.4.2", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1" - }, - "dependencies": { - "ajv": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", - "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - } - }, - "json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - } - } - }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true - }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", - "dev": true - }, - "tiny-lr": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz", - "integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==", - "dev": true, - "requires": { - "body": "^5.1.0", - "debug": "^3.1.0", - "faye-websocket": "~0.10.0", - "livereload-js": "^2.3.0", - "object-assign": "^4.1.0", - "qs": "^6.4.0" - }, - "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "requires": { - "os-tmpdir": "~1.0.2" - } - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } - }, - "tsconfig-paths": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", - "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==", - "dev": true, - "requires": { - "@types/json5": "^0.0.29", - "json5": "^1.0.1", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, - "tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", - "dev": true, - "requires": { - "tslib": "^1.8.1" - } - }, - "type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "requires": { - "prelude-ls": "^1.2.1" - } - }, - "type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true - }, - "typechecker": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/typechecker/-/typechecker-6.4.0.tgz", - "integrity": "sha512-EbOu+9szY13mhl0EsvLXnR+pTCa3gTHQQPLdce72ujcC9fRHXlVFBNXtHeRhgzLxLlKUh4zA9C0tezLDgshf+A==", - "dev": true - }, - "typed-array-length": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", - "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "is-typed-array": "^1.1.9" - } - }, - "typescript": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", - "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", - "dev": true, - "peer": true - }, - "uglify-js": { - "version": "3.17.4", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz", - "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==", - "dev": true - }, - "unbox-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", - "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "has-bigints": "^1.0.2", - "has-symbols": "^1.0.3", - "which-boxed-primitive": "^1.0.2" - } - }, - "unc-path-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", - "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==", - "dev": true - }, - "underscore.string": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.6.tgz", - "integrity": "sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ==", - "dev": true, - "requires": { - "sprintf-js": "^1.1.1", - "util-deprecate": "^1.0.2" - }, - "dependencies": { - "sprintf-js": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", - "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", - "dev": true - } - } - }, - "uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "requires": { - "punycode": "^2.1.0" - } - }, - "uri-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/uri-path/-/uri-path-1.0.0.tgz", - "integrity": "sha512-8pMuAn4KacYdGMkFaoQARicp4HSw24/DHOVKWqVRJ8LhhAwPPFpdGvdL9184JVmUwe7vz7Z9n6IqI6t5n2ELdg==", - "dev": true - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true - }, - "v8-compile-cache": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", - "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", - "dev": true - }, - "v8flags": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz", - "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==", - "dev": true, - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, - "websocket-driver": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", - "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", - "dev": true, - "requires": { - "http-parser-js": ">=0.5.1", - "safe-buffer": ">=5.1.0", - "websocket-extensions": ">=0.1.1" - } - }, - "websocket-extensions": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", - "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", - "dev": true - }, - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - }, - "which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "dev": true, - "requires": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" - } - }, - "which-typed-array": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz", - "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==", - "dev": true, - "requires": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0", - "is-typed-array": "^1.1.10" - } - }, - "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true - }, - "write": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz", - "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", - "dev": true, - "requires": { - "mkdirp": "^0.5.1" - }, - "dependencies": { - "mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "requires": { - "minimist": "^1.2.6" - } - } - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } } } From 2c71ba6d5828919f3f2acd3dddeacd6d823fa6cb Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 10 Jul 2023 11:11:51 +0200 Subject: [PATCH 445/730] chore(SW-27143): Update devenv --- devenv.lock | 86 +++++++++++++++++++++++++++++++++++++---------------- devenv.yaml | 2 ++ 2 files changed, 63 insertions(+), 25 deletions(-) diff --git a/devenv.lock b/devenv.lock index 06c7e6b3c9c..dc82c1a8448 100644 --- a/devenv.lock +++ b/devenv.lock @@ -3,11 +3,11 @@ "devenv": { "locked": { "dir": "src/modules", - "lastModified": 1678720350, - "narHash": "sha256-2WUISGDqlshoLgLh2BCqWn0jAcHOnROYtEpgemmxXaQ=", + "lastModified": 1689023409, + "narHash": "sha256-0Dd6g/p9f32if+C1zQ7bynL2kdkBSnTzLDuthEbNCa0=", "owner": "cachix", "repo": "devenv", - "rev": "b97ca4bd581f0e2fb620f301cc417791f655f851", + "rev": "c81f0263446629e961a82736565565dc75eeb733", "type": "github" }, "original": { @@ -50,12 +50,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -87,11 +90,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1678724065, - "narHash": "sha256-MjeRjunqfGTBGU401nxIjs7PC9PZZ1FBCZp/bRB3C2M=", + "lastModified": 1688981480, + "narHash": "sha256-AYgIAotBA5C+55PjXKck8cpDgWYrUYsTMpMxH1bZ7/M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b8afc8489dc96f29f69bec50fdc51e27883f89c1", + "rev": "b9ebd80c7dbcdec2240c5baae334365eaf3d7230", "type": "github" }, "original": { @@ -103,27 +106,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1673800717, - "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1678788009, - "narHash": "sha256-O9nMPCAly/lUJHqtz8IAa8sf4uuB/6arHDEyQoRXTyw=", + "lastModified": 1689054105, + "narHash": "sha256-WYrzxCE0r2Gbeil3espMwq3eMruheCCbxTSQqLw/NJ4=", "owner": "nix-community", "repo": "NUR", - "rev": "a93973a3dd17284678ad6691dd38246b6ea3bf4f", + "rev": "41f4bc03f89dfdca582889f451b8d0285be17f31", "type": "github" }, "original": { @@ -141,11 +144,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1678615004, - "narHash": "sha256-9DeBO55BacSo3OSrT21cFRqtnJ5hW2zt/OoHCnDgxNg=", + "lastModified": 1688977481, + "narHash": "sha256-dy2+j59+o5T1/ZW+pQB917CcKvxGEwTNxdTchlFzJGQ=", "owner": "fossar", "repo": "nix-phps", - "rev": "c9b73881b30b00d1c1be3b2522cb57c398de4f18", + "rev": "4ec97040d932805425e0d1e178ad759250e193a7", "type": "github" }, "original": { @@ -165,11 +168,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1678376203, - "narHash": "sha256-3tyYGyC8h7fBwncLZy5nCUjTJPrHbmNwp47LlNLOHSM=", + "lastModified": 1688596063, + "narHash": "sha256-9t7RxBiKWHygsqXtiNATTJt4lim/oSYZV3RG8OjDDng=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "1a20b9708962096ec2481eeb2ddca29ed747770a", + "rev": "c8d18ba345730019c3faf412c96a045ade171895", "type": "github" }, "original": { @@ -187,13 +190,46 @@ "pre-commit-hooks": "pre-commit-hooks" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", "type": "github" }, "original": { diff --git a/devenv.yaml b/devenv.yaml index d6a84057425..bb6e2ef0cd5 100644 --- a/devenv.yaml +++ b/devenv.yaml @@ -9,3 +9,5 @@ inputs: inputs: nixpkgs: follows: nixpkgs +permittedInsecurePackages: + - openssl-1.1.1u From a20bc5ec063780bc5b8bb6ed22dbed3d4920b463 Mon Sep 17 00:00:00 2001 From: Susanne Hartung Date: Tue, 11 Jul 2023 08:39:47 +0200 Subject: [PATCH 446/730] fix(SW-27151): removes whitespaces from e-Mails Otherwise they are always validated to false. --- engine/Shopware/Controllers/Backend/Base.php | 2 +- tests/Functional/Controllers/Backend/BaseTest.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/engine/Shopware/Controllers/Backend/Base.php b/engine/Shopware/Controllers/Backend/Base.php index f4d977b1b37..ff4a4522259 100644 --- a/engine/Shopware/Controllers/Backend/Base.php +++ b/engine/Shopware/Controllers/Backend/Base.php @@ -1043,7 +1043,7 @@ public function validateEmailAction() $this->Front()->Plugins()->ViewRenderer()->setNoRender(); $this->Front()->Plugins()->Json()->setRenderer(false); - $emails = explode(',', (string) $this->Request()->getParam('value', '')); + $emails = array_map('trim', explode(',', (string) $this->Request()->getParam('value', ''))); /** @var EmailValidatorInterface $emailValidator */ $emailValidator = $this->container->get(EmailValidator::class); diff --git a/tests/Functional/Controllers/Backend/BaseTest.php b/tests/Functional/Controllers/Backend/BaseTest.php index 67949b84a2a..5e75b5a1e79 100644 --- a/tests/Functional/Controllers/Backend/BaseTest.php +++ b/tests/Functional/Controllers/Backend/BaseTest.php @@ -246,6 +246,10 @@ public function provideEmails(): Generator 'emails' => 'email@shopware.com,email2@shopware.com,email3@shopware.com', 'expectedIsValid' => true, ]; + yield '3 mails with whitespaces shall be valid' => [ + 'emails' => 'email@shopware.com , email2@shopware.com , email3@shopware.com', + 'expectedIsValid' => true, + ]; yield '3 mail shall be invalid' => [ 'emails' => 'email@shopware.com,email2@shopware.com,email3@shopware.com||test', 'expectedIsValid' => false, From 157a1bda210485947f65d23371bab4e75c0e3994 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Fri, 14 Jul 2023 12:53:15 +0200 Subject: [PATCH 447/730] fix: Fix namespace of test class --- .../Plugin/Backend/SwagUpdate/Components/SwagUpdateTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Unit/Plugin/Backend/SwagUpdate/Components/SwagUpdateTest.php b/tests/Unit/Plugin/Backend/SwagUpdate/Components/SwagUpdateTest.php index 6b87bef51a4..ef19d6efa94 100644 --- a/tests/Unit/Plugin/Backend/SwagUpdate/Components/SwagUpdateTest.php +++ b/tests/Unit/Plugin/Backend/SwagUpdate/Components/SwagUpdateTest.php @@ -24,7 +24,7 @@ * our trademarks remain entirely with us. */ -namespace Shopware\Tests\Unit\Plugin\Backend\Auth; +namespace Shopware\Tests\Unit\Plugin\Backend\SwagUpdate\Components; use PHPUnit\Framework\TestCase; use ShopwarePlugins\SwagUpdate\Components\Exception\ApiLimitExceededException; From c78a422816cca8a26820366f42ebeff375a9ee42 Mon Sep 17 00:00:00 2001 From: Pascal Thesing Date: Fri, 28 Jul 2023 08:30:08 +0200 Subject: [PATCH 448/730] ci(SW-27127): build packages every day --- .github/workflows/create-release.yml | 3 +++ .github/workflows/create-update.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 2d0729d675c..6cdcbcbdd04 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -6,6 +6,9 @@ on: push: tags: - "*" + schedule: + - cron: + '0 0 * * *' jobs: create-install-package: diff --git a/.github/workflows/create-update.yml b/.github/workflows/create-update.yml index ae8610e42ec..047551677fd 100644 --- a/.github/workflows/create-update.yml +++ b/.github/workflows/create-update.yml @@ -7,6 +7,9 @@ on: push: tags: - "*" + schedule: + - cron: + '0 0 * * *' jobs: create-update-package: From 60b5ebfc52b6aad32352030887acae5124d6d1f0 Mon Sep 17 00:00:00 2001 From: Pascal Thesing Date: Wed, 2 Aug 2023 14:06:32 +0200 Subject: [PATCH 449/730] ci: check for mysql availbality --- .github/workflows/check-js-code.yml | 11 ----------- .github/workflows/check-php-code.yml | 1 + 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/check-js-code.yml b/.github/workflows/check-js-code.yml index 2c3e0d2d070..8049dd93bf5 100644 --- a/.github/workflows/check-js-code.yml +++ b/.github/workflows/check-js-code.yml @@ -33,17 +33,6 @@ jobs: run: nix profile install github:cachix/devenv/v0.5 shell: sh - - name: Get Composer Cache Directory - id: composer-cache - run: | - echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - - uses: actions/cache@v3 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} - restore-keys: | - ${{ runner.os }}-composer- - - run: devenv up & - run: devenv shell check-js-code - run: devenv shell test-jest diff --git a/.github/workflows/check-php-code.yml b/.github/workflows/check-php-code.yml index 72af5801e30..b54c7e2e913 100644 --- a/.github/workflows/check-php-code.yml +++ b/.github/workflows/check-php-code.yml @@ -46,5 +46,6 @@ jobs: ${{ runner.os }}-composer- - run: devenv up & + - run: devenv shell ./.github/check-mysql.sh - run: devenv shell init-shopware - run: devenv shell check-code From 8a60efe1520309bfed71c4a9311701870b7c7466 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Tue, 22 Aug 2023 07:43:16 +0200 Subject: [PATCH 450/730] ci: fix danger job for external contributors --- .github/workflows/danger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 11db430b137..483fdabe0cb 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -1,7 +1,7 @@ name: Danger on: - pull_request: + pull_request_target: concurrency: group: danger-php-${{ github.ref }}-${{ github.workflow }} From 1abb6ab1069459f9c9a37e01b7142c83dd7e2527 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Aug 2023 05:44:07 +0000 Subject: [PATCH 451/730] chore(deps-dev): bump word-wrap from 1.2.3 to 1.2.5 in /themes Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.5. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.5) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] --- themes/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/themes/package-lock.json b/themes/package-lock.json index 0f1ab12cbfc..f371997d52e 100644 --- a/themes/package-lock.json +++ b/themes/package-lock.json @@ -5461,9 +5461,9 @@ } }, "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "dev": true, "engines": { "node": ">=0.10.0" From 6c95c4e3df57267c51dc03dc4db911d4a2777e8e Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 24 Aug 2023 11:15:06 +0200 Subject: [PATCH 452/730] ci: Adjust runs of CI jobs --- .github/workflows/codeql-analysis.yml | 5 ++++- .github/workflows/create-release.yml | 2 +- .github/workflows/create-update.yml | 2 +- .github/workflows/tests-launcher.yml | 5 ++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 43c45ef042b..25c1a3df5b8 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,8 +1,11 @@ name: "CodeQL" on: + pull_request: push: + branches: + - "5.7" schedule: - - cron: '0 6 * * 4' + - cron: '0 2 * * *' permissions: contents: read diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 6cdcbcbdd04..0ab7187e43a 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -8,7 +8,7 @@ on: - "*" schedule: - cron: - '0 0 * * *' + '0 1 * * *' jobs: create-install-package: diff --git a/.github/workflows/create-update.yml b/.github/workflows/create-update.yml index 047551677fd..9a72d0fb8a2 100644 --- a/.github/workflows/create-update.yml +++ b/.github/workflows/create-update.yml @@ -9,7 +9,7 @@ on: - "*" schedule: - cron: - '0 0 * * *' + '0 1 * * *' jobs: create-update-package: diff --git a/.github/workflows/tests-launcher.yml b/.github/workflows/tests-launcher.yml index 5e57f7b1c53..b2b1c5eea29 100644 --- a/.github/workflows/tests-launcher.yml +++ b/.github/workflows/tests-launcher.yml @@ -2,9 +2,12 @@ name: Run on: workflow_dispatch: + pull_request: push: + branches: + - "5.7" schedule: - - cron: '30 02 * * *' + - cron: '0 2 * * *' jobs: check-php-code: From 8af71a773cf5cebaddaf981f0ef1425b81a92b16 Mon Sep 17 00:00:00 2001 From: max Date: Sun, 6 Aug 2023 23:46:19 +0200 Subject: [PATCH 453/730] style: Reformat sAdmin for consistency --- engine/Shopware/Core/sAdmin.php | 107 ++++++++++++-------------------- 1 file changed, 41 insertions(+), 66 deletions(-) diff --git a/engine/Shopware/Core/sAdmin.php b/engine/Shopware/Core/sAdmin.php index 6fc34573e9c..0163c7558f2 100644 --- a/engine/Shopware/Core/sAdmin.php +++ b/engine/Shopware/Core/sAdmin.php @@ -272,8 +272,7 @@ public function sGetPaymentMeanById($id, $user = false) } // Check additional rules - if ( - $this->sManageRisks($paymentId, null, $customer) + if ($this->sManageRisks($paymentId, null, $customer) && $paymentId != ($customer['additional']['user']['paymentpreset'] ?? null) ) { $resetPayment = $this->config->get('sPAYMENTDEFAULT'); @@ -437,8 +436,7 @@ public function sGetPaymentMeans() } // Check additional rules - if ( - $this->sManageRisks($payValue['id'], null, $user) + if ($this->sManageRisks($payValue['id'], null, $user) && $payValue['id'] != ($user['additional']['user']['paymentpreset'] ?? 0) ) { unset($paymentMethods[$payKey]); @@ -727,16 +725,11 @@ public function logout() */ public function sLogin($ignoreAccountMode = false) { - if ( - $this->eventManager->notifyUntil( - 'Shopware_Modules_Admin_Login_Start', - [ - 'subject' => $this, - 'ignoreAccountMode' => $ignoreAccountMode, - 'post' => $this->front->Request()->getPost(), - ] - ) - ) { + if ($this->eventManager->notifyUntil('Shopware_Modules_Admin_Login_Start', [ + 'subject' => $this, + 'ignoreAccountMode' => $ignoreAccountMode, + 'post' => $this->front->Request()->getPost(), + ])) { return false; } @@ -856,12 +849,10 @@ public function sLogin($ignoreAccountMode = false) */ public function sCheckUser() { - if ( - $this->eventManager->notifyUntil( - 'Shopware_Modules_Admin_CheckUser_Start', - ['subject' => $this] - ) - ) { + if ($this->eventManager->notifyUntil( + 'Shopware_Modules_Admin_CheckUser_Start', + ['subject' => $this] + )) { return false; } @@ -1117,12 +1108,10 @@ public function sGetCountryList() */ public function sSaveRegisterSendConfirmation($email) { - if ( - $this->eventManager->notifyUntil( - 'Shopware_Modules_Admin_SaveRegisterSendConfirmation_Start', - ['subject' => $this, 'email' => $email] - ) - ) { + if ($this->eventManager->notifyUntil( + 'Shopware_Modules_Admin_SaveRegisterSendConfirmation_Start', + ['subject' => $this, 'email' => $email] + )) { return false; } @@ -1207,8 +1196,7 @@ public function sGetDownloads($destinationPage = 1, $perPage = 10) ); foreach ($getOrders as $orderKey => $orderValue) { - if ( - ($this->config->get('sARTICLESOUTPUTNETTO') && !$this->sSYSTEM->sUSERGROUPDATA['tax']) + if (($this->config->get('sARTICLESOUTPUTNETTO') && !$this->sSYSTEM->sUSERGROUPDATA['tax']) || (!$this->sSYSTEM->sUSERGROUPDATA['tax'] && $this->sSYSTEM->sUSERGROUPDATA['id']) ) { $getOrders[$orderKey]['invoice_amount'] = $this->moduleManager->Articles() @@ -1464,12 +1452,10 @@ public function sGetUserNameById($id) */ public function sGetUserData() { - if ( - $this->eventManager->notifyUntil( - 'Shopware_Modules_Admin_GetUserData_Start', - ['subject' => $this] - ) - ) { + if ($this->eventManager->notifyUntil( + 'Shopware_Modules_Admin_GetUserData_Start', + ['subject' => $this] + )) { return false; } $register = $this->session->offsetGet('sRegister'); @@ -1513,8 +1499,7 @@ public function sGetUserData() // No user logged in $register = $this->session->offsetGet('sRegister'); - if ( - $this->session->offsetGet('sCountry') + if ($this->session->offsetGet('sCountry') && $this->session->offsetGet('sCountry') != ($register['billing']['country'] ?? 0) ) { $register['billing']['country'] = (int) $this->session->offsetGet('sCountry'); @@ -1578,8 +1563,7 @@ public function sManageRisks($paymentID, $basket, $user) } elseif ($rule['rule1'] && $rule['rule2']) { $rule['rule1'] = 'sRisk' . $rule['rule1']; $rule['rule2'] = 'sRisk' . $rule['rule2']; - if ( - $this->executeRiskRule($rule['rule1'], $user, $basket, $rule['value1'], $paymentID) + if ($this->executeRiskRule($rule['rule1'], $user, $basket, $rule['value1'], $paymentID) && $this->executeRiskRule($rule['rule2'], $user, $basket, $rule['value2'], $paymentID) ) { return true; @@ -1603,18 +1587,16 @@ public function sManageRisks($paymentID, $basket, $user) */ public function executeRiskRule($rule, $user, $basket, $value, $paymentID = null) { - if ( - $event = $this->eventManager->notifyUntil( - 'Shopware_Modules_Admin_Execute_Risk_Rule_' . $rule, - [ - 'rule' => $rule, - 'user' => $user, - 'basket' => $basket, - 'value' => $value, - 'paymentID' => $paymentID, - ] - ) - ) { + if ($event = $this->eventManager->notifyUntil( + 'Shopware_Modules_Admin_Execute_Risk_Rule_' . $rule, + [ + 'rule' => $rule, + 'user' => $user, + 'basket' => $basket, + 'value' => $value, + 'paymentID' => $paymentID, + ] + )) { return $event->getReturn(); } @@ -2289,8 +2271,7 @@ public function sNewsletterSubscription($email, $unsubscribe = false, $groupID = $errorFlag = []; $config = Shopware()->Container()->get(Shopware_Components_Config::class); - if ( - $this->shouldVerifyCaptcha($config) + if ($this->shouldVerifyCaptcha($config) && (bool) $this->front->Request()->getParam('voteConfirmed', false) === false ) { /** @var CaptchaValidator $captchaValidator */ @@ -3089,8 +3070,7 @@ public function sGetPremiumShippingcosts($country = null) $dispatch['shippingfree'] = round($dispatch['shippingfree'] / (100 + $discount_tax) * 100, 2); } - if ( - (!empty($dispatch['shippingfree']) && $dispatch['shippingfree'] <= $basket['amount_display']) + if ((!empty($dispatch['shippingfree']) && $dispatch['shippingfree'] <= $basket['amount_display']) || empty($basket['count_article']) || (!empty($basket['shippingfree']) && empty($dispatch['bind_shippingfree'])) ) { @@ -3160,8 +3140,7 @@ public function sGetPremiumShippingcosts($country = null) } $result['brutto'] *= $currencyFactor; $result['brutto'] = round($result['brutto'], 2); - if ( - !empty($payment['surcharge']) + if (!empty($payment['surcharge']) && (int) $dispatch['surcharge_calculation'] !== Dispatch::SURCHARGE_CALCULATION_NEVER && (empty($basket['shippingfree']) || empty($dispatch['surcharge_calculation'])) ) { @@ -3365,12 +3344,10 @@ private function regenerateSessionId(bool $ignoreUserTable = false): void { $oldSessionId = $this->session->getId(); - if ( - $this->eventManager->notifyUntil( - 'Shopware_Modules_Admin_regenerateSessionId_Start', - ['subject' => $this, 'sessionId' => $oldSessionId] - ) - ) { + if ($this->eventManager->notifyUntil( + 'Shopware_Modules_Admin_regenerateSessionId_Start', + ['subject' => $this, 'sessionId' => $oldSessionId] + )) { return; } @@ -3417,8 +3394,7 @@ private function regenerateSessionId(bool $ignoreUserTable = false): void private function overwriteBillingAddress(array $userData): array { // Temporarily overwrite billing address - if ( - !$this->session->offsetGet('checkoutBillingAddressId') + if (!$this->session->offsetGet('checkoutBillingAddressId') || \strtolower(Shopware()->Front()->Request()->getControllerName()) !== 'checkout' ) { return $userData; @@ -3450,8 +3426,7 @@ private function overwriteBillingAddress(array $userData): array private function overwriteShippingAddress(array $userData): array { // Temporarily overwrite shipping address - if ( - !$this->session->offsetGet('checkoutShippingAddressId') + if (!$this->session->offsetGet('checkoutShippingAddressId') || \strtolower(Shopware()->Front()->Request()->getControllerName()) !== 'checkout' ) { return $userData; From f3007a4d62213397e0721f0713d9967e8b6e6248 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 24 Aug 2023 13:15:37 +0200 Subject: [PATCH 454/730] fix: Move entries in upgrade file to correct positions --- UPGRADE-5.7.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index f282dcbd6e5..ccfbfce69b9 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -17,6 +17,8 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `symfony/serializer` to version 5.4.25 * Updated `voku/anti-xss` to version 4.1.42 * Updated several indirect dependencies +* Updated npm dependencies in `themes/package.json` +* Updated npm dependencies in `themes/Frontend/Responsive/package.json` ## 5.7.18 @@ -34,7 +36,6 @@ This changelog references changes done in Shopware 5.7 patch versions. * Changed newsletter registration so that it does not allow URLs as value for first and last name * Changed customer registration so that it does not allow URLs as value for first and last name -* Changed behaviour of the translation transfer while setting a product variant as the main variant * Updated `behat/behat` to version 3.13.0 * Updated `doctrine/dbal` to version 2.13.9 * Updated `doctrine/orm` to version 2.15.2 @@ -52,8 +53,6 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `voku/anti-xss` to version 4.1.41 * Updated `wikimedia/less.php` to version 4.1.0 * Updated several indirect dependencies -* Updated npm dependencies in `themes/package.json` -* Updated npm dependencies in `themes/Frontend/Responsive/package.json` ### Removals From d95bba22d27f5ad4d4158264d01e071c68740300 Mon Sep 17 00:00:00 2001 From: max Date: Mon, 7 Aug 2023 00:50:06 +0200 Subject: [PATCH 455/730] refactor: Remove dead code --- engine/Shopware/Components/Modules.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/engine/Shopware/Components/Modules.php b/engine/Shopware/Components/Modules.php index 78c8e0e3fdf..98dacbf37a4 100644 --- a/engine/Shopware/Components/Modules.php +++ b/engine/Shopware/Components/Modules.php @@ -225,17 +225,11 @@ public function Export() /** * Load a module defined by $name * Possible values for $name - sBasket, sAdmin etc. + * + * @param class-string $name */ private function loadModule(string $name): void { - if (isset($this->modules_container[$name])) { - return; - } - - $this->modules_container[$name] = null; - /** @var class-string $name */ - $name = basename($name); - if ($name === 'sSystem') { $this->modules_container[$name] = $this->system; From 7e238b1d32349328f9dfde378405f54d96ce5c91 Mon Sep 17 00:00:00 2001 From: max Date: Sun, 6 Aug 2023 16:59:04 +0200 Subject: [PATCH 456/730] fix: PHP 8 error if plugin bootstrap class is missing --- .phpstan-baseline.neon | 10 ------- .../Library/Enlight/Event/Handler/Plugin.php | 29 +++++++++++++------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index 7ab1ac25ced..8794a9167fd 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -2800,11 +2800,6 @@ parameters: count: 1 path: engine/Library/Enlight/Event/Handler/Default.php - - - message: "#^Method Enlight_Event_Handler_Plugin\\:\\:Plugin\\(\\) should return Enlight_Plugin_Bootstrap but returns Enlight_Plugin_Bootstrap\\|Enlight_Plugin_Namespace\\|null\\.$#" - count: 1 - path: engine/Library/Enlight/Event/Handler/Plugin.php - - message: "#^Method Enlight_Event_Handler_Plugin\\:\\:execute\\(\\) has no return type specified\\.$#" count: 1 @@ -2825,11 +2820,6 @@ parameters: count: 1 path: engine/Library/Enlight/Event/Handler/Plugin.php - - - message: "#^Variable \\$plugin might not be defined\\.$#" - count: 1 - path: engine/Library/Enlight/Event/Handler/Plugin.php - - message: "#^Method Enlight_Event_Subscriber\\:\\:getListeners\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 diff --git a/engine/Library/Enlight/Event/Handler/Plugin.php b/engine/Library/Enlight/Event/Handler/Plugin.php index 4b0ac161f0c..9d5046fb2c9 100644 --- a/engine/Library/Enlight/Event/Handler/Plugin.php +++ b/engine/Library/Enlight/Event/Handler/Plugin.php @@ -42,6 +42,8 @@ class Enlight_Event_Handler_Plugin extends Enlight_Event_Handler protected $namespace; /** + * @deprecated Will be only `string` starting from Shopware 5.8 + * * @var Enlight_Plugin_Bootstrap|string contains an instance * of the Enlight_Plugin_Bootstrap or the plugin name */ @@ -51,11 +53,13 @@ class Enlight_Event_Handler_Plugin extends Enlight_Event_Handler * The Enlight_Event_Handler_Plugin class constructor expects the event name. * All parameters are set in the internal properties. * - * @param string $event - * @param Enlight_Plugin_Namespace $namespace - * @param Enlight_Plugin_Bootstrap $plugin - * @param string $listener - * @param int $position + * @deprecated The parameter $plugin will only accept `string` starting from Shopware 5.8 + * + * @param string $event + * @param Enlight_Plugin_Namespace $namespace + * @param Enlight_Plugin_Bootstrap|string $plugin + * @param string $listener + * @param int $position * * @throws Enlight_Event_Exception */ @@ -92,12 +96,19 @@ public function setPlugin($plugin) * Getter method for the internal plugin property. If the plugin property is a string, * enlight determines the plugin object over the namespace. * - * @return Enlight_Plugin_Bootstrap + * @return ?Enlight_Plugin_Bootstrap */ public function Plugin() { - if (!$this->plugin instanceof Enlight_Plugin_Bootstrap) { - $plugin = $this->namespace->get($this->plugin); + // In the past always `null` was returned if $this->plugin was of instance `Enlight_Plugin_Bootstrap` + // therefore this bug is replicated here, can be removed once the type has been fixed to `string` + if ($this->plugin instanceof Enlight_Plugin_Bootstrap) { + return null; + } + + $plugin = $this->namespace->get($this->plugin); + if (!$plugin instanceof Enlight_Plugin_Bootstrap) { + return null; } return $plugin; @@ -145,7 +156,7 @@ public function setNamespace(Enlight_Plugin_Namespace $namespace) public function execute(Enlight_Event_EventArgs $args) { $plugin = $this->Plugin(); - if (!method_exists($plugin, $this->listener)) { + if ($plugin === null || !method_exists($plugin, $this->listener)) { $name = $this->plugin instanceof Enlight_Plugin_Bootstrap ? $this->plugin->getName() : $this->plugin; trigger_error('Listener "' . $this->listener . '" in "' . $name . '" is not callable.', E_USER_ERROR); // throw new Enlight_Exception('Listener "' . $this->listener . '" in "' . $name . '" is not callable.'); From cd3528a997dd88312d1c924722da253523f02c21 Mon Sep 17 00:00:00 2001 From: max Date: Mon, 7 Aug 2023 00:48:30 +0200 Subject: [PATCH 457/730] refactor: Replace sSYSTEM->sCONFIG calls in export --- engine/Shopware/Core/sExport.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/engine/Shopware/Core/sExport.php b/engine/Shopware/Core/sExport.php index f29df3ac098..2e503017e25 100644 --- a/engine/Shopware/Core/sExport.php +++ b/engine/Shopware/Core/sExport.php @@ -354,7 +354,7 @@ public function sInitSettings() $this->shop = $shop; - $this->sSYSTEM->sCONFIG = Shopware()->Config(); + $this->sSYSTEM->sCONFIG = $this->config; } /** @@ -378,7 +378,7 @@ public function sInitSmarty() $this->sSmarty->registerPlugin('modifier', 'shippingcost', [$this, 'sGetArticleShippingcost']); $this->sSmarty->registerPlugin('modifier', 'property', [$this, 'sGetArticleProperties']); - $this->sSmarty->assign('sConfig', $this->sSYSTEM->sCONFIG); + $this->sSmarty->assign('sConfig', $this->config); $this->sSmarty->assign('shopData', $this->shopData); $this->sSmarty->assign('sCurrency', $this->sCurrency); $this->sSmarty->assign('sCustomergroup', $this->sCustomergroup); @@ -557,7 +557,7 @@ public function sEscapeString($string, $esc_type = '', $char_set = null) */ public function sGetArticleLink($articleID, $title = '') { - return Shopware()->Modules()->Core()->sRewriteLink($this->sSYSTEM->sCONFIG['sBASEFILE'] . "?sViewport=detail&sArticle=$articleID", $title) . (empty($this->sSettings['partnerID']) ? '' : '?sPartner=' . urlencode($this->sSettings['partnerID'])); + return Shopware()->Modules()->Core()->sRewriteLink($this->config->get('sBASEFILE') . "?sViewport=detail&sArticle=$articleID", $title) . (empty($this->sSettings['partnerID']) ? '' : '?sPartner=' . urlencode($this->sSettings['partnerID'])); } /** @@ -1446,8 +1446,8 @@ public function sGetDispatch($dispatch = null, $country = null) public function sGetDispatchBasket($article, $countryID = null, $paymentID = null) { $sql_select = ''; - if (!empty($this->sSYSTEM->sCONFIG['sPREMIUMSHIPPIUNGASKETSELECT'])) { - $sql_select .= ', ' . $this->sSYSTEM->sCONFIG['sPREMIUMSHIPPIUNGASKETSELECT']; + if (!empty($this->config->get('sPREMIUMSHIPPIUNGASKETSELECT'))) { + $sql_select .= ', ' . $this->config->get('sPREMIUMSHIPPIUNGASKETSELECT'); } $sql = 'SELECT id, calculation_sql FROM s_premium_dispatch WHERE calculation=3'; $calculations = $this->db->fetchPairs($sql); From f56e358f200efaaf0e1f0227c0127c69b8da7195 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 24 Aug 2023 16:36:12 +0200 Subject: [PATCH 458/730] ci: Update checkout action --- .github/workflows/check-js-code.yml | 2 +- .github/workflows/check-php-code.yml | 2 +- .github/workflows/phpunit.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check-js-code.yml b/.github/workflows/check-js-code.yml index 8049dd93bf5..55b1647c2e3 100644 --- a/.github/workflows/check-js-code.yml +++ b/.github/workflows/check-js-code.yml @@ -14,7 +14,7 @@ jobs: js: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v22 with: github_access_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/check-php-code.yml b/.github/workflows/check-php-code.yml index b54c7e2e913..a97f574b07b 100644 --- a/.github/workflows/check-php-code.yml +++ b/.github/workflows/check-php-code.yml @@ -14,7 +14,7 @@ jobs: php: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v22 with: github_access_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 878ca6f3531..2bd576fb073 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -61,7 +61,7 @@ jobs: mysql: ['pkgs.mysql80', 'pkgs.mariadb', 'pkgs.mariadb_104', 'config.nur.repos.pascalthesing.mysql57'] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v22 with: @@ -112,7 +112,7 @@ jobs: env: TESTSUITE: 'all' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v22 with: github_access_token: ${{ secrets.GITHUB_TOKEN }} From 1a1fc51fe203eb79534cce250b38ee896dba825f Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 6 Sep 2023 08:55:10 +0200 Subject: [PATCH 459/730] fix: Change links to GitHub to new organisation --- README.md | 22 ++---- UPGRADE-5.0.md | 8 +- UPGRADE-5.1.md | 16 ++-- UPGRADE-5.2.md | 56 +++++++------- UPGRADE-5.3.md | 14 ++-- UPGRADE-5.4.md | 14 ++-- UPGRADE-5.5.md | 24 +++--- UPGRADE-5.6.md | 22 +++--- UPGRADE-5.7.md | 40 +++++----- composer.json | 2 +- .../Enlight/Components/Session/Namespace.php | 2 +- .../Shopware/Bundle/AttributeBundle/README.md | 4 - .../Components/Plugin/XmlPluginInfoReader.php | 2 +- recovery/update/src/UpdateHtaccess.php | 76 +++++++++---------- .../Fixtures/TestPlugin/plugin.xml | 2 +- .../Plugin/XmlReader/examples/menu/paypal.xml | 2 +- .../SwagUpdate/Components/SwagUpdateTest.php | 36 ++++----- themes/Frontend/Responsive/package.json | 4 +- 18 files changed, 165 insertions(+), 181 deletions(-) diff --git a/README.md b/README.md index ce516c3c40d..29bd1bff89b 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,14 @@ -# Shopware 6 - - - -

        - -

        - - -The completely newly developed successor "Shopware 6" is based entirely on the Symfony Framework and VueJS and is available under MIT licence at https://github.com/shopware/platform - # Shopware 5 -![Build Status](https://github.com/shopware/shopware/workflows/PHPUnit/badge.svg) +![Build Status](https://github.com/shopware5/shopware/workflows/PHPUnit/badge.svg) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/shopware/localized.svg)](https://crowdin.com/project/shopware) -[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/shopware/shopware/badges/quality-score.png?b=5.5)](https://scrutinizer-ci.com/g/shopware/shopware/?branch=5.5) [![Latest Stable Version](https://poser.pugx.org/shopware/shopware/v/stable)](https://packagist.org/packages/shopware/shopware) [![Total Downloads](https://poser.pugx.org/shopware/shopware/downloads)](https://packagist.org/packages/shopware/shopware) [![Slack](https://img.shields.io/badge/chat-on%20slack-%23ECB22E)](http://slack.shopware.com?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) - **License**: Dual license AGPL v3 / Proprietary -- **GitHub Repository**: -- **Issue Tracker**: +- **GitHub Repository**: +- **Issues**: ## Overview @@ -67,7 +55,7 @@ Follow the instruction below if you want to install Shopware 5 using Git. 1.) Clone the git repository to the desired location using: - git clone https://github.com/shopware/shopware.git + git clone https://github.com/shopware5/shopware.git In case you wish to contribute to Shopware, fork the `5.7` branch rather than cloning it, and create a pull request via GitHub. For further information please read the section "Get involved" of this document. @@ -152,7 +140,7 @@ Shopware is distributed under a dual license (AGPL v3 and proprietary license). # Changelog -The changelog and all available commits are located under . +The changelog and all available commits are located under . ## Further reading diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md index 14518129d5e..8a19964fdcf 100644 --- a/UPGRADE-5.0.md +++ b/UPGRADE-5.0.md @@ -4,14 +4,14 @@ This changelog references changes done in Shopware 5.0 patch versions. ## 5.0.4 (2015-09-16) -[View all changes from v5.0.3...v5.0.4](https://github.com/shopware/shopware/compare/v5.0.3...v5.0.4) +[View all changes from v5.0.3...v5.0.4](https://github.com/shopware5/shopware/compare/v5.0.3...v5.0.4) * Change file extension of `Shopware_Components_Convert_Excel::generateXML` to .xls * Fixed jsonrenderer for backend order batchprocessing ## 5.0.3 (2015-08-24) -[View all changes from v5.0.2...v5.0.3](https://github.com/shopware/shopware/compare/v5.0.2...v5.0.3) +[View all changes from v5.0.2...v5.0.3](https://github.com/shopware5/shopware/compare/v5.0.2...v5.0.3) * The variant API resource now supports the getList method. It will return all variants with prices and attributes. You can optionally calculate the gross price by using the "considerTaxInput" parameter. * The getList method of the articles API resource now returns additionally the attributes of an article. @@ -22,7 +22,7 @@ This changelog references changes done in Shopware 5.0 patch versions. ## 5.0.2 (2015-07-20) -[View all changes from v5.0.1...v5.0.2](https://github.com/shopware/shopware/compare/v5.0.1...v5.0.2) +[View all changes from v5.0.1...v5.0.2](https://github.com/shopware5/shopware/compare/v5.0.1...v5.0.2) * Method `createMenuItem` in plugin bootstrap now results in an duplicate error when passing an existing label with the same parent * Removed `Shopware_Controllers_Backend_Order::getStatisticAction` and statistics in the order backend module. @@ -100,7 +100,7 @@ This changelog references changes done in Shopware 5.0 patch versions. ## 5.0.1 (2015-05-26) -[View all changes from v5.0.0...v5.0.1](https://github.com/shopware/shopware/compare/v5.0.0...v5.0.1) +[View all changes from v5.0.0...v5.0.1](https://github.com/shopware5/shopware/compare/v5.0.0...v5.0.1) * Create `sw:theme:dump:configuration` command to generate watch files for theme compiling * Rename \Shopware\Components\Theme\Compiler::preCompile to \Shopware\Components\Theme\Compiler::compile diff --git a/UPGRADE-5.1.md b/UPGRADE-5.1.md index 4d1ab5dcd89..82a6c506446 100644 --- a/UPGRADE-5.1.md +++ b/UPGRADE-5.1.md @@ -4,20 +4,20 @@ This changelog references changes done in Shopware 5.1 patch versions. ## 5.1.6 (2016-05-23) -[View all changes from v5.1.5...v5.1.6](https://github.com/shopware/shopware/compare/v5.1.5...v5.1.6) +[View all changes from v5.1.5...v5.1.6](https://github.com/shopware5/shopware/compare/v5.1.5...v5.1.6) * The interface `Enlight_Components_Cron_Adapter` in `engine/Library/Enlight/Components/Cron/Adapter.php` got a new method `getJobByAction`. For default implementation see `engine/Library/Enlight/Components/Cron/Adapter/DBAL.php`. * Fix a unserialize regression with PHP 5.6.21 and PHP 7.0.6. ## 5.1.5 (2016-04-11) -[View all changes from v5.1.4...v5.1.5](https://github.com/shopware/shopware/compare/v5.1.4...v5.1.5) +[View all changes from v5.1.4...v5.1.5](https://github.com/shopware5/shopware/compare/v5.1.4...v5.1.5) * The smarty variable `sCategoryInfo` in Listing and Blog controllers is now deprecated and will be removed soon. Use `sCategoryContent` instead, it's a drop in replacement. ## 5.1.4 (2016-03-22) -[View all changes from v5.1.3...v5.1.4](https://github.com/shopware/shopware/compare/v5.1.3...v5.1.4) +[View all changes from v5.1.3...v5.1.4](https://github.com/shopware5/shopware/compare/v5.1.3...v5.1.4) * Customer logout will now regenerate the session id and clear the customers basket. * Added `IsNew` condition for product streams @@ -40,7 +40,7 @@ This changelog references changes done in Shopware 5.1 patch versions. ## 5.1.3 (2016-02-15) -[View all changes from v5.1.2...v5.1.3](https://github.com/shopware/shopware/compare/v5.1.2...v5.1.3) +[View all changes from v5.1.2...v5.1.3](https://github.com/shopware5/shopware/compare/v5.1.2...v5.1.3) * Switch Grunt to relativeUrls to unify the paths to less.php * Deprecated `Enlight_Application::getOption()` and `Enlight_Application::getOptions` @@ -56,7 +56,7 @@ This changelog references changes done in Shopware 5.1 patch versions. ## 5.1.2 (2016-01-12) -[View all changes from v5.1.1...v5.1.2](https://github.com/shopware/shopware/compare/v5.1.1...v5.1.2) +[View all changes from v5.1.1...v5.1.2](https://github.com/shopware5/shopware/compare/v5.1.1...v5.1.2) * Out-of-stock variants on the detail page are now selectable * `ProductNumberService::getAvailableNumber()` now returns the provided product variant to allow deep linking of out-of-stock variants @@ -99,14 +99,14 @@ This changelog references changes done in Shopware 5.1 patch versions. ## 5.1.1 (2015-10-26) -[View all changes from v5.1.0...v5.1.1](https://github.com/shopware/shopware/compare/v5.1.0...v5.1.1) +[View all changes from v5.1.0...v5.1.1](https://github.com/shopware5/shopware/compare/v5.1.0...v5.1.1) * Added new smarty block `frontend_detail_index_tabs_cross_selling` in the detail/ajax.tpl to prevent problems with custom themes * Renamed block `backend/order/view/detail/communication` in `backend/order/view/detail/configuration.js` to `backend/order/view/detail/configuration`. The name was duplicated in another file and was renamed to match the correct file. ## 5.1.0 (2015-10-19) -[View all changes from v5.0.4...v5.1.0](https://github.com/shopware/shopware/compare/v5.0.4...v5.1.0) +[View all changes from v5.0.4...v5.1.0](https://github.com/shopware5/shopware/compare/v5.0.4...v5.1.0) * Added event `Shopware_Plugin_Collect_MediaXTypes` to collect media related x_type fields for which the value needs to be normalized * Updated Behat to v3.0 and other related libraries @@ -297,4 +297,4 @@ This changelog references changes done in Shopware 5.1 patch versions. * `Shopware\Models\Property\Repository::getGroupsQueryBuilder` * `Shopware\Models\Property\Repository::getGroupsQuery` * `Shopware_Plugins_Frontend_CronRefresh_Bootstrap::onCronJobTranslation()` - * `Shopware_Components_DummyPlugin_Bootstrap` \ No newline at end of file + * `Shopware_Components_DummyPlugin_Bootstrap` diff --git a/UPGRADE-5.2.md b/UPGRADE-5.2.md index b7feaabefdd..ee68877ba84 100644 --- a/UPGRADE-5.2.md +++ b/UPGRADE-5.2.md @@ -4,7 +4,7 @@ This changelog references changes done in Shopware 5.2 patch versions. # 5.2.27 -[View all changes from v5.2.26...v5.2.27](https://github.com/shopware/shopware/compare/v5.2.26...v5.2.27) +[View all changes from v5.2.26...v5.2.27](https://github.com/shopware5/shopware/compare/v5.2.26...v5.2.27) * Added config check to disable the `Tell a friend` page if it is disabled via config. * Fixed id collision in `themes/Backend/ExtJs/backend/base/component/Shopware.ModuleManager.js` @@ -18,11 +18,11 @@ This changelog references changes done in Shopware 5.2 patch versions. # 5.2.26 -[View all changes from v5.2.25...v5.2.26](https://github.com/shopware/shopware/compare/v5.2.25...v5.2.26) +[View all changes from v5.2.25...v5.2.26](https://github.com/shopware5/shopware/compare/v5.2.25...v5.2.26) ## 5.2.25 -[View all changes from v5.2.24...v5.2.25](https://github.com/shopware/shopware/compare/v5.2.24...v5.2.25) +[View all changes from v5.2.24...v5.2.25](https://github.com/shopware5/shopware/compare/v5.2.24...v5.2.25) * Added notify event `Shopware_Modules_Basket_AddArticle_Added` in `engine/Shopware/Core/sBasket.php` * The event `Shopware_Modules_Export_ExportResult_Filter_Fixed` was added and now filters the processed export result. Previously with `Shopware_Modules_Export_ExportResult_Filter`, an instance of `Zend_Db_Statement_Pdo` was supplied, which could not be used to filter the actual result. @@ -30,14 +30,14 @@ This changelog references changes done in Shopware 5.2 patch versions. # 5.2.24 -[View all changes from v5.2.23...v5.2.24](https://github.com/shopware/shopware/compare/v5.2.23...v5.2.24) +[View all changes from v5.2.23...v5.2.24](https://github.com/shopware5/shopware/compare/v5.2.23...v5.2.24) * Fixed custom datefield format for articles * Fixed styling of image slider on tablet landscape view ## 5.2.23 -[View all changes from v5.2.22...v5.2.23](https://github.com/shopware/shopware/compare/v5.2.22...v5.2.23) +[View all changes from v5.2.22...v5.2.23](https://github.com/shopware5/shopware/compare/v5.2.22...v5.2.23) * Added conditional statement in `themes/Frontend/Responsive/frontend/_public/src/js/jquery.product-slider.js` to prevent the jquery plugin from sending ajax requests indefinitely * Added `limit` parameter to `createQuery` and `createOptionQuery` in `engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyQueryFactory` @@ -46,7 +46,7 @@ This changelog references changes done in Shopware 5.2 patch versions. ## 5.2.22 -[View all changes from v5.2.21...v5.2.22](https://github.com/shopware/shopware/compare/v5.2.21...v5.2.22) +[View all changes from v5.2.21...v5.2.22](https://github.com/shopware5/shopware/compare/v5.2.21...v5.2.22) * Fixed the picture implementation of the `box-emotion.tpl` to load the correct image sizes * Added new event `plugin/swAutoSubmit/onChangeSelection` in `themes/Frontend/Responsive/frontend/_public/src/js/jquery.auto-submit.js` @@ -56,7 +56,7 @@ This changelog references changes done in Shopware 5.2 patch versions. ## 5.2.21 -[View all changes from v5.2.20...v5.2.21](https://github.com/shopware/shopware/compare/v5.2.20...v5.2.21) +[View all changes from v5.2.20...v5.2.21](https://github.com/shopware5/shopware/compare/v5.2.20...v5.2.21) * Updated Symfony to version 2.8.17 * Added paymentID as event property in `Shopware_Modules_Admin_Execute_Risk_Rule_RuleName` @@ -73,13 +73,13 @@ This changelog references changes done in Shopware 5.2 patch versions. ## 5.2.20 -[View all changes from v5.2.19...v5.2.20](https://github.com/shopware/shopware/compare/v5.2.19...v5.2.20) +[View all changes from v5.2.19...v5.2.20](https://github.com/shopware5/shopware/compare/v5.2.19...v5.2.20) -* Reverted shopware/shopware#821 which added left joins for basket attributes in `sAdmin::sGetDispatchBasket()` and `sExport::sGetDispatchBasket()` +* Reverted [shopware5/shopware#821](https://github.com/shopware5/shopware/pull/821) which added left joins for basket attributes in `sAdmin::sGetDispatchBasket()` and `sExport::sGetDispatchBasket()` ## 5.2.19 -[View all changes from v5.2.18...v5.2.19](https://github.com/shopware/shopware/compare/v5.2.18...v5.2.19) +[View all changes from v5.2.18...v5.2.19](https://github.com/shopware5/shopware/compare/v5.2.18...v5.2.19) * Changed the loading of backend widgets to disable widgets of deactivated plugins * Added new Event `Shopware_Modules_Admin_regenerateSessionId_Start` in sAdmin::regenerateSessionId @@ -98,14 +98,14 @@ This changelog references changes done in Shopware 5.2 patch versions. ## 5.2.18 -[View all changes from v5.2.17...v5.2.18](https://github.com/shopware/shopware/compare/v5.2.17...v5.2.18) +[View all changes from v5.2.17...v5.2.18](https://github.com/shopware5/shopware/compare/v5.2.17...v5.2.18) * Fixed invalid permissions after running media optimizer on some hosting systems * Fixed session error in exports ## 5.2.17 -[View all changes from v5.2.16...v5.2.17](https://github.com/shopware/shopware/compare/v5.2.16...v5.2.17) +[View all changes from v5.2.16...v5.2.17](https://github.com/shopware5/shopware/compare/v5.2.16...v5.2.17) * Deprecated Smarty modifier `rewrite`. Modifier will be removed in 5.3.0. * Changed default `session.gc_divisor` to `200`. To decrease session garbage collection probability. @@ -150,13 +150,13 @@ The api resources are now available in the dependency injection container using ## 5.2.16 -[View all changes from v5.2.15...v5.2.16](https://github.com/shopware/shopware/compare/v5.2.15...v5.2.16) +[View all changes from v5.2.15...v5.2.16](https://github.com/shopware5/shopware/compare/v5.2.15...v5.2.16) * Improved form input filtering ## 5.2.15 -[View all changes from v5.2.14...v5.2.15](https://github.com/shopware/shopware/compare/v5.2.14...v5.2.15) +[View all changes from v5.2.14...v5.2.15](https://github.com/shopware5/shopware/compare/v5.2.14...v5.2.15) * Fixed article api resource when creating a new article with new configurator options and an image mapping for this new options * Added cronjob registration via `Resources/cronjob.xml` file @@ -165,7 +165,7 @@ The api resources are now available in the dependency injection container using ## 5.2.14 -[View all changes from v5.2.13...v5.2.14](https://github.com/shopware/shopware/compare/v5.2.13...v5.2.14) +[View all changes from v5.2.13...v5.2.14](https://github.com/shopware5/shopware/compare/v5.2.13...v5.2.14) ### Add property "valueField" to the media field. * The shopping world element "Media field" supports now to change the value field. All possible properties you can find in the file: `themes/Backend/ExtJs/backend/media_manager/model/media.js` @@ -182,7 +182,7 @@ The api resources are now available in the dependency injection container using ## 5.2.13 -[View all changes from v5.2.12...v5.2.13](https://github.com/shopware/shopware/compare/v5.2.12...v5.2.13) +[View all changes from v5.2.12...v5.2.13](https://github.com/shopware5/shopware/compare/v5.2.12...v5.2.13) * Changed duplicate smarty block from `frontend_checkout_confirm_information_addresses_equal_panel_shipping_select_address` to `frontend_checkout_confirm_information_addresses_equal_panel_shipping_add_address` in `frontend/checkout/confirm.tpl` * Added interface `\Shopware\Bundle\ESIndexingBundle\TextMappingInterface` which handles text field mappings for different elastic search versions @@ -209,11 +209,11 @@ Example: ## 5.2.12 -[View all changes from v5.2.11...v5.2.12](https://github.com/shopware/shopware/compare/v5.2.11...v5.2.12) +[View all changes from v5.2.11...v5.2.12](https://github.com/shopware5/shopware/compare/v5.2.11...v5.2.12) ## 5.2.11 -[View all changes from v5.2.10...v5.2.11](https://github.com/shopware/shopware/compare/v5.2.10...v5.2.11) +[View all changes from v5.2.10...v5.2.11](https://github.com/shopware5/shopware/compare/v5.2.10...v5.2.11) * Added new Smarty block `frontend_robots_txt_allows` to `frontend/robots_txt/index.tpl` * Added new Smarty block `frontend_account_order_item_availability` to `frontend/account/order_item_details.tpl` @@ -261,7 +261,7 @@ There must be at least one option tag and inside each option tag where must be a ## 5.2.10 -[View all changes from v5.2.9...v5.2.10](https://github.com/shopware/shopware/compare/v5.2.9...v5.2.10) +[View all changes from v5.2.9...v5.2.10](https://github.com/shopware5/shopware/compare/v5.2.9...v5.2.10) * Added optional `filter` option to `Shopware.apps.Base.view.element.Select` * Set `remoteFilter` to `true` in several *base* stores: @@ -287,13 +287,13 @@ There must be at least one option tag and inside each option tag where must be a ## 5.2.9 -[View all changes from v5.2.8...v5.2.9](https://github.com/shopware/shopware/compare/v5.2.8...v5.2.9) +[View all changes from v5.2.8...v5.2.9](https://github.com/shopware5/shopware/compare/v5.2.8...v5.2.9) * `filtergroupID` column will be set to `null` in the `s_articles` table when deleting a property set ## 5.2.8 -[View all changes from v5.2.7...v5.2.8](https://github.com/shopware/shopware/compare/v5.2.7...v5.2.8) +[View all changes from v5.2.7...v5.2.8](https://github.com/shopware5/shopware/compare/v5.2.7...v5.2.8) * Fixed a PHP 7 fatal error in the SVG rendering of mPDF * Added missing update of the order details' order number, when converting a cancelled order to a *normal* order in `Shopware_Controllers_Backend_CanceledOrder::convertOrderAction()` @@ -302,7 +302,7 @@ There must be at least one option tag and inside each option tag where must be a ## 5.2.7 -[View all changes from v5.2.6...v5.2.7](https://github.com/shopware/shopware/compare/v5.2.6...v5.2.7) +[View all changes from v5.2.6...v5.2.7](https://github.com/shopware5/shopware/compare/v5.2.6...v5.2.7) * Add support for third party post messages in the backend * getOne function of customer api resource contains now the country and state data for billing and shipping address @@ -311,7 +311,7 @@ There must be at least one option tag and inside each option tag where must be a ## 5.2.6 -[View all changes from v5.2.5...v5.2.6](https://github.com/shopware/shopware/compare/v5.2.5...v5.2.6) +[View all changes from v5.2.5...v5.2.6](https://github.com/shopware5/shopware/compare/v5.2.5...v5.2.6) * Changed visibility of sAdmin::loginUser to protected * Added filter events to all convert functions in `LegacyStructConverter` @@ -340,13 +340,13 @@ There must be at least one option tag and inside each option tag where must be a ## 5.2.5 -[View all changes from v5.2.4...v5.2.5](https://github.com/shopware/shopware/compare/v5.2.4...v5.2.5) +[View all changes from v5.2.4...v5.2.5](https://github.com/shopware5/shopware/compare/v5.2.4...v5.2.5) * Fixed SEO URL generation for URLs containing dots and forward slashes ## 5.2.4 -[View all changes from v5.2.3...v5.2.4](https://github.com/shopware/shopware/compare/v5.2.3...v5.2.4) +[View all changes from v5.2.3...v5.2.4](https://github.com/shopware5/shopware/compare/v5.2.3...v5.2.4) * Introduced new interface `Shopware\Components\Slug\SlugInterface` to generate URL safe versions of a string * Service id `shopware.slug` @@ -388,7 +388,7 @@ There must be at least one option tag and inside each option tag where must be a ## 5.2.3 -[View all changes from v5.2.2...v5.2.3](https://github.com/shopware/shopware/compare/v5.2.2...v5.2.3) +[View all changes from v5.2.2...v5.2.3](https://github.com/shopware5/shopware/compare/v5.2.2...v5.2.3) * Updated `guzzlehttp/guzzle` to version 5.3.1 to mitigate [httproxy](https://httpoxy.org/) vulnerability * Set timeouts from install/update/(secure) uninstall operations in plugin manager to 300 seconds @@ -405,13 +405,13 @@ There must be at least one option tag and inside each option tag where must be a ## 5.2.2 (2016-07-13) -[View all changes from v5.2.0...v5.2.2](https://github.com/shopware/shopware/compare/v5.2.0...v5.2.2) +[View all changes from v5.2.0...v5.2.2](https://github.com/shopware5/shopware/compare/v5.2.0...v5.2.2) * Add support for Symfony `console.command` service tag to register commands directly inside service container ## 5.2.0 (2016-07-01) -[View all changes from v5.1.6...v5.2.0](https://github.com/shopware/shopware/compare/v5.1.6...v5.2.0) +[View all changes from v5.1.6...v5.2.0](https://github.com/shopware5/shopware/compare/v5.1.6...v5.2.0) * Increased minimum required PHP version to PHP >= 5.6.4. * Added CSRF protection to frontend and backend which is enabled by default. diff --git a/UPGRADE-5.3.md b/UPGRADE-5.3.md index 299cec957b7..1df87b2dfb6 100644 --- a/UPGRADE-5.3.md +++ b/UPGRADE-5.3.md @@ -4,7 +4,7 @@ This changelog references changes done in Shopware 5.3 patch versions. ## 5.3.7 -[View all changes from v5.3.6...v5.3.7](https://github.com/shopware/shopware/compare/v5.3.6...v5.3.7) +[View all changes from v5.3.6...v5.3.7](https://github.com/shopware5/shopware/compare/v5.3.6...v5.3.7) ### Changes @@ -17,7 +17,7 @@ This changelog references changes done in Shopware 5.3 patch versions. ## 5.3.6 -[View all changes from v5.3.5...v5.3.6](https://github.com/shopware/shopware/compare/v5.3.5...v5.3.6) +[View all changes from v5.3.5...v5.3.6](https://github.com/shopware5/shopware/compare/v5.3.5...v5.3.6) ### Changes @@ -29,7 +29,7 @@ This changelog references changes done in Shopware 5.3 patch versions. ## 5.3.5 -[View all changes from v5.3.4...v5.3.5](https://github.com/shopware/shopware/compare/v5.3.4...v5.3.5) +[View all changes from v5.3.4...v5.3.5](https://github.com/shopware5/shopware/compare/v5.3.4...v5.3.5) ### Additions @@ -62,7 +62,7 @@ This changelog references changes done in Shopware 5.3 patch versions. ## 5.3.4 -[View all changes from v5.3.3...v5.3.4](https://github.com/shopware/shopware/compare/v5.3.3...v5.3.4) +[View all changes from v5.3.3...v5.3.4](https://github.com/shopware5/shopware/compare/v5.3.3...v5.3.4) ### Additions @@ -92,7 +92,7 @@ This changelog references changes done in Shopware 5.3 patch versions. ## 5.3.3 -[View all changes from v5.3.2...v5.3.3](https://github.com/shopware/shopware/compare/v5.3.2...v5.3.3) +[View all changes from v5.3.2...v5.3.3](https://github.com/shopware5/shopware/compare/v5.3.2...v5.3.3) ### Additions @@ -111,7 +111,7 @@ This changelog references changes done in Shopware 5.3 patch versions. ## 5.3.2 -[View all changes from v5.3.1...v5.3.2](https://github.com/shopware/shopware/compare/v5.3.1...v5.3.2) +[View all changes from v5.3.1...v5.3.2](https://github.com/shopware5/shopware/compare/v5.3.1...v5.3.2) ### Additions @@ -125,7 +125,7 @@ This changelog references changes done in Shopware 5.3 patch versions. ## 5.3.0 -[View all changes from v5.2.27...v5.3.0](https://github.com/shopware/shopware/compare/v5.2.27...v5.3.0) +[View all changes from v5.2.27...v5.3.0](https://github.com/shopware5/shopware/compare/v5.2.27...v5.3.0) ### Additions diff --git a/UPGRADE-5.4.md b/UPGRADE-5.4.md index 4b478a4bc0d..2e669eb81b0 100644 --- a/UPGRADE-5.4.md +++ b/UPGRADE-5.4.md @@ -4,7 +4,7 @@ This changelog references changes done in Shopware 5.4 patch versions. ## 5.4.6 -[View all changes from v5.4.5...v5.4.6](https://github.com/shopware/shopware/compare/v5.4.5...v5.4.6) +[View all changes from v5.4.5...v5.4.6](https://github.com/shopware5/shopware/compare/v5.4.5...v5.4.6) ### Additions @@ -42,7 +42,7 @@ This changelog references changes done in Shopware 5.4 patch versions. ## 5.4.5 -[View all changes from v5.4.4...v5.4.5](https://github.com/shopware/shopware/compare/v5.4.4...v5.4.5) +[View all changes from v5.4.4...v5.4.5](https://github.com/shopware5/shopware/compare/v5.4.4...v5.4.5) ### Additions @@ -80,7 +80,7 @@ This changelog references changes done in Shopware 5.4 patch versions. ## 5.4.4 -[View all changes from v5.4.3...v5.4.4](https://github.com/shopware/shopware/compare/v5.4.3...v5.4.4) +[View all changes from v5.4.3...v5.4.4](https://github.com/shopware5/shopware/compare/v5.4.3...v5.4.4) ### Additions @@ -136,7 +136,7 @@ This changelog references changes done in Shopware 5.4 patch versions. ## 5.4.3 -[View all changes from v5.4.2...v5.4.3](https://github.com/shopware/shopware/compare/v5.4.2...v5.4.3) +[View all changes from v5.4.2...v5.4.3](https://github.com/shopware5/shopware/compare/v5.4.2...v5.4.3) ### Additions @@ -167,7 +167,7 @@ This changelog references changes done in Shopware 5.4 patch versions. ## 5.4.2 -[View all changes from v5.4.1...v5.4.2](https://github.com/shopware/shopware/compare/v5.4.1...v5.4.2) +[View all changes from v5.4.1...v5.4.2](https://github.com/shopware5/shopware/compare/v5.4.1...v5.4.2) ### Additions @@ -190,7 +190,7 @@ This changelog references changes done in Shopware 5.4 patch versions. ## 5.4.1 -[View all changes from v5.4.0...v5.4.1](https://github.com/shopware/shopware/compare/v5.4.0...v5.4.1) +[View all changes from v5.4.0...v5.4.1](https://github.com/shopware5/shopware/compare/v5.4.0...v5.4.1) ### Additions @@ -237,7 +237,7 @@ This changelog references changes done in Shopware 5.4 patch versions. ## 5.4.0 -[View all changes from v5.3.7...v5.4.0](https://github.com/shopware/shopware/compare/v5.3.7...v5.4.0) +[View all changes from v5.3.7...v5.4.0](https://github.com/shopware5/shopware/compare/v5.3.7...v5.4.0) ### Additions diff --git a/UPGRADE-5.5.md b/UPGRADE-5.5.md index 8515c0c6bb6..85cb16c566b 100644 --- a/UPGRADE-5.5.md +++ b/UPGRADE-5.5.md @@ -4,7 +4,7 @@ This changelog references changes done in Shopware 5.5 patch versions. ## 5.5.10 -[View all changes from v5.5.9...v5.5.10](https://github.com/shopware/shopware/compare/v5.5.9...v5.5.10) +[View all changes from v5.5.9...v5.5.10](https://github.com/shopware5/shopware/compare/v5.5.9...v5.5.10) ### Additions @@ -20,7 +20,7 @@ This changelog references changes done in Shopware 5.5 patch versions. ## 5.5.9 -[View all changes from v5.5.8...v5.5.9](https://github.com/shopware/shopware/compare/v5.5.8...v5.5.9) +[View all changes from v5.5.8...v5.5.9](https://github.com/shopware5/shopware/compare/v5.5.8...v5.5.9) ### Additions @@ -82,7 +82,7 @@ This changelog references changes done in Shopware 5.5 patch versions. ## 5.5.8 -[View all changes from v5.5.7...v5.5.8](https://github.com/shopware/shopware/compare/v5.5.7...v5.5.8) +[View all changes from v5.5.7...v5.5.8](https://github.com/shopware5/shopware/compare/v5.5.7...v5.5.8) ### Additions @@ -167,7 +167,7 @@ For security reasons, some extensions like php, cgi, com, exe are not allowed in ## 5.5.7 -[View all changes from v5.5.6...v5.5.7](https://github.com/shopware/shopware/compare/v5.5.6...v5.5.7) +[View all changes from v5.5.6...v5.5.7](https://github.com/shopware5/shopware/compare/v5.5.6...v5.5.7) ### Additions @@ -220,7 +220,7 @@ For security reasons, some extensions like php, cgi, com, exe are not allowed in * `\Shopware\Components\Plugin\XmlCronjobReader` * `\Shopware\Components\Plugin\XmlPluginInfoReader` * `\Shopware\Components\Plugin\XmlConfigDefinitionReader` - They have been replaced in Shopware 5.6 with new implementations in the namespace [Shopware\Components\Plugin\XmlReader](https://github.com/shopware/shopware/tree/5.6/engine/Shopware/Components/Plugin/XmlReader) + They have been replaced in Shopware 5.6 with new implementations in the namespace [Shopware\Components\Plugin\XmlReader](https://github.com/shopware5/shopware/tree/5.6/engine/Shopware/Components/Plugin/XmlReader) ### Removals @@ -289,7 +289,7 @@ return [ ## 5.5.6 -[View all changes from v5.5.5...v5.5.6](https://github.com/shopware/shopware/compare/v5.5.5...v5.5.6) +[View all changes from v5.5.5...v5.5.6](https://github.com/shopware5/shopware/compare/v5.5.5...v5.5.6) ### Changes @@ -298,7 +298,7 @@ return [ ## 5.5.5 -[View all changes from v5.5.4...v5.5.5](https://github.com/shopware/shopware/compare/v5.5.4...v5.5.5) +[View all changes from v5.5.4...v5.5.5](https://github.com/shopware5/shopware/compare/v5.5.4...v5.5.5) ### Additions @@ -387,7 +387,7 @@ return [ ## 5.5.4 -[View all changes from v5.5.3...v5.5.4](https://github.com/shopware/shopware/compare/v5.5.3...v5.5.4) +[View all changes from v5.5.3...v5.5.4](https://github.com/shopware5/shopware/compare/v5.5.3...v5.5.4) ### Additions @@ -457,7 +457,7 @@ return [ ## 5.5.3 -[View all changes from v5.5.2...v5.5.3](https://github.com/shopware/shopware/compare/v5.5.2...v5.5.3) +[View all changes from v5.5.2...v5.5.3](https://github.com/shopware5/shopware/compare/v5.5.2...v5.5.3) ### Additions @@ -485,7 +485,7 @@ return [ ## 5.5.2 -[View all changes from v5.5.1...v5.5.2](https://github.com/shopware/shopware/compare/v5.5.1...v5.5.2) +[View all changes from v5.5.1...v5.5.2](https://github.com/shopware5/shopware/compare/v5.5.1...v5.5.2) ### Additions @@ -567,7 +567,7 @@ return [ ## 5.5.1 -[View all changes from v5.5.0...v5.5.1](https://github.com/shopware/shopware/compare/v5.5.0...v5.5.1) +[View all changes from v5.5.0...v5.5.1](https://github.com/shopware5/shopware/compare/v5.5.0...v5.5.1) ### Changes @@ -575,7 +575,7 @@ return [ ## 5.5.0 -[View all changes from v5.4.6...v5.5.0](https://github.com/shopware/shopware/compare/v5.4.6...v5.5.0) +[View all changes from v5.4.6...v5.5.0](https://github.com/shopware5/shopware/compare/v5.4.6...v5.5.0) ### Additions diff --git a/UPGRADE-5.6.md b/UPGRADE-5.6.md index 9ca3ce2530c..5daea36ab92 100644 --- a/UPGRADE-5.6.md +++ b/UPGRADE-5.6.md @@ -4,11 +4,11 @@ This changelog references changes done in Shopware 5.6 patch versions. ## 5.6.10 -[View all changes from v5.6.9...v5.6.10](https://github.com/shopware/shopware/compare/v5.6.9...v5.6.10) +[View all changes from v5.6.9...v5.6.10](https://github.com/shopware5/shopware/compare/v5.6.9...v5.6.10) ## 5.6.9 -[View all changes from v5.6.8...v5.6.9](https://github.com/shopware/shopware/compare/v5.6.8...v5.6.9) +[View all changes from v5.6.8...v5.6.9](https://github.com/shopware5/shopware/compare/v5.6.8...v5.6.9) ### Changes @@ -16,7 +16,7 @@ This changelog references changes done in Shopware 5.6 patch versions. ## 5.6.8 -[View all changes from v5.6.7...v5.6.8](https://github.com/shopware/shopware/compare/v5.6.7...v5.6.8) +[View all changes from v5.6.7...v5.6.8](https://github.com/shopware5/shopware/compare/v5.6.7...v5.6.8) ### Additions @@ -35,7 +35,7 @@ This changelog references changes done in Shopware 5.6 patch versions. ## 5.6.7 -[View all changes from v5.6.6...v5.6.7](https://github.com/shopware/shopware/compare/v5.6.6...v5.6.7) +[View all changes from v5.6.6...v5.6.7](https://github.com/shopware5/shopware/compare/v5.6.6...v5.6.7) ### Additions @@ -104,7 +104,7 @@ This changelog references changes done in Shopware 5.6 patch versions. ## 5.6.6 -[View all changes from v5.6.5...v5.6.6](https://github.com/shopware/shopware/compare/v5.6.5...v5.6.6) +[View all changes from v5.6.5...v5.6.6](https://github.com/shopware5/shopware/compare/v5.6.5...v5.6.6) ### Changes @@ -112,7 +112,7 @@ This changelog references changes done in Shopware 5.6 patch versions. ## 5.6.5 -[View all changes from v5.6.4...v5.6.5](https://github.com/shopware/shopware/compare/v5.6.4...v5.6.5) +[View all changes from v5.6.4...v5.6.5](https://github.com/shopware5/shopware/compare/v5.6.4...v5.6.5) ### Additions @@ -161,7 +161,7 @@ This changelog references changes done in Shopware 5.6 patch versions. ## 5.6.4 -[View all changes from v5.6.3...v5.6.4](https://github.com/shopware/shopware/compare/v5.6.3...v5.6.4) +[View all changes from v5.6.3...v5.6.4](https://github.com/shopware5/shopware/compare/v5.6.3...v5.6.4) ### Changes @@ -169,7 +169,7 @@ This changelog references changes done in Shopware 5.6 patch versions. ## 5.6.3 -[View all changes from v5.6.2...v5.6.3](https://github.com/shopware/shopware/compare/v5.6.2...v5.6.3) +[View all changes from v5.6.2...v5.6.3](https://github.com/shopware5/shopware/compare/v5.6.2...v5.6.3) ### Additions @@ -232,7 +232,7 @@ to read [this documentation](https://developers.shopware.com/developers-guide/co ## 5.6.2 -[View all changes from v5.6.1...v5.6.2](https://github.com/shopware/shopware/compare/v5.6.1...v5.6.2) +[View all changes from v5.6.1...v5.6.2](https://github.com/shopware5/shopware/compare/v5.6.1...v5.6.2) ### Additions @@ -295,7 +295,7 @@ to read [this documentation](https://developers.shopware.com/developers-guide/co ## 5.6.1 -[View all changes from v5.6.0...v5.6.1](https://github.com/shopware/shopware/compare/v5.6.0...v5.6.1) +[View all changes from v5.6.0...v5.6.1](https://github.com/shopware5/shopware/compare/v5.6.0...v5.6.1) ### Additions @@ -325,7 +325,7 @@ to read [this documentation](https://developers.shopware.com/developers-guide/co ## 5.6.0 -[View all changes from v5.5.10...v5.6.0](https://github.com/shopware/shopware/compare/v5.5.10...v5.6.0) +[View all changes from v5.5.10...v5.6.0](https://github.com/shopware5/shopware/compare/v5.5.10...v5.6.0) ### Additions diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index ccfbfce69b9..0726b94b92f 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -4,7 +4,7 @@ This changelog references changes done in Shopware 5.7 patch versions. ## 5.7.19 -[View all changes from v5.7.18...v5.7.19](https://github.com/shopware/shopware/compare/v5.7.18...v5.7.19) +[View all changes from v5.7.18...v5.7.19](https://github.com/shopware5/shopware/compare/v5.7.18...v5.7.19) ### Changes @@ -22,7 +22,7 @@ This changelog references changes done in Shopware 5.7 patch versions. ## 5.7.18 -[View all changes from v5.7.17...v5.7.18](https://github.com/shopware/shopware/compare/v5.7.17...v5.7.18) +[View all changes from v5.7.17...v5.7.18](https://github.com/shopware5/shopware/compare/v5.7.17...v5.7.18) ### Additions @@ -61,7 +61,7 @@ This changelog references changes done in Shopware 5.7 patch versions. ## 5.7.17 -[View all changes from v5.7.16...v5.7.17](https://github.com/shopware/shopware/compare/v5.7.16...v5.7.17) +[View all changes from v5.7.16...v5.7.17](https://github.com/shopware5/shopware/compare/v5.7.16...v5.7.17) ### Additions @@ -112,7 +112,7 @@ This changelog references changes done in Shopware 5.7 patch versions. ## 5.7.16 -[View all changes from v5.7.15...v5.7.16](https://github.com/shopware/shopware/compare/v5.7.15...v5.7.16) +[View all changes from v5.7.15...v5.7.16](https://github.com/shopware5/shopware/compare/v5.7.15...v5.7.16) ### Additions @@ -208,19 +208,19 @@ This changelog references changes done in Shopware 5.7 patch versions. ## 5.7.15 -[View all changes from v5.7.14...v5.7.15](https://github.com/shopware/shopware/compare/v5.7.14...v5.7.15) +[View all changes from v5.7.14...v5.7.15](https://github.com/shopware5/shopware/compare/v5.7.14...v5.7.15) ## 5.7.14 -[View all changes from v5.7.13...v5.7.14](https://github.com/shopware/shopware/compare/v5.7.13...v5.7.14) +[View all changes from v5.7.13...v5.7.14](https://github.com/shopware5/shopware/compare/v5.7.13...v5.7.14) ## 5.7.13 -[View all changes from v5.7.12...v5.7.13](https://github.com/shopware/shopware/compare/v5.7.12...v5.7.13) +[View all changes from v5.7.12...v5.7.13](https://github.com/shopware5/shopware/compare/v5.7.12...v5.7.13) ## 5.7.12 -[View all changes from v5.7.11...v5.7.12](https://github.com/shopware/shopware/compare/v5.7.11...v5.7.12) +[View all changes from v5.7.11...v5.7.12](https://github.com/shopware5/shopware/compare/v5.7.11...v5.7.12) ### Additions @@ -269,15 +269,15 @@ This changelog references changes done in Shopware 5.7 patch versions. ## 5.7.11 -[View all changes from v5.7.10...v5.7.11](https://github.com/shopware/shopware/compare/v5.7.10...v5.7.11) +[View all changes from v5.7.10...v5.7.11](https://github.com/shopware5/shopware/compare/v5.7.10...v5.7.11) ## 5.7.10 -[View all changes from v5.7.9...v5.7.10](https://github.com/shopware/shopware/compare/v5.7.9...v5.7.10) +[View all changes from v5.7.9...v5.7.10](https://github.com/shopware5/shopware/compare/v5.7.9...v5.7.10) ## 5.7.9 -[View all changes from v5.7.8...v5.7.9](https://github.com/shopware/shopware/compare/v5.7.8...v5.7.9) +[View all changes from v5.7.8...v5.7.9](https://github.com/shopware5/shopware/compare/v5.7.8...v5.7.9) ### Changes @@ -287,7 +287,7 @@ This changelog references changes done in Shopware 5.7 patch versions. ## 5.7.8 -[View all changes from v5.7.7...v5.7.8](https://github.com/shopware/shopware/compare/v5.7.7...v5.7.8) +[View all changes from v5.7.7...v5.7.8](https://github.com/shopware5/shopware/compare/v5.7.7...v5.7.8) ### Additions @@ -346,7 +346,7 @@ This changelog references changes done in Shopware 5.7 patch versions. ## 5.7.7 -[View all changes from v5.7.6...v5.7.7](https://github.com/shopware/shopware/compare/v5.7.6...v5.7.7) +[View all changes from v5.7.6...v5.7.7](https://github.com/shopware5/shopware/compare/v5.7.6...v5.7.7) ### Deprecations @@ -398,7 +398,7 @@ to log in again.** ## 5.7.6 -[View all changes from v5.7.5...v5.7.6](https://github.com/shopware/shopware/compare/v5.7.5...v5.7.6) +[View all changes from v5.7.5...v5.7.6](https://github.com/shopware5/shopware/compare/v5.7.5...v5.7.6) ### Additions @@ -406,11 +406,11 @@ to log in again.** ## 5.7.5 -[View all changes from v5.7.4...v5.7.5](https://github.com/shopware/shopware/compare/v5.7.4...v5.7.5) +[View all changes from v5.7.4...v5.7.5](https://github.com/shopware5/shopware/compare/v5.7.4...v5.7.5) ## 5.7.4 -[View all changes from v5.7.3...v5.7.4](https://github.com/shopware/shopware/compare/v5.7.3...v5.7.4) +[View all changes from v5.7.3...v5.7.4](https://github.com/shopware5/shopware/compare/v5.7.3...v5.7.4) ### Deprecations @@ -474,7 +474,7 @@ please extend the `frontend_listing_actions_filter_include` block from now on in ## 5.7.3 -[View all changes from v5.7.2...v5.7.3](https://github.com/shopware/shopware/compare/v5.7.2...v5.7.3) +[View all changes from v5.7.2...v5.7.3](https://github.com/shopware5/shopware/compare/v5.7.2...v5.7.3) ### Changes @@ -487,7 +487,7 @@ please extend the `frontend_listing_actions_filter_include` block from now on in ## 5.7.2 -[View all changes from v5.7.1...v5.7.2](https://github.com/shopware/shopware/compare/v5.7.1...v5.7.2) +[View all changes from v5.7.1...v5.7.2](https://github.com/shopware5/shopware/compare/v5.7.1...v5.7.2) ### Changes @@ -495,7 +495,7 @@ please extend the `frontend_listing_actions_filter_include` block from now on in ## 5.7.1 -[View all changes from v5.7.0...v5.7.1](https://github.com/shopware/shopware/compare/v5.7.0...v5.7.1) +[View all changes from v5.7.0...v5.7.1](https://github.com/shopware5/shopware/compare/v5.7.0...v5.7.1) ### Additions @@ -512,7 +512,7 @@ please extend the `frontend_listing_actions_filter_include` block from now on in ## 5.7.0 -[View all changes from v5.6.10...v5.7.0](https://github.com/shopware/shopware/compare/v5.6.10...v5.7.0) +[View all changes from v5.6.10...v5.7.0](https://github.com/shopware5/shopware/compare/v5.6.10...v5.7.0) ### Breaks diff --git a/composer.json b/composer.json index e7a4110828f..f5e1f1630bf 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "forum": "https://forum.shopware.com", "chat": "https://slack.shopware.com", "wiki": "https://developers.shopware.com/", - "source": "https://github.com/shopware/shopware", + "source": "https://github.com/shopware5/shopware", "issues": "https://issues.shopware.com" }, "require": { diff --git a/engine/Library/Enlight/Components/Session/Namespace.php b/engine/Library/Enlight/Components/Session/Namespace.php index 210e329d429..2eba26fc1a1 100644 --- a/engine/Library/Enlight/Components/Session/Namespace.php +++ b/engine/Library/Enlight/Components/Session/Namespace.php @@ -164,7 +164,7 @@ public function start() // - Shopware\Components\DependencyInjection\Bridge\Session::createSession() // In case the session is started somewhere else we need to ensure no other session is active. The same logic as // in Shopware's factories is used here. - // This behaviour is analogue to Zend: https://github.com/shopware/shopware/blob/cbc212ca4642878cac62193d3a2f41e08f4849a2/engine/Library/Zend/Session.php#L413 + // This behaviour is analogue to Zend: https://github.com/shopware5/shopware/blob/cbc212ca4642878cac62193d3a2f41e08f4849a2/engine/Library/Zend/Session.php#L413 $container = Shopware()->Container(); self::ensureFrontendSessionClosed($container); self::ensureBackendSessionClosed($container); diff --git a/engine/Shopware/Bundle/AttributeBundle/README.md b/engine/Shopware/Bundle/AttributeBundle/README.md index fb4e19a1d5a..ce809a9a860 100644 --- a/engine/Shopware/Bundle/AttributeBundle/README.md +++ b/engine/Shopware/Bundle/AttributeBundle/README.md @@ -1,9 +1,5 @@ # AttributeBundle -- **License**: Dual license AGPL v3 / Proprietary -- **Github Repository**: -- **Issue-Tracker**: - ## Controllers There are only two controllers for handle all actions regarding attributes. diff --git a/engine/Shopware/Components/Plugin/XmlPluginInfoReader.php b/engine/Shopware/Components/Plugin/XmlPluginInfoReader.php index eae2ade32a9..2f3a1e9726d 100644 --- a/engine/Shopware/Components/Plugin/XmlPluginInfoReader.php +++ b/engine/Shopware/Components/Plugin/XmlPluginInfoReader.php @@ -38,7 +38,7 @@ * * Use new class Shopware\Components\Plugin\XmlReader\XmlPluginInfoReader (see Shopware 5.6) * - * https://github.com/shopware/shopware/blob/5.6/engine/Shopware/Components/Plugin/XmlReader/XmlPluginInfoReader.php + * https://github.com/shopware5/shopware/blob/5.6/engine/Shopware/Components/Plugin/XmlReader/XmlPluginInfoReader.php */ class XmlPluginInfoReader { diff --git a/recovery/update/src/UpdateHtaccess.php b/recovery/update/src/UpdateHtaccess.php index aa64120d463..0d044f91ca8 100644 --- a/recovery/update/src/UpdateHtaccess.php +++ b/recovery/update/src/UpdateHtaccess.php @@ -40,44 +40,44 @@ class UpdateHtaccess * versions, the file gets replaced with the new .htacces.dist. */ private const OLD_FILES = [ - 'ea1cf343d866211a2cd3fb1cda96c568', // https://github.com/shopware/shopware/blob/2822875087/.htaccess - '50201598e7180f7c9165936a9c5f4a53', // https://github.com/shopware/shopware/blob/2822875087/.htaccess + SwagSecurity section - 'ae5381e3a07011f35a45c066749f76a5', // https://github.com/shopware/shopware/blob/37213e91d5/.htaccess - 'baeb964cec3d2696e1030a5018b345c6', // https://github.com/shopware/shopware/blob/37213e91d5/.htaccess + SwagSecurity section - 'e18138d4ef5c4dda6c5a24f796d83109', // https://github.com/shopware/shopware/blob/f307af9286/.htaccess - 'c0f0bea10c3a8f5b1550d8d537294e32', // https://github.com/shopware/shopware/blob/f307af9286/.htaccess + SwagSecurity section - 'f45b5cf94584b362960acca19bd79a02', // https://github.com/shopware/shopware/blob/e4b24110b9/.htaccess - 'fd449fd74ce36aa3f4f01be5b198c42b', // https://github.com/shopware/shopware/blob/e4b24110b9/.htaccess + SwagSecurity section - '9d8825b4597f8f46dc40137b7afe2602', // https://github.com/shopware/shopware/blob/dea3a35b71/.htaccess - '7dc562c8f584358dae85e335e192c59f', // https://github.com/shopware/shopware/blob/dea3a35b71/.htaccess + SwagSecurity section - '657f2a28ce414c1a859f9f104bf16522', // https://github.com/shopware/shopware/blob/649b5a6e0a/.htaccess - 'a10d145e79029b78c797e58995eb2743', // https://github.com/shopware/shopware/blob/649b5a6e0a/.htaccess + SwagSecurity section - 'ece5e7d151499f18db260955642bc342', // https://github.com/shopware/shopware/blob/1982fda855/.htaccess - 'bece28210fc7c53c424999daa2f93303', // https://github.com/shopware/shopware/blob/1982fda855/.htaccess + SwagSecurity section - 'ebe05d01541cfd3bb4dcb4f46b761c0f', // https://github.com/shopware/shopware/blob/24b7abaa25/.htaccess - '16147aac5b54351c55f1cc2403892f40', // https://github.com/shopware/shopware/blob/24b7abaa25/.htaccess + SwagSecurity section - '54085d04dbcf32bdc27a464258380240', // https://github.com/shopware/shopware/blob/cf8907c6c5/.htaccess - '78f7207131fad361a710991f73620dd6', // https://github.com/shopware/shopware/blob/cf8907c6c5/.htaccess + SwagSecurity section - 'be8e8ddf9e048dcd127beeb7a1f2b93b', // https://github.com/shopware/shopware/blob/053632e79f/.htaccess - 'aaa3dae669543f176ec76ef1acb53b1b', // https://github.com/shopware/shopware/blob/053632e79f/.htaccess + SwagSecurity section - '33dd62e280adb9809173c3208eb14547', // https://github.com/shopware/shopware/blob/b021d77c8a/.htaccess - '7707cd5927b638a258548fd78c31e61a', // https://github.com/shopware/shopware/blob/b021d77c8a/.htaccess + SwagSecurity section - '45ef3f6ca5788085a3bb7378a1510c80', // https://github.com/shopware/shopware/blob/4aba9b79ac/.htaccess - '79b3663dd1dfa883a6d23b7cc6f56bd0', // https://github.com/shopware/shopware/blob/4aba9b79ac/.htaccess + SwagSecurity section - '486f52a32a31b97e11d5a83a0add7541', // https://github.com/shopware/shopware/blob/c0616709fb/.htaccess - 'ec269ec668c9e64c6e188ee0bdf9c273', // https://github.com/shopware/shopware/blob/c0616709fb/.htaccess + SwagSecurity section - '49959e6a8fa61bf38b1c269e97da0d46', // https://github.com/shopware/shopware/blob/2ab66c45c9/.htaccess - 'afde28bbcdf4f0d437ec44641a6faa3c', // https://github.com/shopware/shopware/blob/2ab66c45c9/.htaccess + SwagSecurity section - '1927450e0bcd5a1fbdad879356329f9d', // https://github.com/shopware/shopware/blob/0c0f6ff2e6/.htaccess - '7df38ad7aaa2410e363b3945759d9cf4', // https://github.com/shopware/shopware/blob/0c0f6ff2e6/.htaccess + SwagSecurity section - '136f3597e8745ae57e7e3139fab84c78', // https://github.com/shopware/shopware/blob/710076a2a2/.htaccess - 'b3ece266f62b8f7ab75307f2e9734605', // https://github.com/shopware/shopware/blob/710076a2a2/.htaccess + SwagSecurity section - 'b7f41355e1db0103b48bfe36458e4bb7', // https://github.com/shopware/shopware/blob/bb95afbd01/.htaccess - '596eb625c7f2804c10ec7be1ab441c82', // https://github.com/shopware/shopware/blob/bb95afbd01/.htaccess + SwagSecurity section - '781a1cdbd51aabf58e4626b3db8fd9c5', // https://github.com/shopware/shopware/blob/08661660a6/.htaccess - 'aaff6dcc929190c7f65e26fe3ec0538b', // https://github.com/shopware/shopware/blob/08661660a6/.htaccess + SwagSecurity section - '5d7e6211ff581e12cbd9769e5b3da4bd', // https://github.com/shopware/shopware/blob/7662e140d2/.htaccess - '7ca5b55b89c5a2306307d9b65479791a', // https://github.com/shopware/shopware/blob/7662e140d2/.htaccess + SwagSecurity section + 'ea1cf343d866211a2cd3fb1cda96c568', // https://github.com/shopware5/shopware/blob/2822875087/.htaccess + '50201598e7180f7c9165936a9c5f4a53', // https://github.com/shopware5/shopware/blob/2822875087/.htaccess + SwagSecurity section + 'ae5381e3a07011f35a45c066749f76a5', // https://github.com/shopware5/shopware/blob/37213e91d5/.htaccess + 'baeb964cec3d2696e1030a5018b345c6', // https://github.com/shopware5/shopware/blob/37213e91d5/.htaccess + SwagSecurity section + 'e18138d4ef5c4dda6c5a24f796d83109', // https://github.com/shopware5/shopware/blob/f307af9286/.htaccess + 'c0f0bea10c3a8f5b1550d8d537294e32', // https://github.com/shopware5/shopware/blob/f307af9286/.htaccess + SwagSecurity section + 'f45b5cf94584b362960acca19bd79a02', // https://github.com/shopware5/shopware/blob/e4b24110b9/.htaccess + 'fd449fd74ce36aa3f4f01be5b198c42b', // https://github.com/shopware5/shopware/blob/e4b24110b9/.htaccess + SwagSecurity section + '9d8825b4597f8f46dc40137b7afe2602', // https://github.com/shopware5/shopware/blob/dea3a35b71/.htaccess + '7dc562c8f584358dae85e335e192c59f', // https://github.com/shopware5/shopware/blob/dea3a35b71/.htaccess + SwagSecurity section + '657f2a28ce414c1a859f9f104bf16522', // https://github.com/shopware5/shopware/blob/649b5a6e0a/.htaccess + 'a10d145e79029b78c797e58995eb2743', // https://github.com/shopware5/shopware/blob/649b5a6e0a/.htaccess + SwagSecurity section + 'ece5e7d151499f18db260955642bc342', // https://github.com/shopware5/shopware/blob/1982fda855/.htaccess + 'bece28210fc7c53c424999daa2f93303', // https://github.com/shopware5/shopware/blob/1982fda855/.htaccess + SwagSecurity section + 'ebe05d01541cfd3bb4dcb4f46b761c0f', // https://github.com/shopware5/shopware/blob/24b7abaa25/.htaccess + '16147aac5b54351c55f1cc2403892f40', // https://github.com/shopware5/shopware/blob/24b7abaa25/.htaccess + SwagSecurity section + '54085d04dbcf32bdc27a464258380240', // https://github.com/shopware5/shopware/blob/cf8907c6c5/.htaccess + '78f7207131fad361a710991f73620dd6', // https://github.com/shopware5/shopware/blob/cf8907c6c5/.htaccess + SwagSecurity section + 'be8e8ddf9e048dcd127beeb7a1f2b93b', // https://github.com/shopware5/shopware/blob/053632e79f/.htaccess + 'aaa3dae669543f176ec76ef1acb53b1b', // https://github.com/shopware5/shopware/blob/053632e79f/.htaccess + SwagSecurity section + '33dd62e280adb9809173c3208eb14547', // https://github.com/shopware5/shopware/blob/b021d77c8a/.htaccess + '7707cd5927b638a258548fd78c31e61a', // https://github.com/shopware5/shopware/blob/b021d77c8a/.htaccess + SwagSecurity section + '45ef3f6ca5788085a3bb7378a1510c80', // https://github.com/shopware5/shopware/blob/4aba9b79ac/.htaccess + '79b3663dd1dfa883a6d23b7cc6f56bd0', // https://github.com/shopware5/shopware/blob/4aba9b79ac/.htaccess + SwagSecurity section + '486f52a32a31b97e11d5a83a0add7541', // https://github.com/shopware5/shopware/blob/c0616709fb/.htaccess + 'ec269ec668c9e64c6e188ee0bdf9c273', // https://github.com/shopware5/shopware/blob/c0616709fb/.htaccess + SwagSecurity section + '49959e6a8fa61bf38b1c269e97da0d46', // https://github.com/shopware5/shopware/blob/2ab66c45c9/.htaccess + 'afde28bbcdf4f0d437ec44641a6faa3c', // https://github.com/shopware5/shopware/blob/2ab66c45c9/.htaccess + SwagSecurity section + '1927450e0bcd5a1fbdad879356329f9d', // https://github.com/shopware5/shopware/blob/0c0f6ff2e6/.htaccess + '7df38ad7aaa2410e363b3945759d9cf4', // https://github.com/shopware5/shopware/blob/0c0f6ff2e6/.htaccess + SwagSecurity section + '136f3597e8745ae57e7e3139fab84c78', // https://github.com/shopware5/shopware/blob/710076a2a2/.htaccess + 'b3ece266f62b8f7ab75307f2e9734605', // https://github.com/shopware5/shopware/blob/710076a2a2/.htaccess + SwagSecurity section + 'b7f41355e1db0103b48bfe36458e4bb7', // https://github.com/shopware5/shopware/blob/bb95afbd01/.htaccess + '596eb625c7f2804c10ec7be1ab441c82', // https://github.com/shopware5/shopware/blob/bb95afbd01/.htaccess + SwagSecurity section + '781a1cdbd51aabf58e4626b3db8fd9c5', // https://github.com/shopware5/shopware/blob/08661660a6/.htaccess + 'aaff6dcc929190c7f65e26fe3ec0538b', // https://github.com/shopware5/shopware/blob/08661660a6/.htaccess + SwagSecurity section + '5d7e6211ff581e12cbd9769e5b3da4bd', // https://github.com/shopware5/shopware/blob/7662e140d2/.htaccess + '7ca5b55b89c5a2306307d9b65479791a', // https://github.com/shopware5/shopware/blob/7662e140d2/.htaccess + SwagSecurity section ]; private string $htaccessPath; diff --git a/tests/Unit/Bundle/PluginInstallerBundle/Fixtures/TestPlugin/plugin.xml b/tests/Unit/Bundle/PluginInstallerBundle/Fixtures/TestPlugin/plugin.xml index 86baa7dc7c6..15ec076b6d0 100644 --- a/tests/Unit/Bundle/PluginInstallerBundle/Fixtures/TestPlugin/plugin.xml +++ b/tests/Unit/Bundle/PluginInstallerBundle/Fixtures/TestPlugin/plugin.xml @@ -1,6 +1,6 @@ + xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/shopware5/shopware/5.3/engine/Shopware/Components/Plugin/schema/plugin.xsd"> 1.0.0 diff --git a/tests/Unit/Components/Plugin/XmlReader/examples/menu/paypal.xml b/tests/Unit/Components/Plugin/XmlReader/examples/menu/paypal.xml index 87467840e65..c167d868593 100644 --- a/tests/Unit/Components/Plugin/XmlReader/examples/menu/paypal.xml +++ b/tests/Unit/Components/Plugin/XmlReader/examples/menu/paypal.xml @@ -1,6 +1,6 @@ + xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/shopware5/shopware/5.2/engine/Shopware/Components/Plugin/schema/menu.xsd"> PayPal diff --git a/tests/Unit/Plugin/Backend/SwagUpdate/Components/SwagUpdateTest.php b/tests/Unit/Plugin/Backend/SwagUpdate/Components/SwagUpdateTest.php index ef19d6efa94..9f7e59e07de 100644 --- a/tests/Unit/Plugin/Backend/SwagUpdate/Components/SwagUpdateTest.php +++ b/tests/Unit/Plugin/Backend/SwagUpdate/Components/SwagUpdateTest.php @@ -203,7 +203,7 @@ private function getSingleVersionJson(string $version, bool $prerelease = false) { return json_encode([ [ - 'html_url' => 'https://github.com/shopware/shopware/releases/tag/v5.7.17', + 'html_url' => 'https://github.com/shopware5/shopware/releases/tag/v5.7.17', 'body' => '', 'id' => 97288305, 'node_id' => 'RE_kwDOAFa3Gs4FzIBx', @@ -215,7 +215,7 @@ private function getSingleVersionJson(string $version, bool $prerelease = false) 'published_at' => '2023-03-29T09:06:24Z', 'assets' => [ [ - 'url' => 'https://api.github.com/repos/shopware/shopware/releases/assets/102259279', + 'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259279', 'id' => 102259279, 'node_id' => 'RA_kwDOAFa3Gs4GGFpP', 'name' => 'install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip', @@ -226,10 +226,10 @@ private function getSingleVersionJson(string $version, bool $prerelease = false) 'download_count' => 132, 'created_at' => '2023-04-04T12:14:50Z', 'updated_at' => '2023-05-30T07:14:09Z', - 'browser_download_url' => 'https://github.com/shopware/shopware/releases/download/v5.7.17/install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip', + 'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip', ], [ - 'url' => 'https://api.github.com/repos/shopware/shopware/releases/assets/102259331', + 'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259331', 'id' => 102259331, 'node_id' => 'RA_kwDOAFa3Gs4GGFqD', 'name' => 'update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip', @@ -240,7 +240,7 @@ private function getSingleVersionJson(string $version, bool $prerelease = false) 'download_count' => 12, 'created_at' => '2023-04-04T12:15:18Z', 'updated_at' => '2023-05-30T07:14:37Z', - 'browser_download_url' => 'https://github.com/shopware/shopware/releases/download/v5.7.17/update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip', + 'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip', ], ], ], @@ -251,7 +251,7 @@ private function getSingleVersionWithoutAssets(string $version): string { return json_encode([ [ - 'html_url' => 'https://github.com/shopware/shopware/releases/tag/v5.7.17', + 'html_url' => 'https://github.com/shopware5/shopware/releases/tag/v5.7.17', 'body' => '', 'id' => 97288305, 'node_id' => 'RE_kwDOAFa3Gs4FzIBx', @@ -263,8 +263,8 @@ private function getSingleVersionWithoutAssets(string $version): string 'published_at' => '2023-03-29T09:06:24Z', 'assets' => [ ], - 'tarball_url' => 'https://api.github.com/repos/shopware/shopware/tarball/v5.7.17', - 'zipball_url' => 'https://api.github.com/repos/shopware/shopware/zipball/v5.7.17', + 'tarball_url' => 'https://api.github.com/repos/shopware5/shopware/tarball/v5.7.17', + 'zipball_url' => 'https://api.github.com/repos/shopware5/shopware/zipball/v5.7.17', ], ], JSON_THROW_ON_ERROR); } @@ -273,7 +273,7 @@ private function getMultiVersionJson(string $versionOne, bool $draftOne, string { return json_encode([ [ - 'html_url' => 'https://github.com/shopware/shopware/releases/tag/v5.7.17', + 'html_url' => 'https://github.com/shopware5/shopware/releases/tag/v5.7.17', 'body' => '', 'id' => 97288305, 'node_id' => 'RE_kwDOAFa3Gs4FzIBx', @@ -285,7 +285,7 @@ private function getMultiVersionJson(string $versionOne, bool $draftOne, string 'published_at' => '2023-03-29T09:06:24Z', 'assets' => [ [ - 'url' => 'https://api.github.com/repos/shopware/shopware/releases/assets/102259279', + 'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259279', 'id' => 102259279, 'node_id' => 'RA_kwDOAFa3Gs4GGFpP', 'name' => 'install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip', @@ -296,10 +296,10 @@ private function getMultiVersionJson(string $versionOne, bool $draftOne, string 'download_count' => 132, 'created_at' => '2023-04-04T12:14:50Z', 'updated_at' => '2023-05-30T07:14:09Z', - 'browser_download_url' => 'https://github.com/shopware/shopware/releases/download/v5.7.17/install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip', + 'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip', ], [ - 'url' => 'https://api.github.com/repos/shopware/shopware/releases/assets/102259331', + 'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259331', 'id' => 102259331, 'node_id' => 'RA_kwDOAFa3Gs4GGFqD', 'name' => 'update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip', @@ -310,12 +310,12 @@ private function getMultiVersionJson(string $versionOne, bool $draftOne, string 'download_count' => 12, 'created_at' => '2023-04-04T12:15:18Z', 'updated_at' => '2023-05-30T07:14:37Z', - 'browser_download_url' => 'https://github.com/shopware/shopware/releases/download/v5.7.17/update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip', + 'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip', ], ], ], [ - 'html_url' => 'https://github.com/shopware/shopware/releases/tag/v5.7.17', + 'html_url' => 'https://github.com/shopware5/shopware/releases/tag/v5.7.17', 'body' => '', 'id' => 97288305, 'node_id' => 'RE_kwDOAFa3Gs4FzIBx', @@ -327,7 +327,7 @@ private function getMultiVersionJson(string $versionOne, bool $draftOne, string 'published_at' => '2023-03-29T09:06:24Z', 'assets' => [ [ - 'url' => 'https://api.github.com/repos/shopware/shopware/releases/assets/102259279', + 'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259279', 'id' => 102259279, 'node_id' => 'RA_kwDOAFa3Gs4GGFpP', 'name' => 'install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip', @@ -338,10 +338,10 @@ private function getMultiVersionJson(string $versionOne, bool $draftOne, string 'download_count' => 132, 'created_at' => '2023-04-04T12:14:50Z', 'updated_at' => '2023-05-30T07:14:09Z', - 'browser_download_url' => 'https://github.com/shopware/shopware/releases/download/v5.7.17/install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip', + 'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip', ], [ - 'url' => 'https://api.github.com/repos/shopware/shopware/releases/assets/102259331', + 'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259331', 'id' => 102259331, 'node_id' => 'RA_kwDOAFa3Gs4GGFqD', 'name' => 'update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip', @@ -352,7 +352,7 @@ private function getMultiVersionJson(string $versionOne, bool $draftOne, string 'download_count' => 12, 'created_at' => '2023-04-04T12:15:18Z', 'updated_at' => '2023-05-30T07:14:37Z', - 'browser_download_url' => 'https://github.com/shopware/shopware/releases/download/v5.7.17/update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip', + 'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip', ], ], ], diff --git a/themes/Frontend/Responsive/package.json b/themes/Frontend/Responsive/package.json index 8c14903c954..ba9b98fe984 100644 --- a/themes/Frontend/Responsive/package.json +++ b/themes/Frontend/Responsive/package.json @@ -12,7 +12,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/shopware/shopware.git" + "url": "git+https://github.com/shopware5/shopware.git" }, "keywords": [ "shopware", @@ -26,7 +26,7 @@ "bugs": { "url": "https://issues.shopware.com" }, - "homepage": "https://github.com/shopware/shopware#readme", + "homepage": "https://github.com/shopware5/shopware#readme", "dependencies": { "flatpickr": "2.6.3", "jquery": "3.6.0", From ebca0fe6cdc2e0677384dabef2257e9288286aaa Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 6 Sep 2023 09:23:35 +0200 Subject: [PATCH 460/730] fix: Change license files and mentions of used licenses --- .php-cs-fixer.php | 17 ++++++++--------- README.md | 2 +- engine/Library/ExtJs/license.txt | 12 +++++++----- license.txt | 4 +--- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index 0321bb7f948..f2f88e80785 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -30,23 +30,22 @@ Shopware 5 Copyright (c) shopware AG -According to our dual licensing model, this program can be used either -under the terms of the GNU Affero General Public License, version 3, -or under a proprietary license. +According to our licensing model, this program can be used +under the terms of the GNU Affero General Public License, version 3. The texts of the GNU Affero General Public License with an additional -permission and of our proprietary license can be found at and -in the LICENSE file you have received along with this program. +permission can be found at and in the LICENSE file you have received +along with this program. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU Affero General Public License for more details. "Shopware" is a registered trademark of shopware AG. The licensing of the program under the AGPLv3 does not imply a -trademark license. Therefore any rights, title and interest in -our trademarks remain entirely with us. +trademark license. Therefore, any rights, title and interest in +our trademarks remain entirely with the shopware AG. EOF; return (new Config()) diff --git a/README.md b/README.md index 29bd1bff89b..d8f9eea3405 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Total Downloads](https://poser.pugx.org/shopware/shopware/downloads)](https://packagist.org/packages/shopware/shopware) [![Slack](https://img.shields.io/badge/chat-on%20slack-%23ECB22E)](http://slack.shopware.com?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) -- **License**: Dual license AGPL v3 / Proprietary +- **License**: GNU General Public License v3 (some used parts have different licenses, which can be found in the respective files or directories) - **GitHub Repository**: - **Issues**: diff --git a/engine/Library/ExtJs/license.txt b/engine/Library/ExtJs/license.txt index 2ff09c8ac5c..fbf9d60279c 100644 --- a/engine/Library/ExtJs/license.txt +++ b/engine/Library/ExtJs/license.txt @@ -7,9 +7,9 @@ http://www.sencha.com/license Open Source License ------------------------------------------------------------------------------------------ -This version of Ext JS is licensed under the terms of the Open Source GPL 3.0 license. +This version of Ext JS is licensed under the terms of the Open Source GPL 3.0 license. -http://www.gnu.org/licenses/gpl.html +https://www.gnu.org/licenses/gpl-3.0.html There are several FLOSS exceptions available for use with this release for open source applications that are distributed under a license other than GPL. @@ -26,10 +26,12 @@ open source applications that are distributed under a license other than GPL. Alternate Licensing ------------------------------------------------------------------------------------------ Commercial and OEM Licenses are available for an alternate download of Ext JS. -This is the appropriate option if you are creating proprietary applications and you are -not prepared to distribute and share the source code of your application under the +This is the appropriate option if you are creating proprietary applications, and you are +not prepared to distribute and share the source code of your application under the GPL v3 license. Please visit http://www.sencha.com/license for more details. -- -This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT OF THIRD-PARTY INTELLECTUAL PROPERTY RIGHTS. See the GNU General Public License for more details. \ No newline at end of file +This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; +without even the implied warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT OF THIRD-PARTY INTELLECTUAL PROPERTY RIGHTS. +See the GNU General Public License for more details. diff --git a/license.txt b/license.txt index 0ba993fcbcb..d3ea281561a 100644 --- a/license.txt +++ b/license.txt @@ -1,8 +1,6 @@ Important: - Shopware is licensed under a dual license. To check which -license / edition of Shopware you have installed, please open -the "About shopware" dialog in the backend. + Shopware is licensed under GNU General Public License 3 Additional permission under AGPLv3, Sec. 7: From 3a73921085d70b87f9a71ff46c4c9035beec8ca0 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 6 Sep 2023 09:48:25 +0200 Subject: [PATCH 461/730] fix: Change license header in PHP files --- .danger.php | 22 +++ .php-cs-fixer.php | 22 +++ .../101-add-extended-editor-field.php | 17 +- _sql/migrations/102-add-new-emotions.php | 17 +- _sql/migrations/103-add-field-blog-teaser.php | 17 +- .../104-add-field-blog-thumbnail-size.php | 17 +- .../105-s_core_sessions_backend.php | 17 +- .../migrations/106-add-path-to-categories.php | 17 +- .../107-remove-legacy-cache-config.php | 17 +- .../108-add-category-listing-indexes.php | 17 +- _sql/migrations/109-add-translations.php | 17 +- .../110-add-disabled-cache-field.php | 17 +- _sql/migrations/111-add-password-encoder.php | 17 +- ...che-menu-to-the-new-performance-module.php | 17 +- _sql/migrations/113-adds-performance-sql.php | 17 +- _sql/migrations/114-add-new-top-seller.php | 17 +- .../115-add-denormalized-category-table.php | 17 +- .../116-optimize-emotion-queries.php | 17 +- .../117-add-article-detail-page-indexes.php | 17 +- .../118-optimize-property-backend-queries.php | 17 +- _sql/migrations/119-add-batchmode-option.php | 17 +- _sql/migrations/120-add-cache-log.php | 17 +- .../1200-add-productbox-for-manufacturer.php | 17 +- .../1201-remove-secure-shop-config.php | 17 +- .../1202-remove-maxpages-formelement.php | 17 +- ...03-remove-blog-indexpage-configuration.php | 17 +- _sql/migrations/1204-add-variant-filter.php | 17 +- .../1205-remove-canonical-http-setting.php | 17 +- .../1206-add-laststock-field-to-variants.php | 17 +- .../1207-add-new-seo-alias-for-variants.php | 17 +- .../1208-add-checkout-seo-routes.php | 17 +- ...add-error-mail-log-level-config-option.php | 17 +- _sql/migrations/121-fix-cache-label.php | 17 +- .../1210-fix-config-table-index.php | 17 +- ...e-description-of-article-cover-setting.php | 17 +- ...rect-typo-in-newsletter-backend-config.php | 19 +- ...ststock-on-variant-template-generation.php | 17 +- .../1214-improve-email-header-field.php | 17 +- _sql/migrations/1215-form-active-status.php | 17 +- .../1216-remove-shopware-connect-menu.php | 17 +- .../1217-change-smtp-password-fieldtype.php | 17 +- .../1218-change-privacy-options.php | 17 +- ...219-add-cron-for-personal-data-cleanup.php | 19 +- .../122-optimize-search-index-queries.php | 17 +- .../1221-add-double-opt-in-dates.php | 17 +- .../migrations/1222-privacy-checkbox-note.php | 17 +- _sql/migrations/1223-add-ip-anonymization.php | 17 +- _sql/migrations/1224-cleanup-optin-table.php | 17 +- .../1225-add-double-opt-in-register.php | 17 +- .../1226-add-blog-comment-mailtemplate.php | 19 +- .../1227-change-minimum-order-surcharge.php | 17 +- .../1228-soptinregister-english-on-update.php | 37 ++-- .../1229-accountless-optin-switch.php | 19 +- _sql/migrations/123-add-dummy-plugins.php | 17 +- _sql/migrations/1230-add-cookie-removal.php | 17 +- ...iption-to-hideNoInStock-config-element.php | 17 +- .../124-remove-router-url-cache.php | 17 +- .../125-adds-filter-performance-sql.php | 17 +- .../126-update-cache-menu-items.php | 17 +- _sql/migrations/127-install-http-plugin.php | 17 +- .../128-adds-community-store-resource.php | 17 +- .../129-fix-mailer-config-help-text-typo.php | 17 +- ...-fix-typo-in-no-script-notices-snippet.php | 17 +- _sql/migrations/131-add-top-seller-index.php | 17 +- .../132-remove-similar-shown-listener.php | 17 +- .../133-add-esd-payment-status-config.php | 17 +- .../134-add-http-cache-cleanup-cronjob.php | 17 +- .../135-add-main-image-listing-config.php | 17 +- .../136-add-send-order-mail-config.php | 17 +- .../137-remove-lastarticles-save-time.php | 17 +- .../138-fix-typo-last-articles-headline.php | 17 +- .../139-remove-plugin-form-from-config.php | 17 +- _sql/migrations/140-fix-emotion-grid-id.php | 17 +- .../1400-add-benchmark-config-table.php | 17 +- _sql/migrations/1401-add-benchmark-menu.php | 17 +- .../1402-add-benchmark-teaser-config.php | 19 +- .../1403-implement-document-type-key.php | 17 +- ...e-language-distinction-from-shop-pages.php | 17 +- .../1405-add-es-backend-backlog.php | 19 +- .../1406-add-changed-timestamp-columns.php | 17 +- .../1407-add-english-translations.php | 17 +- .../1408-proportional-tax-calculation.php | 17 +- .../1409-add-shipping-tax-column.php | 17 +- .../141-add-force-canonical-http-config.php | 17 +- _sql/migrations/1410-add-sqli-privilege.php | 17 +- .../1411-change-order-documents-key.php | 17 +- .../1413-href-lang-configuration.php | 17 +- .../1414-add-statistics-acl-role.php | 17 +- .../1415-add-necessary-columns-to-bi.php | 17 +- ...d-article-detail-id-to-s-order-details.php | 17 +- .../1418-add-sitemap-configuration.php | 17 +- ...419-add-cron-for-personal-data-cleanup.php | 19 +- .../142-add-listing-description-config.php | 17 +- .../1421-add-double-opt-in-dates.php | 17 +- .../migrations/1422-privacy-checkbox-note.php | 17 +- _sql/migrations/1423-add-ip-anonymization.php | 17 +- _sql/migrations/1424-cleanup-optin-table.php | 17 +- .../1425-add-double-opt-in-register.php | 17 +- .../1426-add-blog-comment-mailtemplate.php | 19 +- .../1427-change-minimum-order-surcharge.php | 17 +- .../1428-soptinregister-english-on-update.php | 17 +- .../1429-accountless-optin-switch.php | 17 +- .../143-deactivate-router-to-lower-scope.php | 17 +- _sql/migrations/1430-add-cookie-removal.php | 17 +- ...iption-to-hideNoInStock-config-element.php | 17 +- .../1432-improve-plugin-manager.php | 17 +- .../migrations/1433-add-analytics-last-id.php | 17 +- .../1434-add-href-default-selection.php | 17 +- _sql/migrations/1435-update-esd-helptext.php | 17 +- .../1436-document-type-mail-templates.php | 17 +- .../1437-add-bi-last-update-date-column.php | 17 +- _sql/migrations/1438-add-bi-widgets.php | 17 +- .../1439-change-back-document-id-to-tmp.php | 17 +- .../144-add-require-phone-field-config.php | 17 +- .../1440-change-document-id-to-lowercase.php | 17 +- .../1441-update-subshop-vote-description.php | 17 +- .../1442-add-meta-description-config.php | 17 +- .../1443-add-shipping-country-flag.php | 17 +- .../1444-userfriendly-mail-options.php | 17 +- .../1445-add-delete-document-right.php | 17 +- .../1446-adjust-tracking-code-column-type.php | 17 +- .../1447-add-notification-attributes.php | 17 +- ...et-default-country-allow-shipping-true.php | 17 +- .../1449-add-shop-attributes-table.php | 17 +- .../145-fix-default-incorrect-translation.php | 17 +- .../migrations/1450-add-missing-countries.php | 17 +- _sql/migrations/1451-change-wiki-link.php | 17 +- .../1452-change-laststock-filter.php | 21 ++- _sql/migrations/1453-fix-extended-editor.php | 19 +- .../1454-add-category-shop-association.php | 25 ++- ...dd-customer-group-key-exemption-option.php | 17 +- .../1456-change-docid-column-type.php | 17 +- .../1457-add-minsearch-index-length.php | 17 +- .../1458-add-essential-features-config.php | 30 ++-- .../1459-change-shipping-costs-configs.php | 17 +- _sql/migrations/146-http-cache-events.php | 17 +- ...-shipping-costs-configs-for-off-canvas.php | 23 ++- ...461-change-no-customer-account-configs.php | 17 +- .../1462-add-i-am-select-field-options.php | 17 +- ...ttp-cache-on-entity-removal-subscriber.php | 17 +- _sql/migrations/1464-fix-translation.php | 17 +- _sql/migrations/147-translations.php | 17 +- .../148-payment-method-refactor.php | 17 +- .../149-add-sepa-database-items.php | 17 +- ...dd-checkout-payment-info-change-config.php | 17 +- .../151-add-missing-emotion-field-types.php | 17 +- ...ticleid-from-article-attributes-schema.php | 17 +- .../1601-add-http2-push-setting.php | 17 +- .../1602-add-plugin-manager-privilege.php | 17 +- .../1604-add-html-minify-option.php | 17 +- .../1605-add-plugin-migration-table.php | 17 +- ...6-extend-error-mail-recipients-setting.php | 18 +- .../1607-add-voucher-checkout-configs.php | 17 +- _sql/migrations/1608-add-voucher-configs.php | 19 +- .../1609-allow-longer-customergroup-keys.php | 18 +- .../1610-remove-mobile-sitemap-element.php | 17 +- .../1611-change-order-details-id-column.php | 17 +- .../1612-add-net-rounding-option.php | 20 +-- ...1613-new-config-clear-basket-on-logout.php | 21 ++- .../1614-add-emotion-in-listing-config.php | 17 +- .../1615-add-cart-migration-option.php | 23 ++- _sql/migrations/1616-add-mail-log-table.php | 17 +- _sql/migrations/1617-add-session-sharing.php | 23 ++- _sql/migrations/1618-add-custom-sort.php | 17 +- .../1620-add-mail-log-menu-entry.php | 17 +- _sql/migrations/1621-add-mail-log-config.php | 17 +- _sql/migrations/1622-add-maillog-acl-role.php | 17 +- .../1623-add-content-type-to-menu.php | 17 +- .../1624-add-content-type-to-emotion.php | 17 +- .../1625-add-sort-by-articlenumber.php | 17 +- .../1626-add password_change_date.php | 17 +- ...27-add-foreign-key-for-s_order_details.php | 17 +- .../1628-add-birthday-single-field-option.php | 21 ++- .../1629-translate-dispatch-methods.php | 17 +- .../1630-set-empty-options-null.php | 17 +- .../1631-add-shop-id-column-to-blogs.php | 17 +- .../1632-add-acl-privilege-requirements.php | 17 +- .../1633-offcanvas-shipping-cost-display.php | 21 ++- .../1634-add-shipping-surcharge-number.php | 21 ++- .../1635-add-opt-in-column-to-user.php | 17 +- .../1636-fix-config-form-translation.php | 19 +- .../1637-fix-foreign-keys-in-mail-log.php | 17 +- .../1638-update-doi-mail-templates.php | 17 +- _sql/migrations/1639-add-review-widget.php | 17 +- .../1640-remove-contact-unique-constraint.php | 17 +- .../1643-allow-attributes-readonly.php | 17 +- _sql/migrations/1644-href-lang-scope.php | 17 +- .../1645-use-ssl-shopware-services.php | 17 +- .../1646-remove-sitemap-from-settings.php | 17 +- ...RMATION-mail-template-default-examples.php | 25 ++- .../1648-add-new-cookie-button-config.php | 17 +- .../1649-add-cookie-consent-manager-site.php | 17 +- .../1650-technical-support-menu.php | 17 +- _sql/migrations/1651-feedback-menu-fix.php | 17 +- .../1652-enforce-unique-attributes.php | 17 +- _sql/migrations/1653-add-argon2-hashing.php | 17 +- .../1654-add-hreflang-just-seo-option.php | 17 +- ...5-disable-html-minification-on-install.php | 17 +- ...onfig-show-shipping-countries-checkout.php | 17 +- _sql/migrations/1700-add-sitemap-tables.php | 18 +- ...http-cache-events-and-routes-for-forms.php | 17 +- .../migrations/1702-no-more-invalid-dates.php | 17 +- .../migrations/1703-ignore-trailing-slash.php | 17 +- .../1704-rename-default-emotion-elements.php | 17 +- .../1705-remove-facebook-plugin.php | 17 +- _sql/migrations/1706-add-missing-pks.php | 17 +- _sql/migrations/1707-remove-debug-plugin.php | 17 +- ...config-hide-category-in-offcanvas-menu.php | 17 +- _sql/migrations/1709-change-mail-footer.php | 17 +- _sql/migrations/1710-correct-date-columns.php | 17 +- _sql/migrations/1711-add-cookie-timeout.php | 17 +- _sql/migrations/1712-add-regulation-price.php | 17 +- .../1713-add-captcha-to-password-reset.php | 17 +- ...-option-for-email-notification-captcha.php | 17 +- _sql/migrations/1715-add-collation.php | 17 +- .../1716-fixing-bot-detection-huawei.php | 18 +- _sql/migrations/1717-add-collation.php | 17 +- .../1718-fix-argon2-mempry-cost.php | 17 +- .../1719-increase-keywords-datatype.php | 17 +- .../1720-add-preview-for-youtube-videos.php | 17 +- .../1721-make-salutation-optional.php | 17 +- .../1722-remove-motor-from-botlist.php | 18 +- _sql/migrations/1723-remove-shopware-bi.php | 18 +- .../1724-remove-update-feedback.php | 18 +- .../1725-remove-feedback-popups.php | 17 +- _sql/migrations/1726-remove-update-form.php | 17 +- .../1727-update-date-formatting.php | 18 +- .../200-drop-unused-factory-table.php | 17 +- _sql/migrations/201-add-supplier-seo.php | 17 +- .../202-unregister-routerold-dead-event.php | 17 +- .../203-add-http-cache-clear-event.php | 17 +- .../204-add-supplier-seo-template.php | 17 +- .../205-date-time-picker-label-update.php | 17 +- .../206-change-image-attributes.php | 17 +- _sql/migrations/207-product-feed-export.php | 17 +- .../208-snippet-handling-refactoring.php | 17 +- _sql/migrations/209-add-meta-title.php | 17 +- .../migrations/210-add-meta-title-to-blog.php | 17 +- _sql/migrations/211-add-always-secure.php | 17 +- _sql/migrations/212-product-feed-export.php | 17 +- .../213-update-payment-methods-plugin.php | 17 +- .../214-add-debit-fields-to-payment-data.php | 17 +- ...-enlarge-zipcode-and-streetnumber-user.php | 17 +- ...large-zipcode-and-streetnumber-billing.php | 17 +- ...code-and-streetnumber-billing_shipping.php | 17 +- .../218-remove-old-debug-plugins.php | 17 +- ...19-customer-payment-data-editing-in-be.php | 17 +- .../220-add-payment-data-restriction.php | 17 +- _sql/migrations/221-remove-log-plugin.php | 17 +- _sql/migrations/222-add-logmail-config.php | 17 +- _sql/migrations/223-add-statistic-config.php | 17 +- .../224-add-statistic-impression-table.php | 17 +- .../225-fix-emotion-required-fields.php | 17 +- .../226-add-tellafriend-remove-option.php | 17 +- ...7-fix-canonical-force-http-translation.php | 17 +- ...8-add-canonical-force-http-description.php | 17 +- ...9-fix-last-articles-plugin-config-form.php | 17 +- .../230-fix-emotion-mandatory-fields.php | 17 +- ...231-update-redirectDownload-config-var.php | 17 +- .../301-drop-unused-cms-content-table.php | 17 +- _sql/migrations/302-add-secure-cron.php | 17 +- _sql/migrations/303-add-seo-categories.php | 17 +- .../304-widget-system-refactoring.php | 17 +- .../305-add-product-feed-caching.php | 17 +- .../306-update-secure-cron-description.php | 17 +- _sql/migrations/307-install-swag-update.php | 17 +- .../308-increase-session-id-fields.php | 17 +- .../309-merchant-email-translation.php | 17 +- .../310-swagupdate-translations.php | 17 +- .../311-subshop-maintenance-support.php | 17 +- .../312-update-search-form-translation.php | 17 +- .../313-add-order-detail-fields.php | 17 +- .../314-add-order-detail-pack-unit.php | 17 +- ...-shipping-address-country-field-labels.php | 17 +- .../316-update-seo-nofollow-labels.php | 17 +- _sql/migrations/317-update-store-api-url.php | 17 +- .../318-update-payment-methods-version.php | 17 +- _sql/migrations/319-update-google-plugin.php | 17 +- .../330-add-secure-uninstall-capability.php | 17 +- _sql/migrations/350-add-template-parent.php | 17 +- _sql/migrations/351-add-template-menu.php | 17 +- _sql/migrations/352-add-theme-config.php | 17 +- .../353-add-horizontal-scrolling-emotion.php | 17 +- _sql/migrations/354-add-video-element.php | 17 +- ...-remove-config-module-template-manager.php | 17 +- _sql/migrations/356-email-datetime-format.php | 17 +- ...7-add-changed-and-mobileactive-columns.php | 17 +- .../358-add-registration-field-options.php | 17 +- ..._additional_address_data_order_billing.php | 17 +- ...additional_address_data_order_shipping.php | 17 +- .../361-additional_address-config.php | 17 +- ...d_additional_address_data_user_billing.php | 17 +- ..._additional_address_data_user_shipping.php | 17 +- .../364-remove-article-impression.php | 17 +- .../365-google-analytics-plugin-upgrade.php | 17 +- _sql/migrations/366-translations.php | 17 +- _sql/migrations/367-mobile-statistics.php | 17 +- .../migrations/368-form-elem-text2-labels.php | 17 +- _sql/migrations/369-change-min-purchase.php | 17 +- _sql/migrations/370-optimize-performance.php | 17 +- .../371-add-multi-edit-config-options.php | 17 +- _sql/migrations/372-setup-multi-edit.php | 17 +- .../373-address-streetnumber-merge.php | 17 +- ...4-s-order-billing-enlarge-street-field.php | 17 +- ...75-s-order-billing-merge-street-number.php | 17 +- ...376-s-order-billing-drop-street-number.php | 17 +- ...-s-order-shipping-enlarge-street-field.php | 17 +- ...8-s-order-shipping-merge-street-number.php | 17 +- ...79-s-order-shipping-drop-street-number.php | 17 +- ...80-s-user-billing-enlarge-street-field.php | 17 +- ...381-s-user-billing-merge-street-number.php | 17 +- .../382-s-user-billing-drop-street-number.php | 17 +- ...3-s-user-shipping-enlarge-street-field.php | 17 +- ...84-s-user-shipping-merge-street-number.php | 17 +- ...385-s-user-shipping-drop-street-number.php | 17 +- .../386-import-multiedit-plugin-tables.php | 17 +- ...isplay-shipping-calculations-in-basket.php | 17 +- .../388-add-emotion-fields-position.php | 17 +- .../389-fix-custom-form-field-sorting.php | 17 +- _sql/migrations/390-add-device-column.php | 17 +- _sql/migrations/391-fix-attr17.php | 17 +- .../392-remove-unused-listerner.php | 17 +- .../393-add-404-page-config-options.php | 17 +- .../394-add-company-register-config.php | 17 +- ...395-remove-obsolete-trusted-shops-code.php | 17 +- .../396-add-family-friendly-meta.php | 17 +- _sql/migrations/397-form-meta-data.php | 17 +- .../398-add-custom-and-form-seo-template.php | 17 +- .../399-remove-unused-rewrite-table.php | 17 +- .../400-article-list-config-translations.php | 17 +- _sql/migrations/401-remove-unused-table.php | 17 +- _sql/migrations/402-remove-dead-event.php | 17 +- .../403-add-emotion-hint-to-basket-colors.php | 17 +- .../404-remove-sLanguage-from-item-export.php | 17 +- .../405-import-compare-settings.php | 17 +- .../406-add-advanced-menu-listeners.php | 17 +- .../407-empty-migration-placeholder.php | 17 +- .../408-variant-price-surcharge-refactor.php | 17 +- _sql/migrations/409-add-property-media.php | 17 +- _sql/migrations/410-add-emotion-fields.php | 17 +- _sql/migrations/411-remove-unused-columns.php | 17 +- ...412-remove-liveshopping-bundle-columns.php | 17 +- .../migrations/413-tidy-up-session-tables.php | 17 +- .../migrations/414-add-product-box-layout.php | 17 +- _sql/migrations/415-remove-promotions.php | 17 +- _sql/migrations/416-remove-dummy-plugins.php | 17 +- .../417-remove-routerold-plugin.php | 17 +- .../418-shop-specific-search-statistics.php | 17 +- _sql/migrations/419-extract-acl-service.php | 17 +- _sql/migrations/420-remove-plugin-manager.php | 17 +- .../421-remove-store-api-plugin.php | 17 +- _sql/migrations/422-add-plugin-categories.php | 17 +- .../423-remove-unused-config-variables.php | 17 +- ...424-update-deprecated-config-variables.php | 17 +- _sql/migrations/425-remove-old-templates.php | 17 +- _sql/migrations/426-extract-cron-service.php | 17 +- _sql/migrations/427-add-nostock-config.php | 17 +- .../428-remove-old-instock-config.php | 17 +- .../429-activate-performance-filters.php | 17 +- .../430-add-shop-page-form-shopid.php | 17 +- .../431-cache-emotion-landing-pages.php | 17 +- .../432-html5-tags-for-snippets.php | 17 +- .../433-emotion-device-column-as-varchar.php | 17 +- .../migrations/434-add-emotion-components.php | 17 +- .../435-mark-deprecated-fields-emotions.php | 17 +- .../436-update-html5-video-fields.php | 17 +- .../437-add-dirty-flag-email-translations.php | 169 +++++++++--------- ...dd-email-template-header-footer-fields.php | 17 +- .../439-update-document-footer-styling.php | 17 +- .../440-fix-sorder-email-template.php | 17 +- .../441-add-hide-downloads-in-account.php | 17 +- ...add-option-to-disable-styling-emotions.php | 17 +- .../443-add-wizard-configuration-value.php | 17 +- .../444-add-imprint-to-bottom-shop-group.php | 17 +- .../445-import-vrrl-plugin-settings.php | 17 +- .../446-easy-registration-process.php | 19 +- .../447-update-tag-cloud-defaults.php | 17 +- .../448-update-first-run-wizard-snippet.php | 17 +- _sql/migrations/449-add-pagination-seo.php | 17 +- .../450-add-high-dpi-album-settings.php | 17 +- .../migrations/451-fix-email-header-field.php | 17 +- .../452-add-styling-classes-main-menu.php | 17 +- _sql/migrations/453-update-table-encoding.php | 21 ++- _sql/migrations/454-rename-theme-manager.php | 17 +- .../455-cache-invalidate-variants.php | 17 +- .../456-emotion-worlds-cache-invalidation.php | 17 +- _sql/migrations/457-add-thumbnail-config.php | 17 +- .../458-remove-selfhealing-plugin.php | 17 +- _sql/migrations/459-translate-form-fields.php | 17 +- .../migrations/460-fix-email-header-field.php | 17 +- .../461-fix-sorder-email-thumbnails.php | 17 +- .../462-add-emotion-position-column.php | 17 +- .../463-translate-emotion-html-video.php | 17 +- _sql/migrations/464-add-feed-dirty-flag.php | 17 +- _sql/migrations/465-token-secret.php | 17 +- _sql/migrations/466-supplier-seo-url.php | 17 +- .../migrations/467-remove-listing-seo-url.php | 17 +- .../468-update-feeds-thumbnails-size.php | 19 +- .../469-add-404-article-page-config.php | 17 +- ...470-update-price-variation-column-type.php | 17 +- _sql/migrations/471-fix-attr17.php | 17 +- .../472-add-landing-page-parent.php | 17 +- .../473-add-zip-city-flip-option.php | 17 +- .../474-switch-zipcode-city-emails.php | 17 +- _sql/migrations/475-add-missing-emails.php | 17 +- .../476-add-less-compatible-flag.php | 17 +- ...477-disable-tag-cloud-for-installation.php | 17 +- .../478-add-emotion-banner-title-attr.php | 17 +- .../479-implement-after-update-wizard.php | 17 +- .../480-translate-multi-edit-config-form.php | 17 +- .../481-remove-vat-validation-from-core.php | 17 +- .../482-remove-horizontal-scrolling.php | 17 +- .../483-set-device-type-nullable.php | 17 +- .../484-add-seo-title-to-categories.php | 17 +- ...5-add-new-sprites-media-manager-albums.php | 17 +- .../486-generate-mobile-sitemap.php | 17 +- .../487-fix-service-product-snippet.php | 17 +- _sql/migrations/488-reset-search-index.php | 17 +- .../migrations/489-fix-backend-menu-icons.php | 17 +- .../490-fix-email-templates-images-height.php | 17 +- .../491-change-enabled-payment-methods.php | 17 +- ...ove-unnecessary-data-from-base-install.php | 17 +- .../493-remove-mail-translations.php | 17 +- ...-add-cheapest-price-calculation-config.php | 17 +- .../495-fix-shopping-worlds-grid.php | 17 +- ...96-add-cheapest-price-selection-config.php | 17 +- ...7-fix-email-payment-method-description.php | 17 +- .../498-fix-and-add-acl-privileges.php | 17 +- .../499-add-swag-update-acl-privileges.php | 17 +- _sql/migrations/500-destroy-bot-sessions.php | 17 +- .../501-add-added-column-in-mailaddresses.php | 17 +- .../502-remove-unused-voucher-table.php | 17 +- _sql/migrations/503-rename-multi-edit.php | 17 +- .../504-add-customergroup-index.php | 17 +- _sql/migrations/505-add-voucher-indexes.php | 17 +- _sql/migrations/506-password-reset.php | 17 +- ...support-max-generated-similar-products.php | 17 +- .../601-implement-elastic-search.php | 17 +- .../602-add-premium-plugins-menu-item.php | 17 +- _sql/migrations/603-add-product-streams.php | 17 +- ...-discount-surchage-names-into-snippets.php | 17 +- _sql/migrations/605-add-and-search-config.php | 17 +- _sql/migrations/606-add-state-name-column.php | 17 +- _sql/migrations/607-add-rss-feed-widget.php | 17 +- .../608-fix-product-stream-icon.php | 17 +- _sql/migrations/609-add-media-recycling.php | 17 +- .../610-remove-deprecated-adodb.php | 17 +- _sql/migrations/611-remove-deprecated-api.php | 17 +- .../612-remove-deprecated-multilanguage.php | 17 +- _sql/migrations/613-add-media-meta.php | 17 +- .../migrations/614-fix-document-logo-path.php | 17 +- _sql/migrations/615-password-reset.php | 17 +- .../616-product-stream-emotion-field.php | 17 +- .../617-add-html5-emotion-handler.php | 17 +- .../618-add-trash-album-settings.php | 17 +- .../619-add-widgets-listing-cache-tag.php | 17 +- .../620-add-delivered-in-future-column.php | 17 +- _sql/migrations/621-remove-filter-options.php | 17 +- _sql/migrations/622-add-emotion-seo-title.php | 17 +- .../623-add-payment-config-item.php | 17 +- _sql/migrations/624-fix-null-tax-rules.php | 17 +- _sql/migrations/625-rename-feedback.php | 17 +- .../626-fix-email-template-variables.php | 17 +- .../627-fix-order-email-voucher-image.php | 17 +- _sql/migrations/628-add-validation-index.php | 17 +- .../migrations/629-implement-ajax-timeout.php | 17 +- .../630-remove-google-analytics.php | 17 +- .../631-remove-search-results-per-page.php | 17 +- .../632-optimize-hide-no-instock-label.php | 17 +- .../633-add-index-for-image-mappings.php | 17 +- .../634-add-index-for-basket-ordernumber.php | 17 +- .../635-add-index-for-plugin-id.php | 17 +- .../636-streamline-german-email-wording.php | 17 +- .../637-deactivate-similar-products.php | 17 +- _sql/migrations/638-fix-serialized-data.php | 17 +- _sql/migrations/700-remove-filter-values.php | 17 +- .../701-remove-emotion-backend-options.php | 17 +- .../702-add-emotion-element-css-class.php | 17 +- ...3-activate-html-code-widget-by-default.php | 17 +- _sql/migrations/704-remove-referercheck.php | 17 +- .../705-rename-category-template-column.php | 17 +- _sql/migrations/706-remove-debit-table.php | 17 +- .../707-add-new-emotion-link-target-field.php | 17 +- .../708-attribute-administration.php | 17 +- _sql/migrations/709-add-user-addresses.php | 17 +- _sql/migrations/710-remove-fax-field.php | 17 +- .../711-create-address-migrate-table.php | 17 +- _sql/migrations/712-migrate-user-billing.php | 17 +- _sql/migrations/713-migrate-user-shipping.php | 17 +- _sql/migrations/714-migrate-order-billing.php | 17 +- .../migrations/715-migrate-order-shipping.php | 17 +- .../716-copy-addresses-to-addressbook.php | 17 +- .../717-set-default-billingaddresses.php | 17 +- .../718-set-default-shippingaddresses.php | 17 +- .../719-create-address-attribute-tables.php | 17 +- .../720-migrate-order-billing-attributes.php | 17 +- .../721-migrate-order-shipping-attributes.php | 17 +- .../722-migrate-user-shipping-attributes.php | 17 +- .../723-migrate-user-billing-attributes.php | 17 +- .../724-cleanup-address-migration.php | 17 +- ...-remove-license-plugin-from-initial-db.php | 17 +- .../726-remove-shipping-billing.php | 17 +- _sql/migrations/727-core-license-config.php | 17 +- _sql/migrations/728-create-s-user-columns.php | 17 +- .../729-migrate-additional-userdata.php | 17 +- _sql/migrations/730-drop-birthday-column.php | 17 +- _sql/migrations/731-remove-emotion-grids.php | 17 +- .../732-remove-landingpage-teaser.php | 17 +- .../733-add-translatable-field-with-data.php | 17 +- .../734-new-emotion-shop-association.php | 17 +- .../735-migrate-old-emotion-relation.php | 17 +- ...add-article-widget-categorie-selection.php | 17 +- .../737-add-emotion-element-viewport.php | 17 +- .../738-fixed-iframe-widget-xtype.php | 17 +- .../739-migrate-emotion-widget-settings.php | 17 +- ...new-border-setting-for-emotion-widgets.php | 17 +- .../741-migrate-salutation-mails.php | 17 +- .../migrations/742-add-title-user-billing.php | 17 +- .../743-add-title-order-billing.php | 17 +- .../744-add-title-order-shipping.php | 17 +- .../745-add-title-user-shipping.php | 17 +- _sql/migrations/746-migrate-shipping.php | 19 +- _sql/migrations/747-ekw-mode-migration.php | 17 +- _sql/migrations/748-remove-unused-fields.php | 17 +- _sql/migrations/749-make-ustid-nullable.php | 17 +- ...750-migrate-article-details-base-price.php | 17 +- .../751-drop-unused-menu-fields.php | 17 +- _sql/migrations/752-delete-payment-plugin.php | 17 +- .../753-add-s-user-customer-number.php | 17 +- ...4-update-order-billing-customer-number.php | 17 +- .../755-migrate-customer-number.php | 17 +- _sql/migrations/756-drop-customer-number.php | 17 +- _sql/migrations/757-add-array-store-field.php | 17 +- .../758-remove-attributes-read-acl.php | 17 +- _sql/migrations/759-remove-noviewselect.php | 17 +- .../760-change-plugin-unique-key.php | 17 +- .../761-change-performance-menu.php | 19 +- .../762-increase-img-character-size.php | 17 +- .../763-add-attributes-read-acl.php | 17 +- ...xing-ordernumber-schema-addon-premiums.php | 17 +- ...-schema-article-configurator-templates.php | 17 +- ...ing-ordernumber-schema-article-details.php | 17 +- ...-ordernumber-schema-campaigns-articles.php | 17 +- .../768-fixing-ordernumber-schema-order.php | 17 +- ...fixing-ordernumber-schema-order-basket.php | 17 +- ...ixing-ordernumber-schema-order-details.php | 17 +- ...-fixing-ordernumber-schema-order-notes.php | 17 +- _sql/migrations/772-allow-label-nullable.php | 17 +- .../773-add-library-component-fields.php | 19 +- .../774-add-extra-config-elements.php | 19 +- .../775-add-asset-version-config-element.php | 17 +- .../776-fix-alter-ignore-migrations.php | 17 +- _sql/migrations/777-fix-invalid-birthdays.php | 17 +- .../778-add-attribtue-default-value.php | 17 +- .../779-fixing-bot-detection-ios.php | 21 ++- _sql/migrations/780-fix-debit-payment.php | 17 +- _sql/migrations/781-update-forum-link.php | 17 +- .../782-add-partner-idcode-index.php | 17 +- .../783-increase-media-path-columns.php | 17 +- .../784-add-paging-to-notfoundfield.php | 17 +- .../785-add-connect-default-menu.php | 17 +- .../786-extend-api-cache-invalidation.php | 17 +- ...n-basicsettings-login-and-registration.php | 17 +- .../788-change-Seo-Router-description.php | 17 +- .../789-add-crontab-disableonerror.php | 17 +- .../790-clarify-basic-settings-label.php | 17 +- .../791-increase-password-hash-size.php | 17 +- ...registration-email-confirmation-config.php | 17 +- .../793-add-attribute-table-for-search.php | 17 +- .../migrations/794-fix-shop-page-limiting.php | 17 +- .../795-remove-salutation-snippets.php | 17 +- .../796-add-uniqueid-config-element.php | 17 +- .../797-remove-salutation-snippets.php | 17 +- _sql/migrations/798-add-sytem-log-acl.php | 17 +- .../799-attribute-translation-fix-1-of-10.php | 17 +- .../800-attribute-translation-fix-2-of-10.php | 17 +- .../801-attribute-translation-fix-3-of-10.php | 17 +- .../802-attribute-translation-fix-4-of-10.php | 17 +- .../803-attribute-translation-fix-5-of-10.php | 17 +- .../804-attribute-translation-fix-6-of-10.php | 17 +- .../805-attribute-translation-fix-7-of-10.php | 17 +- .../806-attribute-translation-fix-8-of-10.php | 17 +- .../807-attribute-translation-fix-9-of-10.php | 17 +- ...808-attribute-translation-fix-10-of-10.php | 17 +- _sql/migrations/809-change-session-tables.php | 17 +- ...e-description-of-article-cover-setting.php | 17 +- .../migrations/811-add-attributes-partner.php | 17 +- _sql/migrations/812-add-max-limit-config.php | 17 +- _sql/migrations/813-session-expiry.php | 17 +- ...e-configurator-options-attribute-table.php | 17 +- ...15-add-strip-tags-configuration-option.php | 19 +- .../816-short-cut-menu-plugin-manager.php | 17 +- .../817-add-plugin-translations.php | 17 +- ...ke-some-fields-in-order-table-nullable.php | 17 +- _sql/migrations/819-shortcut-help-menu.php | 17 +- _sql/migrations/820-plugin-safe-mode.php | 17 +- .../900-add-last-articles-config-elements.php | 17 +- _sql/migrations/901-add-vote-shop-id.php | 17 +- ...902-remove-import-export-legacy-module.php | 17 +- .../903-add-menu-import-export-advanced.php | 17 +- _sql/migrations/904-add-captcha-selection.php | 17 +- .../905-add-backend-listing-index.php | 17 +- ...tryshipping-registration-config-option.php | 17 +- _sql/migrations/907-add-signed-basket.php | 17 +- .../908-change-varchar-attributes.php | 17 +- _sql/migrations/909-add-buy-button-config.php | 17 +- .../migrations/910-add-cookie-permissions.php | 17 +- .../911-add-facet-behavior-switch.php | 17 +- _sql/migrations/912-add-mail-template.php | 17 +- ...category-selection-for-category-teaser.php | 17 +- .../914-add-preview-id-for-emotions.php | 17 +- .../916-add-capcha-to-register-page.php | 17 +- _sql/migrations/917-add-sorting-module.php | 17 +- _sql/migrations/918-add-facet-module.php | 17 +- .../919-change-article-emotion-elements.php | 17 +- .../920-add-description-to-linear-meter.php | 17 +- .../921-remove-shipping-free-flag.php | 17 +- _sql/migrations/922-change-instock.php | 17 +- _sql/migrations/923-add-customer-streams.php | 17 +- _sql/migrations/924-add-cache-control.php | 17 +- _sql/migrations/925-add-user-config.php | 17 +- _sql/migrations/926-add-emotion-presets.php | 17 +- .../928-add-captcha-to-newsletter-page.php | 17 +- _sql/migrations/929-add-stream-rules.php | 17 +- _sql/migrations/930-fix-variant-weight.php | 17 +- _sql/migrations/931-add-slt-config.php | 17 +- _sql/migrations/932-add-http-cache-route.php | 17 +- .../933-add-customer-stream-menu.php | 17 +- _sql/migrations/934-add-stream-attributes.php | 17 +- .../935-add-listing-layout-config.php | 17 +- _sql/migrations/936-remove-stream-index.php | 17 +- _sql/migrations/937-add-type-field.php | 17 +- .../938-add-preset-emotion-translations.php | 17 +- .../939-add-translations-for-facets.php | 17 +- .../940-fix-import-export-menu-entry.php | 17 +- .../941-replace-default-document-logo.php | 17 +- _sql/migrations/942-add-shipping-acl.php | 17 +- .../943-add-new-colum-search-fields.php | 17 +- .../944-update-german-translations.php | 17 +- ...45-add-category-column-external-target.php | 17 +- .../946-change-customer-stream-type.php | 17 +- ...e-field-length-in_s_marketing_vouchers.php | 17 +- .../948-update-customer-stream-conditions.php | 17 +- ...-add-deprecation-hint-to-maxpages-form.php | 17 +- _sql/migrations/951-add-shipping-phone.php | 17 +- ...2-implement-backend-menu-configuration.php | 17 +- ...-implement-growl-message-configuration.php | 17 +- .../954-edit-company-register-config.php | 17 +- .../955-rename-payment-order-state.php | 17 +- .../956-seperate-logmail-address.php | 17 +- _sql/migrations/957-site-active-status.php | 17 +- .../958-add-http-cache-events-for-site.php | 17 +- .../959-fix-emotion-default-value.php | 17 +- ...0-add-article-shippingtime-translation.php | 17 +- .../migrations/961-update-email-templates.php | 69 ++++--- .../962-add-ordernumber-form-field.php | 17 +- .../963-update-emotion-url-template.php | 17 +- _sql/migrations/964-translate-slt-setting.php | 17 +- .../965-add-album-garbage-collect-option.php | 17 +- .../AttributeTranslationMigrationHelper.php | 17 +- _sql/migrations/common/MigrationHelper.php | 17 +- .../common/SitemapConfigMigrationHelper.php | 18 +- autoload.php | 18 +- bin/console | 17 +- build/config-elasticsearch.php | 17 +- build/config-mink.php | 17 +- .../sysplugins/smarty_internal_write_file.php | 22 --- .../Smarty/sysplugins/smarty_resource.php | 22 --- engine/Library/Zend/Auth/Adapter/DbTable.php | 22 --- engine/Library/Zend/Cache/Backend.php | 23 +-- engine/Library/Zend/Cache/Core.php | 23 +-- engine/Library/Zend/Db/Adapter/Abstract.php | 23 +-- engine/Library/Zend/Db/Select.php | 23 +-- engine/Library/Zend/Http/Header/SetCookie.php | 23 +-- engine/Library/Zend/Locale/Data.php | 23 +-- engine/Shopware/Bootstrap.php | 17 +- .../Bundle/AccountBundle/AccountBundle.php | 17 +- .../Constraint/CurrentPassword.php | 17 +- .../Constraint/CurrentPasswordValidator.php | 17 +- .../Constraint/CustomerEmail.php | 17 +- .../Constraint/CustomerEmailValidator.php | 17 +- .../AccountBundle/Constraint/FormEmail.php | 17 +- .../Constraint/FormEmailValidator.php | 17 +- .../AccountBundle/Constraint/Password.php | 17 +- .../Constraint/PasswordValidator.php | 17 +- .../Form/Account/AddressFormType.php | 17 +- .../Form/Account/AttributeFormType.php | 17 +- .../Form/Account/EmailUpdateFormType.php | 17 +- .../Form/Account/PasswordUpdateFormType.php | 17 +- .../Form/Account/PersonalFormType.php | 17 +- .../Form/Account/ProfileUpdateFormType.php | 17 +- .../Form/Account/ResetPasswordFormType.php | 17 +- .../AccountBundle/Service/AddressService.php | 17 +- .../Service/AddressServiceInterface.php | 17 +- .../AccountBundle/Service/CustomerService.php | 17 +- .../Service/CustomerServiceInterface.php | 17 +- .../Service/CustomerUnlockService.php | 17 +- .../CustomerUnlockServiceInterface.php | 17 +- .../Service/OptInLoginService.php | 17 +- .../Service/OptInLoginServiceInterface.php | 17 +- .../AccountBundle/Service/RegisterService.php | 17 +- .../Service/RegisterServiceInterface.php | 17 +- .../StoreFrontCustomerGreetingService.php | 17 +- ...eFrontCustomerGreetingServiceInterface.php | 17 +- .../Service/Validator/AddressValidator.php | 17 +- .../Validator/AddressValidatorInterface.php | 17 +- .../Service/Validator/CustomerValidator.php | 17 +- .../Validator/CustomerValidatorInterface.php | 17 +- .../AccountBundle/Type/SalutationType.php | 17 +- .../AttributeBundle/AttributeBundle.php | 17 +- .../Controllers/Backend/AttributeData.php | 17 +- .../Controllers/Backend/Attributes.php | 17 +- .../Controllers/Backend/EntitySearch.php | 17 +- .../Compiler/StaticResourcesCompilerPass.php | 17 +- .../Resources/column_name_blacklist.php | 17 +- .../Resources/table_entity_mapping.php | 17 +- .../Repository/CustomFacetRepository.php | 17 +- .../Repository/CustomerRepository.php | 17 +- .../Repository/GenericRepository.php | 17 +- .../Repository/OrderRepository.php | 17 +- .../Repository/ProductRepository.php | 17 +- .../Repository/Reader/BlogReader.php | 17 +- .../Repository/Reader/CategoryReader.php | 17 +- .../Repository/Reader/CustomerReader.php | 17 +- .../Reader/CustomerStreamReader.php | 17 +- .../Repository/Reader/GenericReader.php | 17 +- .../Repository/Reader/MediaReader.php | 17 +- .../Repository/Reader/OrderReader.php | 17 +- .../Repository/Reader/PremiumReader.php | 17 +- .../Repository/Reader/ProductReader.php | 17 +- .../Reader/PropertyOptionReader.php | 17 +- .../Repository/Reader/ReaderInterface.php | 17 +- .../Repository/Reader/ShopReader.php | 17 +- .../AttributeBundle/Repository/Registry.php | 17 +- .../Repository/RegistryInterface.php | 17 +- .../Repository/RepositoryInterface.php | 17 +- .../Repository/SearchCriteria.php | 17 +- .../Repository/SearchResult.php | 17 +- .../Repository/Searcher/CategorySearcher.php | 17 +- .../Repository/Searcher/CustomerSearcher.php | 17 +- .../Searcher/CustomerStreamSearcher.php | 17 +- .../Repository/Searcher/EmotionSearcher.php | 17 +- .../Repository/Searcher/GenericSearcher.php | 17 +- .../Repository/Searcher/OrderSearcher.php | 17 +- .../Repository/Searcher/PremiumSearcher.php | 17 +- .../Repository/Searcher/ProductSearcher.php | 17 +- .../Searcher/PropertyOptionSearcher.php | 17 +- .../Repository/Searcher/SearcherInterface.php | 17 +- .../Repository/Searcher/SearcherResult.php | 17 +- .../Service/ConfigurationStruct.php | 17 +- .../AttributeBundle/Service/CrudService.php | 17 +- .../Service/CrudServiceInterface.php | 17 +- .../AttributeBundle/Service/DataLoader.php | 17 +- .../Service/DataLoaderInterface.php | 17 +- .../AttributeBundle/Service/DataPersister.php | 17 +- .../Service/DataPersisterInterface.php | 17 +- .../Service/SchemaOperator.php | 17 +- .../Service/SchemaOperatorInterface.php | 17 +- .../AttributeBundle/Service/TableMapping.php | 17 +- .../Service/TableMappingInterface.php | 17 +- .../AttributeBundle/Service/TypeMapping.php | 17 +- .../Service/TypeMappingInterface.php | 17 +- engine/Shopware/Bundle/CartBundle/CartKey.php | 17 +- .../Bundle/CartBundle/CartPositionsMode.php | 17 +- .../Bundle/CartBundle/CheckoutKey.php | 17 +- .../Commands/TypeSynchronizerCommand.php | 17 +- .../ContentTypeBundle/ContentTypeBundle.php | 17 +- .../Controller/Api/ContentType.php | 17 +- .../Controller/Backend/ContentType.php | 17 +- .../Controller/Backend/ContentTypeManager.php | 17 +- .../Controller/Frontend/ContentType.php | 17 +- .../RegisterDynamicController.php | 17 +- .../RegisterFieldsCompilerPass.php | 17 +- .../RegisterTypeRepositories.php | 17 +- .../DependencyInjection/TypeReader.php | 17 +- .../ContentTypeBundle/Field/AceEditor.php | 17 +- .../ContentTypeBundle/Field/CheckboxField.php | 17 +- .../ContentTypeBundle/Field/ComboboxField.php | 17 +- .../ContentTypeBundle/Field/DateField.php | 17 +- .../ContentTypeBundle/Field/DummyField.php | 17 +- .../Field/FieldInterface.php | 17 +- .../ContentTypeBundle/Field/IntegerField.php | 17 +- .../ContentTypeBundle/Field/MediaField.php | 17 +- .../ContentTypeBundle/Field/MediaGrid.php | 17 +- .../ContentTypeBundle/Field/NoUrlField.php | 17 +- .../Field/ResolveableFieldInterface.php | 17 +- .../Field/Shopware/AbstractGridField.php | 17 +- .../Shopware/AbstractSingleSelectionField.php | 17 +- .../Field/Shopware/ProductField.php | 17 +- .../Field/Shopware/ProductGrid.php | 17 +- .../Field/Shopware/ShopField.php | 17 +- .../Field/Shopware/ShopGrid.php | 17 +- .../Field/TemplateProvidingFieldInterface.php | 17 +- .../ContentTypeBundle/Field/TextAreaField.php | 17 +- .../ContentTypeBundle/Field/TextField.php | 17 +- .../ContentTypeBundle/Field/TinymceField.php | 17 +- .../ContentTypeBundle/Field/TypeField.php | 17 +- .../ContentTypeBundle/Field/TypeGrid.php | 17 +- .../FieldResolver/AbstractResolver.php | 17 +- .../FieldResolver/MediaResolver.php | 17 +- .../FieldResolver/ProductResolver.php | 17 +- .../FieldResolver/ShopResolver.php | 17 +- .../FieldResolver/TypeResolver.php | 17 +- .../Services/AclSynchronizer.php | 17 +- .../Services/AclSynchronizerInterface.php | 17 +- .../Services/ContentTypeCleanupService.php | 17 +- .../ContentTypeCleanupServiceInterface.php | 17 +- .../DatabaseContentTypeSynchronizer.php | 17 +- ...tabaseContentTypeSynchronizerInterface.php | 17 +- .../Services/ExtjsBuilder.php | 17 +- .../Services/ExtjsBuilderInterface.php | 17 +- .../Services/FrontendTypeTranslator.php | 17 +- .../FrontendTypeTranslatorInterface.php | 17 +- .../Services/MenuSynchronizer.php | 17 +- .../Services/MenuSynchronizerInterface.php | 17 +- .../ContentTypeBundle/Services/Repository.php | 17 +- .../Services/RepositoryInterface.php | 17 +- .../Services/SynchronizerService.php | 17 +- .../Services/SynchronizerServiceInterface.php | 17 +- .../Services/TypeBuilder.php | 17 +- .../Services/TypeFieldResolver.php | 17 +- .../Services/TypeFieldResolverInterface.php | 17 +- .../Services/TypeProvider.php | 17 +- .../Services/XmlReader/ContentTypesReader.php | 17 +- .../ContentTypeBundle/Structs/Criteria.php | 17 +- .../ContentTypeBundle/Structs/Field.php | 17 +- .../ContentTypeBundle/Structs/Fieldset.php | 17 +- .../Structs/SearchResult.php | 17 +- .../Bundle/ContentTypeBundle/Structs/Type.php | 17 +- .../Subscriber/EntitySearchSubscriber.php | 17 +- .../Subscriber/SyncSubscriber.php | 17 +- .../RequestParameterResolver.php | 17 +- .../ArgumentResolver/ShopContextResolver.php | 17 +- .../ControllerBundle/ControllerBundle.php | 17 +- .../Compiler/ControllerCompilerPass.php | 17 +- .../RegisterControllerCompilerPass.php | 17 +- .../Exceptions/ResourceNotFoundException.php | 17 +- .../Listener/ControllerPathListener.php | 17 +- .../Controllers/CookieController.php | 17 +- .../Bundle/CookieBundle/CookieBundle.php | 17 +- .../Bundle/CookieBundle/CookieCollection.php | 17 +- .../CookieBundle/CookieGroupCollection.php | 17 +- .../InvalidCookieGroupItemException.php | 17 +- .../Exceptions/InvalidCookieItemException.php | 17 +- .../NoCookieGroupByNameKnownException.php | 17 +- .../CookieBundle/Services/CookieCollector.php | 17 +- .../Services/CookieCollectorInterface.php | 17 +- .../CookieBundle/Services/CookieHandler.php | 17 +- .../Services/CookieHandlerInterface.php | 17 +- .../Services/CookieRemoveHandler.php | 17 +- .../Services/CookieRemoveHandlerInterface.php | 17 +- .../Structs/CookieGroupStruct.php | 17 +- .../CookieBundle/Structs/CookieStruct.php | 17 +- .../CustomerSearchBundle/BaseCustomer.php | 17 +- .../Condition/AccountModeCondition.php | 17 +- .../Condition/AgeCondition.php | 17 +- .../Condition/AssignedToStreamCondition.php | 17 +- .../Condition/CustomerAttributeCondition.php | 17 +- .../HasAddressWithCountryCondition.php | 17 +- .../Condition/HasCanceledOrdersCondition.php | 17 +- .../HasNewsletterRegistrationCondition.php | 17 +- .../HasNoAddressWithCountryCondition.php | 17 +- .../HasNoCanceledOrdersCondition.php | 17 +- .../HasNoNewsletterRegistrationCondition.php | 17 +- .../Condition/HasOrderCountCondition.php | 17 +- .../HasTotalOrderAmountCondition.php | 17 +- .../Condition/IsCustomerSinceCondition.php | 17 +- .../Condition/IsInCustomerGroupCondition.php | 17 +- .../IsNotInCustomerGroupCondition.php | 17 +- .../NotOrderedInLastDaysCondition.php | 17 +- .../Condition/NotOrderedInShopCondition.php | 17 +- .../Condition/NotOrderedProductCondition.php | 17 +- .../NotOrderedProductOfCategoryCondition.php | 17 +- ...tOrderedProductOfManufacturerCondition.php | 17 +- .../NotOrderedWithDeliveryCondition.php | 17 +- .../NotOrderedWithPaymentCondition.php | 17 +- .../NotRegisteredInShopCondition.php | 17 +- .../Condition/NotSalutationCondition.php | 17 +- .../Condition/OrderedAtWeekdayCondition.php | 17 +- .../Condition/OrderedInLastDaysCondition.php | 17 +- .../Condition/OrderedInShopCondition.php | 17 +- .../Condition/OrderedOnDeviceCondition.php | 17 +- .../Condition/OrderedProductCondition.php | 17 +- .../OrderedProductOfCategoryCondition.php | 17 +- .../OrderedProductOfManufacturerCondition.php | 17 +- .../OrderedWithDeliveryCondition.php | 17 +- .../Condition/OrderedWithPaymentCondition.php | 17 +- .../Condition/RegisteredInShopCondition.php | 17 +- .../Condition/SalutationCondition.php | 17 +- .../CustomerNumberSearchInterface.php | 17 +- .../CustomerNumberSearchResult.php | 17 +- .../Sorting/AgeSorting.php | 17 +- .../Sorting/AverageAmountSorting.php | 17 +- .../Sorting/AverageProductAmountSorting.php | 17 +- .../Sorting/CitySorting.php | 17 +- .../Sorting/CustomerGroupSorting.php | 17 +- .../Sorting/CustomerSinceSorting.php | 17 +- .../Sorting/LastNameSorting.php | 17 +- .../Sorting/LastOrderSorting.php | 17 +- .../Sorting/NumberSorting.php | 17 +- .../Sorting/OrderCountSorting.php | 17 +- .../Sorting/StreetNameSorting.php | 17 +- .../Sorting/TotalAmountSorting.php | 17 +- .../Sorting/ZipCodeSorting.php | 17 +- .../Commands/SearchIndexPopulateCommand.php | 17 +- .../AccountModeConditionHandler.php | 17 +- .../ConditionHandler/AgeConditionHandler.php | 17 +- .../AssignedToStreamConditionHandler.php | 17 +- .../CustomerAttributeConditionHandler.php | 17 +- .../HasAddressWithCountryConditionHandler.php | 17 +- .../HasCanceledOrdersConditionHandler.php | 17 +- ...NewsletterRegistrationConditionHandler.php | 17 +- ...asNoAddressWithCountryConditionHandler.php | 17 +- .../HasNoCanceledOrdersConditionHandler.php | 17 +- ...NewsletterRegistrationConditionHandler.php | 17 +- .../HasOrderCountConditionHandler.php | 17 +- .../HasTotalOrderAmountConditionHandler.php | 17 +- .../IsCustomerSinceConditionHandler.php | 17 +- .../IsInCustomerGroupConditionHandler.php | 17 +- .../IsNotInCustomerGroupConditionHandler.php | 17 +- .../NotOrderedInLastDaysConditionHandler.php | 17 +- .../NotOrderedInShopConditionHandler.php | 17 +- .../NotOrderedProductConditionHandler.php | 17 +- ...deredProductOfCategoryConditionHandler.php | 17 +- ...dProductOfManufacturerConditionHandler.php | 17 +- ...NotOrderedWithDeliveryConditionHandler.php | 17 +- .../NotOrderedWithPaymentConditionHandler.php | 17 +- .../NotRegisteredInShopConditionHandler.php | 17 +- .../NotSalutationConditionHandler.php | 17 +- .../OrderedAtWeekdayConditionHandler.php | 17 +- .../OrderedInLastDaysConditionHandler.php | 17 +- .../OrderedInShopConditionHandler.php | 17 +- .../OrderedOnDeviceConditionHandler.php | 17 +- .../OrderedProductConditionHandler.php | 17 +- ...deredProductOfCategoryConditionHandler.php | 17 +- ...dProductOfManufacturerConditionHandler.php | 17 +- .../OrderedWithDeliveryConditionHandler.php | 17 +- .../OrderedWithPaymentConditionHandler.php | 17 +- .../RegisteredInShopConditionHandler.php | 17 +- .../SalutationConditionHandler.php | 17 +- .../SearchTermConditionHandler.php | 17 +- .../ConditionHandlerInterface.php | 17 +- .../CustomerNumberSearch.php | 17 +- .../CustomerSearchBundleDBALBundle.php | 17 +- .../HandlerRegistry.php | 17 +- .../Indexing/AnalyzedCustomer.php | 17 +- .../Indexing/CronJobProgressHelper.php | 17 +- .../Indexing/CronJobSubscriber.php | 17 +- .../Indexing/CustomerOrder.php | 17 +- .../Indexing/CustomerOrderGateway.php | 17 +- .../Indexing/CustomerOrderHydrator.php | 17 +- .../Indexing/CustomerProvider.php | 17 +- .../Indexing/CustomerProviderInterface.php | 17 +- .../Indexing/SearchIndexer.php | 17 +- .../Indexing/SearchIndexerInterface.php | 17 +- .../SortingHandler/AgeSortingHandler.php | 17 +- .../AverageAmountSortingHandler.php | 17 +- .../AverageProductAmountSortingHandler.php | 17 +- .../SortingHandler/CitySortingHandler.php | 17 +- .../CustomerGroupSortingHandler.php | 17 +- .../CustomerSinceSortingHandler.php | 17 +- .../SortingHandler/LastNameSortingHandler.php | 17 +- .../LastOrderSortingHandler.php | 17 +- .../SortingHandler/NumberSortingHandler.php | 17 +- .../OrderCountSortingHandler.php | 17 +- .../StreetNameSortingHandler.php | 17 +- .../TotalAmountSortingHandler.php | 17 +- .../SortingHandler/ZipCodeSortingHandler.php | 17 +- .../SortingHandlerInterface.php | 17 +- .../ESIndexingBundle/BacklogProcessor.php | 17 +- .../BacklogProcessorInterface.php | 17 +- .../Bundle/ESIndexingBundle/BacklogReader.php | 17 +- .../BacklogReaderInterface.php | 17 +- .../Bundle/ESIndexingBundle/ClientFactory.php | 17 +- .../Commands/AnalyzeCommand.php | 17 +- .../Commands/BacklogClearCommand.php | 17 +- .../Commands/BacklogSyncCommand.php | 17 +- .../Commands/IndexCleanupCommand.php | 17 +- .../Commands/IndexPopulateCommand.php | 17 +- .../Commands/SwitchAliasCommand.php | 17 +- .../Console/ConsoleEvaluationHelper.php | 17 +- .../Console/ConsoleProgressHelper.php | 17 +- .../Console/EvaluationHelperInterface.php | 17 +- .../Console/ProgressHelperInterface.php | 17 +- .../ESIndexingBundle/DataIndexerInterface.php | 17 +- .../CompilerPass/VersionCompilerPass.php | 17 +- .../Factory/ShopIndexerFactory.php | 17 +- .../Factory/TextMappingFactory.php | 17 +- .../ESIndexingBundle/ESIndexingBundle.php | 17 +- .../ESIndexingBundle/EsClientBuilder.php | 17 +- .../ESIndexingBundle/EsClientInterface.php | 17 +- .../ESIndexingBundle/EsClientLogger.php | 17 +- .../Bundle/ESIndexingBundle/EsSearch.php | 17 +- .../Bundle/ESIndexingBundle/FieldMapping.php | 17 +- .../FieldMappingInterface.php | 17 +- .../ESIndexingBundle/IdentifierSelector.php | 17 +- .../Bundle/ESIndexingBundle/IndexFactory.php | 17 +- .../IndexFactoryInterface.php | 17 +- .../Bundle/ESIndexingBundle/LastIdQuery.php | 17 +- .../ESIndexingBundle/MappingInterface.php | 17 +- .../Product/ProductConfigurationLoader.php | 17 +- .../Product/ProductIndexer.php | 17 +- .../Product/ProductListingVariationLoader.php | 17 +- .../Product/ProductManualPositionLoader.php | 17 +- .../ProductManualPositionLoaderInterface.php | 17 +- .../Product/ProductMapping.php | 17 +- .../Product/ProductProvider.php | 17 +- .../Product/ProductQueryFactory.php | 17 +- .../Product/ProductQueryFactoryInterface.php | 17 +- .../Product/ProductSynchronizer.php | 17 +- .../Property/PropertyIndexer.php | 17 +- .../Property/PropertyMapping.php | 17 +- .../Property/PropertyProvider.php | 17 +- .../Property/PropertyQueryFactory.php | 17 +- .../Property/PropertySynchronizer.php | 17 +- .../ESIndexingBundle/ProviderInterface.php | 17 +- .../ESIndexingBundle/SettingsInterface.php | 17 +- .../Bundle/ESIndexingBundle/ShopAnalyzer.php | 17 +- .../ShopAnalyzerInterface.php | 17 +- .../Bundle/ESIndexingBundle/ShopIndexer.php | 17 +- .../ESIndexingBundle/ShopIndexerInterface.php | 17 +- .../ESIndexingBundle/Struct/Backlog.php | 17 +- .../Struct/IndexConfiguration.php | 17 +- .../ESIndexingBundle/Struct/Product.php | 17 +- .../ESIndexingBundle/Struct/ShopIndex.php | 17 +- .../Subscriber/DomainBacklogSubscriber.php | 17 +- .../Subscriber/ORMBacklogSaveSubscriber.php | 17 +- .../Subscriber/ORMBacklogSubscriber.php | 17 +- .../SynchronizerInterface.php | 17 +- .../TextMapping/TextMappingES6.php | 17 +- .../ESIndexingBundle/TextMappingInterface.php | 17 +- .../ArticleComponentHandler.php | 17 +- .../ArticleSliderComponentHandler.php | 17 +- .../BannerComponentHandler.php | 17 +- .../BannerSliderComponentHandler.php | 17 +- .../ComponentHandler/BlogComponentHandler.php | 17 +- .../CategoryTeaserComponentHandler.php | 17 +- .../ComponentHandlerInterface.php | 17 +- .../ContentTypeComponentHandler.php | 17 +- .../EventComponentHandler.php | 17 +- .../Html5VideoComponentHandler.php | 17 +- .../HtmlCodeComponentHandler.php | 17 +- .../HtmlElementComponentHandler.php | 17 +- .../IFrameComponentHandler.php | 17 +- .../ManufacturerSliderComponentHandler.php | 17 +- .../YoutubeComponentHandler.php | 17 +- .../EmotionCompilerPass.php | 17 +- .../Bundle/EmotionBundle/EmotionBundle.php | 17 +- .../ComponentHandlerNotFoundException.php | 17 +- .../Service/DataCollectionResolver.php | 17 +- .../DataCollectionResolverInterface.php | 17 +- .../Service/EmotionElementService.php | 17 +- .../EmotionElementServiceInterface.php | 17 +- .../EmotionBundle/Service/EmotionService.php | 17 +- .../Service/EmotionServiceInterface.php | 17 +- .../Service/Gateway/EmotionElementGateway.php | 17 +- .../Service/Gateway/EmotionGateway.php | 17 +- .../Hydrator/EmotionElementHydrator.php | 17 +- .../Gateway/Hydrator/EmotionHydrator.php | 17 +- .../StoreFrontEmotionDeviceConfiguration.php | 17 +- ...ontEmotionDeviceConfigurationInterface.php | 17 +- .../EmotionBundle/Service/StructConverter.php | 17 +- .../Collection/PrepareDataCollection.php | 17 +- .../Collection/ResolvedDataCollection.php | 17 +- .../Bundle/EmotionBundle/Struct/Element.php | 17 +- .../EmotionBundle/Struct/ElementConfig.php | 17 +- .../EmotionBundle/Struct/ElementData.php | 17 +- .../EmotionBundle/Struct/ElementViewport.php | 17 +- .../Bundle/EmotionBundle/Struct/Emotion.php | 17 +- .../EmotionBundle/Struct/EmotionTemplate.php | 17 +- .../Struct/Library/Component.php | 17 +- .../Bundle/EsBackendBundle/BacklogService.php | 17 +- .../BacklogServiceInterface.php | 17 +- .../Commands/ClearBacklogCommand.php | 17 +- .../Commands/IndexCleanupCommand.php | 17 +- .../Commands/IndexPopulateCommand.php | 17 +- .../Commands/SyncBacklogCommand.php | 17 +- .../EsBackendBundle/EsAwareRepository.php | 17 +- .../EsBackendBundle/EsAwareSearcher.php | 17 +- .../EsBackendBundle/EsBackendBundle.php | 17 +- .../EsBackendBundle/EsBackendIndexer.php | 17 +- .../Bundle/EsBackendBundle/IndexFactory.php | 17 +- .../EsBackendBundle/IndexFactoryInterface.php | 17 +- .../EsBackendBundle/SearchQueryBuilder.php | 17 +- .../Searcher/CustomerSearcher.php | 17 +- .../Searcher/GenericSearcher.php | 17 +- .../Searcher/OrderSearcher.php | 17 +- .../Searcher/ProductSearcher.php | 17 +- .../Bundle/EsBackendBundle/Struct/Backlog.php | 17 +- .../Subscriber/DomainBacklogSubscriber.php | 17 +- .../Subscriber/OrmBacklogSubscriber.php | 17 +- .../Bundle/FormBundle/Constraints/Exists.php | 17 +- .../Constraints/ExistsValidator.php | 17 +- .../Bundle/FormBundle/Constraints/Unique.php | 17 +- .../Constraints/UniqueValidator.php | 17 +- .../AddConstraintValidatorsPass.php | 17 +- .../Factory/ConstraintValidatorFactory.php | 17 +- .../FormBundle/Extension/EventExtension.php | 17 +- .../Shopware/Bundle/FormBundle/FormBundle.php | 17 +- .../Bundle/FormBundle/FormFactory.php | 17 +- .../FormBundle/StringRendererService.php | 17 +- .../StringRendererServiceInterface.php | 18 +- .../Transformer/EntityTransformer.php | 17 +- .../MailBundle/AutoCompleteResolver.php | 17 +- .../AutocompleteResolver/AbstractResolver.php | 17 +- .../AutocompleteResolver/ForeachResolver.php | 17 +- .../ResolverInterface.php | 17 +- .../ShortForeachResolver.php | 17 +- .../Controllers/Backend/MailLog.php | 17 +- .../Controllers/Backend/MailLogContact.php | 17 +- .../MailLogCleanupCronSubscriber.php | 17 +- .../EventListener/MailSubscriber.php | 17 +- .../EventListener/TerminationSubscriber.php | 17 +- .../Shopware/Bundle/MailBundle/MailBundle.php | 17 +- .../Filter/AdministrativeMailFilter.php | 17 +- .../Filter/AssociationExistsFilter.php | 17 +- .../Service/Filter/MailFilterInterface.php | 17 +- .../Service/Filter/NewsletterMailFilter.php | 17 +- .../MailBundle/Service/LogEntryBuilder.php | 17 +- .../Service/LogEntryBuilderInterface.php | 17 +- .../Service/LogEntryMailBuilder.php | 17 +- .../Service/LogEntryMailBuilderInterface.php | 17 +- .../Bundle/MailBundle/Service/LogService.php | 17 +- .../Service/LogServiceInterface.php | 17 +- .../Adapters/AdapterFactoryInterface.php | 17 +- .../MediaBundle/Adapters/AwsS3v3Factory.php | 17 +- .../Adapters/FtpAdapterFactory.php | 17 +- .../Adapters/GoogleStorageFactory.php | 17 +- .../Adapters/LocalAdapterFactory.php | 17 +- .../MediaBundle/CacheOptimizerService.php | 17 +- .../MediaBundle/CdnOptimizerService.php | 17 +- .../Commands/ImageMigrateCommand.php | 17 +- .../Commands/MediaCleanupCommand.php | 17 +- .../Commands/MediaOptimizeCommand.php | 17 +- ...diaFileExtensionIsBlacklistedException.php | 17 +- .../MediaFileExtensionNotAllowedException.php | 17 +- .../Exception/OptimizerNotFoundException.php | 17 +- .../WrongMediaTypeForReplaceException.php | 17 +- .../Bundle/MediaBundle/GarbageCollector.php | 17 +- .../MediaBundle/GarbageCollectorFactory.php | 17 +- .../Bundle/MediaBundle/MediaBundle.php | 17 +- .../MediaExtensionMappingService.php | 17 +- .../MediaExtensionMappingServiceInterface.php | 17 +- .../Bundle/MediaBundle/MediaMigration.php | 17 +- .../MediaBundle/MediaReplaceService.php | 17 +- .../MediaReplaceServiceInterface.php | 17 +- .../Bundle/MediaBundle/MediaService.php | 17 +- .../MediaBundle/MediaServiceFactory.php | 17 +- .../MediaBundle/MediaServiceInterface.php | 17 +- .../MediaBundle/Optimizer/BinaryOptimizer.php | 17 +- .../Optimizer/GuetzliOptimizer.php | 17 +- .../Optimizer/JpegoptimOptimizer.php | 17 +- .../Optimizer/JpegtranOptimizer.php | 17 +- .../Optimizer/OptimizerInterface.php | 17 +- .../Optimizer/OptipngOptimizer.php | 17 +- .../Optimizer/PngcrushOptimizer.php | 17 +- .../MediaBundle/Optimizer/PngoutOptimizer.php | 17 +- .../Bundle/MediaBundle/OptimizerService.php | 17 +- .../MediaBundle/OptimizerServiceInterface.php | 17 +- .../MediaBundle/Strategy/Md5Strategy.php | 17 +- .../MediaBundle/Strategy/PlainStrategy.php | 17 +- .../MediaBundle/Strategy/StrategyFactory.php | 17 +- .../Strategy/StrategyInterface.php | 17 +- .../MediaBundle/Struct/MediaPosition.php | 17 +- .../Subscriber/ServiceSubscriber.php | 17 +- .../Bundle/OrderBundle/OrderBundle.php | 17 +- .../Service/CalculationService.php | 17 +- .../Service/CalculationServiceInterface.php | 17 +- ...iderInactiveProductsListProductGateway.php | 17 +- .../Service/OrderListProductService.php | 17 +- .../OrderListProductServiceInterface.php | 17 +- .../Service/ShippingCostService.php | 17 +- .../Service/ShippingCostServiceInterface.php | 17 +- .../OrderBundle/Service/StockService.php | 17 +- .../Service/StockServiceInterface.php | 17 +- .../OrderRecalculationSubscriber.php | 17 +- .../Subscriber/ProductStockSubscriber.php | 17 +- .../Context/BaseRequest.php | 17 +- .../Context/DownloadRequest.php | 17 +- .../Context/LicenceRequest.php | 17 +- .../Context/ListingRequest.php | 17 +- .../Context/MetaRequest.php | 17 +- .../Context/OrderRequest.php | 17 +- .../Context/PluginLicenceRequest.php | 17 +- .../Context/PluginsByTechnicalNameRequest.php | 17 +- .../Context/RangeDownloadRequest.php | 17 +- .../Context/UpdateLicencesRequest.php | 17 +- .../Context/UpdateListingRequest.php | 17 +- .../Events/PluginEvent.php | 17 +- .../Events/PostPluginActivateEvent.php | 17 +- .../Events/PostPluginDeactivateEvent.php | 17 +- .../Events/PostPluginInstallEvent.php | 17 +- .../Events/PostPluginUninstallEvent.php | 17 +- .../Events/PostPluginUpdateEvent.php | 17 +- .../Events/PrePluginActivateEvent.php | 17 +- .../Events/PrePluginDeactivateEvent.php | 17 +- .../Events/PrePluginInstallEvent.php | 17 +- .../Events/PrePluginUninstallEvent.php | 17 +- .../Events/PrePluginUpdateEvent.php | 17 +- .../Exception/AccountException.php | 17 +- .../Exception/AuthenticationException.php | 17 +- .../Exception/DomainVerificationException.php | 17 +- .../Exception/LicenceException.php | 17 +- ...issingDoubleOptInConfirmationException.php | 17 +- .../Exception/MissingMasterDataException.php | 17 +- .../Exception/OrderException.php | 17 +- .../Exception/SbpServerException.php | 17 +- .../Exception/ShopNotFoundException.php | 17 +- .../Exception/ShopSecretException.php | 17 +- .../Exception/StoreException.php | 17 +- .../PluginInstallerBundle.php | 17 +- .../Service/AccountManagerService.php | 17 +- .../Service/DownloadService.php | 17 +- .../FirstRunWizardPluginStoreService.php | 17 +- .../Service/InstallerService.php | 17 +- .../Service/LegacyPluginExtractor.php | 17 +- .../Service/LegacyPluginInstaller.php | 17 +- .../Service/PluginCategoryService.php | 17 +- .../Service/PluginExtractor.php | 17 +- .../Service/PluginInitializer.php | 17 +- .../Service/PluginInstaller.php | 17 +- .../Service/PluginLicenceService.php | 17 +- .../Service/PluginLocalService.php | 17 +- .../Service/PluginStoreService.php | 17 +- .../Service/PluginViewService.php | 17 +- .../Service/PluginZipDetector.php | 17 +- .../Service/StoreOrderService.php | 17 +- .../Service/SubscriptionService.php | 17 +- .../UniqueIdGenerator/UniqueIdGenerator.php | 17 +- .../Service/UniqueIdGeneratorInterface.php | 17 +- .../Service/ZipUtils.php | 17 +- .../PluginInstallerBundle/StoreClient.php | 17 +- .../Struct/AccessTokenStruct.php | 17 +- .../Struct/AddressStruct.php | 17 +- .../Struct/BasketPositionStruct.php | 17 +- .../Struct/BasketStruct.php | 17 +- .../Struct/CategoryStruct.php | 17 +- .../Struct/CommentStruct.php | 17 +- .../Struct/DomainStruct.php | 18 +- .../Struct/LicenceStruct.php | 17 +- .../Struct/ListingResultStruct.php | 17 +- .../Struct/LocaleStruct.php | 17 +- .../Struct/MetaStruct.php | 17 +- .../Struct/PictureStruct.php | 17 +- .../Struct/PluginInformationResultStruct.php | 17 +- .../Struct/PluginInformationStruct.php | 17 +- .../Struct/PluginStruct.php | 17 +- .../Struct/PriceStruct.php | 17 +- .../Struct/ProducerStruct.php | 17 +- .../Struct/StructHydrator.php | 17 +- .../Struct/SubscriptionStateStruct.php | 17 +- .../Struct/UpdateResultStruct.php | 17 +- .../SearchBundle/BatchProductNumberSearch.php | 17 +- .../BatchProductNumberSearchRequest.php | 17 +- .../BatchProductNumberSearchResult.php | 17 +- .../SearchBundle/BatchProductSearch.php | 17 +- .../SearchBundle/BatchProductSearchResult.php | 17 +- .../Condition/CategoryCondition.php | 17 +- .../Condition/CloseoutCondition.php | 17 +- .../Condition/CombinedCondition.php | 17 +- .../Condition/CreateDateCondition.php | 17 +- .../Condition/CustomerGroupCondition.php | 17 +- .../Condition/HasPseudoPriceCondition.php | 17 +- .../Condition/HeightCondition.php | 17 +- .../Condition/ImmediateDeliveryCondition.php | 17 +- .../Condition/IsAvailableCondition.php | 17 +- .../SearchBundle/Condition/IsNewCondition.php | 17 +- .../Condition/LastProductIdCondition.php | 17 +- .../Condition/LengthCondition.php | 17 +- .../Condition/MainVariantCondition.php | 17 +- .../Condition/ManufacturerCondition.php | 17 +- .../Condition/OrdernumberCondition.php | 17 +- .../SearchBundle/Condition/PriceCondition.php | 17 +- .../Condition/ProductAttributeCondition.php | 17 +- .../Condition/ProductIdCondition.php | 17 +- .../Condition/PropertyCondition.php | 17 +- .../Condition/ReleaseDateCondition.php | 17 +- .../SearchBundle/Condition/SalesCondition.php | 17 +- .../Condition/SearchTermCondition.php | 17 +- .../Condition/ShippingFreeCondition.php | 17 +- .../Condition/SimilarProductCondition.php | 17 +- .../Condition/SimpleCondition.php | 17 +- .../Condition/VariantCondition.php | 17 +- .../Condition/VoteAverageCondition.php | 17 +- .../Condition/WeightCondition.php | 17 +- .../SearchBundle/Condition/WidthCondition.php | 17 +- .../SearchBundle/ConditionInterface.php | 17 +- .../Shopware/Bundle/SearchBundle/Criteria.php | 17 +- .../SearchBundle/CriteriaPartInterface.php | 17 +- .../CoreCriteriaRequestHandler.php | 17 +- .../FacetCriteriaRequestHandler.php | 17 +- .../PropertyCriteriaRequestHandler.php | 17 +- .../SortingCriteriaRequestHandler.php | 17 +- .../VariantCriteriaRequestHandler.php | 17 +- .../CriteriaRequestHandlerInterface.php | 17 +- .../SearchBundle/Facet/CategoryFacet.php | 17 +- .../Facet/CombinedConditionFacet.php | 17 +- .../Bundle/SearchBundle/Facet/HeightFacet.php | 17 +- .../Facet/ImmediateDeliveryFacet.php | 17 +- .../Bundle/SearchBundle/Facet/LengthFacet.php | 17 +- .../SearchBundle/Facet/ManufacturerFacet.php | 17 +- .../Bundle/SearchBundle/Facet/PriceFacet.php | 17 +- .../Facet/ProductAttributeFacet.php | 17 +- .../SearchBundle/Facet/PropertyFacet.php | 17 +- .../SearchBundle/Facet/ShippingFreeFacet.php | 17 +- .../Bundle/SearchBundle/Facet/SimpleFacet.php | 17 +- .../SearchBundle/Facet/VariantFacet.php | 17 +- .../SearchBundle/Facet/VoteAverageFacet.php | 17 +- .../Bundle/SearchBundle/Facet/WeightFacet.php | 17 +- .../Bundle/SearchBundle/Facet/WidthFacet.php | 17 +- .../Bundle/SearchBundle/FacetInterface.php | 17 +- .../FacetResult/BooleanFacetResult.php | 17 +- .../CategoryTreeFacetResultBuilder.php | 17 +- .../FacetResult/FacetResultGroup.php | 17 +- .../FacetResult/MediaListFacetResult.php | 17 +- .../FacetResult/MediaListItem.php | 17 +- .../FacetResult/RadioFacetResult.php | 17 +- .../FacetResult/RangeFacetResult.php | 17 +- .../FacetResult/TreeFacetResult.php | 17 +- .../SearchBundle/FacetResult/TreeItem.php | 17 +- .../FacetResult/ValueListFacetResult.php | 17 +- .../FacetResult/ValueListItem.php | 17 +- .../SearchBundle/FacetResultInterface.php | 17 +- .../ProductNumberSearchInterface.php | 17 +- .../ProductNumberSearchResult.php | 17 +- .../Bundle/SearchBundle/ProductSearch.php | 17 +- .../SearchBundle/ProductSearchInterface.php | 17 +- .../SearchBundle/ProductSearchResult.php | 17 +- .../Bundle/SearchBundle/SearchBundle.php | 17 +- .../SearchBundle/SearchTermPreProcessor.php | 17 +- .../SearchTermPreProcessorInterface.php | 17 +- .../SearchBundle/Sorting/ManualSorting.php | 17 +- .../Sorting/PopularitySorting.php | 17 +- .../SearchBundle/Sorting/PriceSorting.php | 17 +- .../Sorting/ProductAttributeSorting.php | 17 +- .../Sorting/ProductNameSorting.php | 17 +- .../Sorting/ProductNumberSorting.php | 17 +- .../Sorting/ProductStockSorting.php | 17 +- .../SearchBundle/Sorting/RandomSorting.php | 17 +- .../Sorting/ReleaseDateSorting.php | 17 +- .../Sorting/SearchRankingSorting.php | 17 +- .../SearchBundle/Sorting/SimpleSorting.php | 17 +- .../Bundle/SearchBundle/Sorting/Sorting.php | 17 +- .../Bundle/SearchBundle/SortingInterface.php | 17 +- .../StoreFrontCriteriaFactory.php | 17 +- .../StoreFrontCriteriaFactoryInterface.php | 17 +- .../SearchBundle/TemplateSwitchable.php | 17 +- .../Bundle/SearchBundle/VariantSearch.php | 17 +- .../CategoryConditionHandler.php | 17 +- .../CloseoutConditionHandler.php | 17 +- .../CombinedConditionHandler.php | 17 +- .../CreateDateConditionHandler.php | 17 +- .../CustomerGroupConditionHandler.php | 17 +- .../DynamicConditionParserTrait.php | 17 +- .../HasPseudoPriceConditionHandler.php | 17 +- .../HeightConditionHandler.php | 17 +- .../ImmediateDeliveryConditionHandler.php | 17 +- .../IsAvailableConditionHandler.php | 17 +- .../IsNewConditionHandler.php | 17 +- .../LastProductIdConditionHandler.php | 17 +- .../LengthConditionHandler.php | 17 +- .../ManufacturerConditionHandler.php | 17 +- .../OrdernumberConditionHandler.php | 17 +- .../PriceConditionHandler.php | 17 +- .../ProductAttributeConditionHandler.php | 17 +- .../ProductIdConditionHandler.php | 17 +- .../PropertyConditionHandler.php | 17 +- .../ReleaseDateConditionHandler.php | 17 +- .../SalesConditionHandler.php | 17 +- .../SearchTermConditionHandler.php | 17 +- .../ShippingFreeConditionHandler.php | 17 +- .../SimilarProductConditionHandler.php | 17 +- .../VariantConditionHandler.php | 17 +- .../VoteAverageConditionHandler.php | 17 +- .../WeightConditionHandler.php | 17 +- .../WidthConditionHandler.php | 17 +- .../ConditionHandlerInterface.php | 17 +- .../CriteriaAwareInterface.php | 17 +- .../Compiler/DBALHandlerCompilerPass.php | 17 +- .../FacetHandler/CategoryFacetHandler.php | 17 +- .../CombinedConditionFacetHandler.php | 17 +- .../ImmediateDeliveryFacetHandler.php | 17 +- .../FacetHandler/ManufacturerFacetHandler.php | 17 +- .../FacetHandler/PriceFacetHandler.php | 17 +- .../ProductAttributeFacetHandler.php | 17 +- .../ProductDimensionsFacetHandler.php | 17 +- .../FacetHandler/PropertyFacetHandler.php | 17 +- .../FacetHandler/ShippingFreeFacetHandler.php | 17 +- .../FacetHandler/VariantFacetHandler.php | 17 +- .../FacetHandler/VoteAverageFacetHandler.php | 17 +- .../FacetHandlerInterface.php | 17 +- .../KeywordFinderInterface.php | 17 +- .../SearchBundleDBAL/ListingPriceHelper.php | 17 +- .../SearchBundleDBAL/ListingPriceSwitcher.php | 17 +- .../SearchBundleDBAL/ListingPriceTable.php | 17 +- .../ListingPriceTableInterface.php | 17 +- .../PartialFacetHandlerInterface.php | 17 +- .../Bundle/SearchBundleDBAL/PriceHelper.php | 17 +- .../SearchBundleDBAL/PriceHelperInterface.php | 17 +- .../SearchBundleDBAL/ProductNumberSearch.php | 17 +- .../Bundle/SearchBundleDBAL/QueryBuilder.php | 17 +- .../SearchBundleDBAL/QueryBuilderFactory.php | 17 +- .../QueryBuilderFactoryInterface.php | 17 +- .../SearchBundleDBAL/SearchBundleDBAL.php | 17 +- .../SearchBundleDBALSubscriber.php | 17 +- .../SearchTerm/CacheKeywordFinder.php | 17 +- .../SearchBundleDBAL/SearchTerm/Keyword.php | 17 +- .../SearchTerm/KeywordFinder.php | 17 +- .../SearchTerm/SearchIndexer.php | 17 +- .../SearchTerm/SearchIndexerInterface.php | 17 +- .../SearchTerm/SearchTermLogger.php | 17 +- .../SearchTerm/SearchTermLoggerInterface.php | 17 +- .../SearchTerm/SearchTermQueryBuilder.php | 17 +- .../SearchTerm/TermHelper.php | 17 +- .../SearchTerm/TermHelperInterface.php | 17 +- .../SearchTermQueryBuilderInterface.php | 17 +- .../SortingHandler/ManualSortingHandler.php | 17 +- .../PopularitySortingHandler.php | 17 +- .../SortingHandler/PriceSortingHandler.php | 17 +- .../ProductAttributeSortingHandler.php | 17 +- .../ProductNameSortingHandler.php | 17 +- .../ProductNumberSortingHandler.php | 17 +- .../ProductStockSortingHandler.php | 17 +- .../SortingHandler/RandomSortingHandler.php | 17 +- .../ReleaseDateSortingHandler.php | 17 +- .../SearchRankingSortingHandler.php | 17 +- .../SortingHandlerInterface.php | 17 +- .../Bundle/SearchBundleDBAL/VariantHelper.php | 17 +- .../VariantHelperInterface.php | 17 +- .../CombinedConditionQueryBuilder.php | 17 +- .../CategoryConditionHandler.php | 17 +- .../CloseoutConditionHandler.php | 17 +- .../CombinedConditionHandler.php | 17 +- .../CreateDateConditionHandler.php | 17 +- .../CustomerGroupConditionHandler.php | 17 +- .../HasPseudoPriceConditionHandler.php | 17 +- .../HeightConditionHandler.php | 17 +- .../ImmediateDeliveryConditionHandler.php | 17 +- .../IsAvailableConditionHandler.php | 17 +- .../IsNewConditionHandler.php | 17 +- .../LastProductIdConditionHandler.php | 17 +- .../LengthConditionHandler.php | 17 +- .../MainVariantConditionHandler.php | 17 +- .../ManufacturerConditionHandler.php | 17 +- .../OrdernumberConditionHandler.php | 17 +- .../PriceConditionHandler.php | 17 +- .../ProductAttributeConditionHandler.php | 17 +- .../ProductIdConditionHandler.php | 17 +- .../PropertyConditionHandler.php | 17 +- .../ReleaseDateConditionHandler.php | 17 +- .../SalesConditionHandler.php | 17 +- .../SearchTermConditionHandler.php | 17 +- .../ShippingFreeConditionHandler.php | 17 +- .../SimilarProductConditionHandler.php | 17 +- .../VariantConditionHandler.php | 17 +- .../VoteAverageConditionHandler.php | 17 +- .../WeightConditionHandler.php | 17 +- .../WidthConditionHandler.php | 17 +- .../Compiler/ESHandlerCompilerPass.php | 17 +- .../FacetHandler/CategoryFacetHandler.php | 17 +- .../CombinedConditionFacetHandler.php | 17 +- .../ImmediateDeliveryFacetHandler.php | 17 +- .../FacetHandler/ManufacturerFacetHandler.php | 17 +- .../FacetHandler/PriceFacetHandler.php | 17 +- .../ProductAttributeFacetHandler.php | 17 +- .../ProductDimensionsFacetHandler.php | 17 +- .../FacetHandler/PropertyFacetHandler.php | 17 +- .../FacetHandler/ShippingFreeFacetHandler.php | 17 +- .../FacetHandler/VariantFacetHandler.php | 17 +- .../FacetHandler/VoteAverageFacetHandler.php | 17 +- .../SearchBundleES/HandlerInterface.php | 17 +- .../Bundle/SearchBundleES/HandlerRegistry.php | 17 +- .../PartialConditionHandlerInterface.php | 17 +- .../SearchBundleES/PriceFieldMapper.php | 17 +- .../SearchBundleES/ProductNumberSearch.php | 18 +- .../ResultHydratorInterface.php | 17 +- .../Bundle/SearchBundleES/SearchBundleES.php | 17 +- .../SearchBundleES/SearchTermQueryBuilder.php | 17 +- .../SearchTermQueryBuilderInterface.php | 17 +- .../SortingHandler/ManualSortingHandler.php | 17 +- .../PopularitySortingHandler.php | 17 +- .../SortingHandler/PriceSortingHandler.php | 17 +- .../ProductAttributeSortingHandler.php | 17 +- .../ProductNameSortingHandler.php | 17 +- .../ProductNumberSortingHandler.php | 17 +- .../ProductStockSortingHandler.php | 17 +- .../SortingHandler/RandomSortingHandler.php | 17 +- .../ReleaseDateSortingHandler.php | 17 +- .../SearchRankingSortingHandler.php | 17 +- .../Bundle/SearchBundleES/StructHydrator.php | 17 +- .../Subscriber/ServiceSubscriber.php | 17 +- .../Bundle/SearchBundleES/VariantSearch.php | 17 +- .../Commands/SitemapGenerateCommand.php | 17 +- .../ConfigHandler/ConfigHandlerInterface.php | 17 +- .../SitemapBundle/ConfigHandler/Database.php | 17 +- .../SitemapBundle/ConfigHandler/File.php | 17 +- .../Controller/Frontend/SitemapIndexXml.php | 17 +- .../SitemapCompilerPass.php | 17 +- .../Exception/AlreadyLockedException.php | 17 +- .../Exception/UnknownFileException.php | 17 +- .../Provider/BaseUrlProvider.php | 17 +- .../Provider/BlogUrlProvider.php | 17 +- .../Provider/CategoryUrlProvider.php | 17 +- .../Provider/CustomUrlProvider.php | 17 +- .../Provider/LandingPageUrlProvider.php | 17 +- .../Provider/ManufacturerUrlProvider.php | 17 +- .../Provider/ProductUrlProvider.php | 17 +- .../Provider/StaticUrlProvider.php | 17 +- .../SitemapBundle/Service/ConfigHandler.php | 17 +- .../Service/FilterContainerFactory.php | 17 +- .../SitemapBundle/Service/LinkFilter.php | 17 +- .../SitemapBundle/Service/SitemapExporter.php | 17 +- .../SitemapBundle/Service/SitemapLister.php | 17 +- .../SitemapBundle/Service/SitemapLock.php | 17 +- .../Service/SitemapNameGenerator.php | 17 +- .../SitemapBundle/Service/SitemapWriter.php | 17 +- .../SitemapBundle/Service/UrlFilter.php | 17 +- .../Bundle/SitemapBundle/SitemapBundle.php | 17 +- .../SitemapExporterInterface.php | 17 +- .../SitemapBundle/SitemapListerInterface.php | 17 +- .../SitemapBundle/SitemapLockInterface.php | 17 +- .../SitemapNameGeneratorInterface.php | 17 +- .../SitemapBundle/SitemapWriterInterface.php | 17 +- .../SitemapBundle/Struct/FilterContainer.php | 17 +- .../Bundle/SitemapBundle/Struct/Sitemap.php | 17 +- .../Bundle/SitemapBundle/Struct/Url.php | 17 +- .../Subscriber/CronjobSubscriber.php | 17 +- .../Bundle/SitemapBundle/UrlFilter/Base.php | 17 +- .../Bundle/SitemapBundle/UrlFilter/Blog.php | 17 +- .../SitemapBundle/UrlFilter/Category.php | 17 +- .../UrlFilter/FilterInterface.php | 17 +- .../SitemapBundle/UrlFilter/LandingPage.php | 17 +- .../SitemapBundle/UrlFilter/Manufacturer.php | 17 +- .../SitemapBundle/UrlFilter/Product.php | 17 +- .../SitemapBundle/UrlFilter/Statics.php | 17 +- .../UrlFilter/UrlFilterException.php | 17 +- .../SitemapBundle/UrlFilterInterface.php | 17 +- .../SitemapBundle/UrlProviderInterface.php | 17 +- .../Exception/EsdNotFoundException.php | 17 +- .../Gateway/DBAL/EsdGateway.php | 17 +- .../Gateway/EsdGatewayInterface.php | 17 +- .../Service/Core/DownloadService.php | 17 +- .../Service/Core/EsdService.php | 17 +- .../Service/DownloadServiceInterface.php | 17 +- .../Service/EsdServiceInterface.php | 17 +- .../StaticContentBundle.php | 17 +- .../StoreFrontBundle/Common/StructHelper.php | 17 +- .../Exception/StructNotFoundException.php | 17 +- .../Gateway/AddressGatewayInterface.php | 17 +- .../Gateway/BlogGatewayInterface.php | 17 +- .../Gateway/CategoryGatewayInterface.php | 17 +- .../Gateway/CategoryQueryHelperInterface.php | 17 +- .../Gateway/CheapestPriceGatewayInterface.php | 17 +- .../Gateway/ConfiguratorGatewayInterface.php | 17 +- .../ConfiguratorOptionsGatewayInterface.php | 17 +- .../Gateway/CountryGatewayInterface.php | 17 +- .../Gateway/CurrencyGatewayInterface.php | 17 +- .../Gateway/CustomFacetGatewayInterface.php | 17 +- .../Gateway/CustomSortingGatewayInterface.php | 17 +- .../Gateway/CustomerGatewayInterface.php | 17 +- .../Gateway/CustomerGroupGatewayInterface.php | 17 +- .../Gateway/DBAL/AddressGateway.php | 17 +- .../Gateway/DBAL/BlogGateway.php | 17 +- .../Gateway/DBAL/CategoryGateway.php | 17 +- .../Gateway/DBAL/CategoryQueryHelper.php | 17 +- .../Gateway/DBAL/CheapestPriceESGateway.php | 17 +- .../Gateway/DBAL/CheapestPriceGateway.php | 17 +- .../Gateway/DBAL/ConfiguratorGateway.php | 17 +- .../DBAL/ConfiguratorOptionsGateway.php | 17 +- .../Gateway/DBAL/CountryGateway.php | 17 +- .../Gateway/DBAL/CurrencyGateway.php | 17 +- .../Gateway/DBAL/CustomFacetGateway.php | 17 +- .../Gateway/DBAL/CustomSortingGateway.php | 17 +- .../Gateway/DBAL/CustomerGateway.php | 17 +- .../Gateway/DBAL/CustomerGroupGateway.php | 17 +- .../Gateway/DBAL/DownloadGateway.php | 17 +- .../Gateway/DBAL/FieldHelper.php | 17 +- .../Gateway/DBAL/GraduatedPricesGateway.php | 17 +- .../Gateway/DBAL/Hydrator/AddressHydrator.php | 17 +- .../DBAL/Hydrator/AttributeHydrator.php | 17 +- .../Gateway/DBAL/Hydrator/BlogHydrator.php | 17 +- .../DBAL/Hydrator/CategoryHydrator.php | 17 +- .../DBAL/Hydrator/ConfiguratorHydrator.php | 17 +- .../Gateway/DBAL/Hydrator/CountryHydrator.php | 17 +- .../DBAL/Hydrator/CurrencyHydrator.php | 17 +- .../DBAL/Hydrator/CustomListingHydrator.php | 17 +- .../DBAL/Hydrator/CustomerGroupHydrator.php | 17 +- .../DBAL/Hydrator/CustomerHydrator.php | 17 +- .../DBAL/Hydrator/DownloadHydrator.php | 17 +- .../Gateway/DBAL/Hydrator/EsdHydrator.php | 17 +- .../Gateway/DBAL/Hydrator/Hydrator.php | 17 +- .../Gateway/DBAL/Hydrator/LinkHydrator.php | 17 +- .../Gateway/DBAL/Hydrator/LocaleHydrator.php | 17 +- .../DBAL/Hydrator/ManufacturerHydrator.php | 17 +- .../Gateway/DBAL/Hydrator/MediaHydrator.php | 17 +- .../Gateway/DBAL/Hydrator/PaymentHydrator.php | 17 +- .../Gateway/DBAL/Hydrator/PriceHydrator.php | 17 +- .../Gateway/DBAL/Hydrator/ProductHydrator.php | 17 +- .../DBAL/Hydrator/ProductStreamHydrator.php | 17 +- .../DBAL/Hydrator/PropertyHydrator.php | 17 +- .../Gateway/DBAL/Hydrator/ShopHydrator.php | 17 +- .../DBAL/Hydrator/ShopPageHydrator.php | 17 +- .../Gateway/DBAL/Hydrator/TaxHydrator.php | 17 +- .../DBAL/Hydrator/TemplateHydrator.php | 17 +- .../Gateway/DBAL/Hydrator/UnitHydrator.php | 17 +- .../Gateway/DBAL/Hydrator/VoteHydrator.php | 17 +- .../Gateway/DBAL/LinkGateway.php | 17 +- .../Gateway/DBAL/ListProductGateway.php | 17 +- .../Gateway/DBAL/ListProductQueryHelper.php | 17 +- .../Gateway/DBAL/ManufacturerGateway.php | 17 +- .../Gateway/DBAL/MediaGateway.php | 17 +- .../Gateway/DBAL/PaymentGateway.php | 17 +- .../DBAL/PriceGroupDiscountGateway.php | 17 +- .../DBAL/ProductConfigurationGateway.php | 17 +- .../Gateway/DBAL/ProductMediaGateway.php | 17 +- .../Gateway/DBAL/ProductPropertyGateway.php | 17 +- .../Gateway/DBAL/PropertyGateway.php | 17 +- .../DBAL/RelatedProductStreamsGateway.php | 17 +- .../Gateway/DBAL/RelatedProductsGateway.php | 17 +- .../Gateway/DBAL/ShopGateway.php | 17 +- .../Gateway/DBAL/ShopPageChildrenGateway.php | 17 +- .../Gateway/DBAL/ShopPageGateway.php | 17 +- .../Gateway/DBAL/SimilarProductsGateway.php | 17 +- .../Gateway/DBAL/TaxGateway.php | 17 +- .../DBAL/VariantCheapestPriceGateway.php | 17 +- .../Gateway/DBAL/VariantMediaGateway.php | 17 +- .../Gateway/DBAL/VoteAverageGateway.php | 17 +- .../Gateway/DBAL/VoteGateway.php | 17 +- .../Gateway/DownloadGatewayInterface.php | 17 +- .../GraduatedPricesGatewayInterface.php | 17 +- .../Gateway/LinkGatewayInterface.php | 17 +- .../Gateway/ListProductGatewayInterface.php | 17 +- .../ListProductQueryHelperInterface.php | 17 +- .../Gateway/ManufacturerGatewayInterface.php | 17 +- .../Gateway/MediaGatewayInterface.php | 17 +- .../Gateway/PaymentGatewayInterface.php | 17 +- .../PriceGroupDiscountGatewayInterface.php | 17 +- .../ProductConfigurationGatewayInterface.php | 17 +- .../Gateway/ProductMediaGatewayInterface.php | 17 +- .../ProductPropertyGatewayInterface.php | 17 +- .../Gateway/PropertyGatewayInterface.php | 17 +- .../RelatedProductStreamsGatewayInterface.php | 17 +- .../RelatedProductsGatewayInterface.php | 17 +- .../Gateway/ShopGatewayInterface.php | 17 +- .../ShopPageChildrenGatewayInterface.php | 17 +- .../Gateway/ShopPageGatewayInterface.php | 17 +- .../SimilarProductsGatewayInterface.php | 17 +- .../Gateway/TaxGatewayInterface.php | 17 +- .../VariantCheapestPriceGatewayInterface.php | 17 +- .../Gateway/VariantMediaGatewayInterface.php | 17 +- .../Gateway/VoteAverageGatewayInterface.php | 17 +- .../Gateway/VoteGatewayInterface.php | 17 +- .../AdditionalTextServiceInterface.php | 17 +- .../BaseProductFactoryServiceInterface.php | 17 +- .../Service/BlogServiceInterface.php | 17 +- .../Service/CacheInterface.php | 17 +- .../Service/CategoryDepthServiceInterface.php | 17 +- .../Service/CategoryServiceInterface.php | 17 +- .../Service/CheapestPriceServiceInterface.php | 17 +- .../Service/ConfiguratorServiceInterface.php | 17 +- .../Service/ContextServiceInterface.php | 17 +- .../Service/Core/AdditionalTextService.php | 17 +- .../Core/BaseProductFactoryService.php | 17 +- .../Service/Core/BlogService.php | 17 +- .../Service/Core/CachedHrefLangService.php | 17 +- .../Service/Core/CategoryDepthService.php | 17 +- .../Service/Core/CategoryService.php | 17 +- .../Service/Core/CheapestPriceService.php | 17 +- .../Service/Core/ConfiguratorService.php | 17 +- .../Service/Core/ContextService.php | 17 +- .../Service/Core/CoreCache.php | 17 +- .../Service/Core/CustomFacetService.php | 17 +- .../Service/Core/CustomSortingService.php | 17 +- .../Service/Core/CustomerService.php | 17 +- .../Service/Core/GraduatedPricesService.php | 17 +- .../Service/Core/HrefLangService.php | 17 +- .../Service/Core/ListProductService.php | 17 +- .../Core/ListingLinkRewriteService.php | 17 +- .../Service/Core/LocationService.php | 17 +- .../Service/Core/ManufacturerService.php | 17 +- .../Service/Core/MarketingService.php | 17 +- .../Service/Core/MediaService.php | 17 +- .../Service/Core/PriceCalculationService.php | 17 +- .../Service/Core/PriceCalculator.php | 17 +- .../Service/Core/ProductDownloadService.php | 17 +- .../Service/Core/ProductLinkService.php | 17 +- .../Service/Core/ProductNumberService.php | 17 +- .../Service/Core/ProductService.php | 17 +- .../Service/Core/PropertyService.php | 17 +- .../Core/RelatedProductStreamsService.php | 17 +- .../Service/Core/RelatedProductsService.php | 17 +- .../Service/Core/ShopContextFactory.php | 17 +- .../Core/ShopContextFactoryInterface.php | 17 +- .../Service/Core/ShopPageService.php | 17 +- .../Service/Core/SimilarProductsService.php | 17 +- .../Service/Core/VariantCoverService.php | 17 +- .../Core/VariantListingPriceService.php | 17 +- .../Service/Core/VoteService.php | 17 +- .../Service/CustomFacetServiceInterface.php | 17 +- .../Service/CustomSortingServiceInterface.php | 17 +- .../Service/CustomerServiceInterface.php | 17 +- .../GraduatedPricesServiceInterface.php | 17 +- .../Service/HrefLangServiceInterface.php | 17 +- .../Service/ListProductServiceInterface.php | 17 +- .../ListingLinkRewriteServiceInterface.php | 17 +- .../Service/LocationServiceInterface.php | 17 +- .../Service/ManufacturerServiceInterface.php | 17 +- .../Service/MarketingServiceInterface.php | 17 +- .../Service/MediaServiceInterface.php | 17 +- .../PriceCalculationServiceInterface.php | 17 +- .../Service/PriceCalculatorInterface.php | 17 +- .../ProductDownloadServiceInterface.php | 17 +- .../Service/ProductLinkServiceInterface.php | 17 +- .../Service/ProductNumberServiceInterface.php | 17 +- .../Service/ProductServiceInterface.php | 17 +- .../Service/PropertyServiceInterface.php | 17 +- .../RelatedProductStreamsServiceInterface.php | 17 +- .../RelatedProductsServiceInterface.php | 17 +- .../Service/ShopPageServiceInterface.php | 17 +- .../SimilarProductsServiceInterface.php | 17 +- .../Service/VariantCoverServiceInterface.php | 17 +- .../VariantListingPriceServiceInterface.php | 17 +- .../Service/VoteServiceInterface.php | 17 +- .../StoreFrontBundle/StoreFrontBundle.php | 17 +- .../StoreFrontBundle/Struct/Address.php | 17 +- .../StoreFrontBundle/Struct/Attribute.php | 17 +- .../StoreFrontBundle/Struct/BaseProduct.php | 17 +- .../StoreFrontBundle/Struct/Blog/Blog.php | 17 +- .../StoreFrontBundle/Struct/Category.php | 17 +- .../Struct/Configurator/Group.php | 17 +- .../Struct/Configurator/Option.php | 17 +- .../Struct/Configurator/Set.php | 17 +- .../StoreFrontBundle/Struct/Country.php | 17 +- .../StoreFrontBundle/Struct/Country/Area.php | 17 +- .../StoreFrontBundle/Struct/Country/State.php | 17 +- .../StoreFrontBundle/Struct/Currency.php | 17 +- .../StoreFrontBundle/Struct/Customer.php | 17 +- .../Struct/Customer/Group.php | 17 +- .../StoreFrontBundle/Struct/Extendable.php | 17 +- .../StoreFrontBundle/Struct/HrefLang.php | 17 +- .../StoreFrontBundle/Struct/ListProduct.php | 17 +- .../Bundle/StoreFrontBundle/Struct/Locale.php | 17 +- .../Bundle/StoreFrontBundle/Struct/Media.php | 17 +- .../StoreFrontBundle/Struct/Payment.php | 17 +- .../StoreFrontBundle/Struct/Product.php | 17 +- .../Struct/Product/Download.php | 17 +- .../StoreFrontBundle/Struct/Product/Esd.php | 17 +- .../StoreFrontBundle/Struct/Product/Link.php | 17 +- .../Struct/Product/Manufacturer.php | 17 +- .../Struct/Product/MarketingAttribute.php | 17 +- .../StoreFrontBundle/Struct/Product/Price.php | 17 +- .../Struct/Product/PriceDiscount.php | 17 +- .../Struct/Product/PriceGroup.php | 17 +- .../Struct/Product/PriceRule.php | 17 +- .../StoreFrontBundle/Struct/Product/Unit.php | 17 +- .../StoreFrontBundle/Struct/Product/Vote.php | 17 +- .../Struct/Product/VoteAverage.php | 17 +- .../Struct/ProductContext.php | 17 +- .../Struct/ProductContextInterface.php | 17 +- .../StoreFrontBundle/Struct/ProductStream.php | 17 +- .../Struct/Property/Group.php | 17 +- .../Struct/Property/Option.php | 17 +- .../StoreFrontBundle/Struct/Property/Set.php | 17 +- .../Struct/Search/CustomFacet.php | 17 +- .../Struct/Search/CustomSorting.php | 17 +- .../Bundle/StoreFrontBundle/Struct/Shop.php | 17 +- .../StoreFrontBundle/Struct/ShopContext.php | 17 +- .../Struct/ShopContextInterface.php | 17 +- .../StoreFrontBundle/Struct/ShopPage.php | 17 +- .../Bundle/StoreFrontBundle/Struct/Struct.php | 17 +- .../Bundle/StoreFrontBundle/Struct/Tax.php | 17 +- .../StoreFrontBundle/Struct/Template.php | 17 +- .../StoreFrontBundle/Struct/Thumbnail.php | 17 +- .../Shopware/Commands/AdminCreateCommand.php | 17 +- .../Shopware/Commands/CacheClearCommand.php | 17 +- .../Commands/CloneCategoryTreeCommand.php | 17 +- engine/Shopware/Commands/ConfigSetCommand.php | 17 +- engine/Shopware/Commands/CronListCommand.php | 17 +- engine/Shopware/Commands/CronRunCommand.php | 17 +- .../Commands/DatabaseSetupCommand.php | 17 +- .../Commands/FirstRunWizardDisableCommand.php | 17 +- .../Commands/FirstRunWizardEnableCommand.php | 17 +- .../Commands/GenerateAttributesCommand.php | 17 +- .../Commands/GenerateMigrationCommand.php | 35 ++-- .../Commands/GenerateProductFeedCommand.php | 17 +- .../Commands/ListProductFeedCommand.php | 18 +- ...ateArticleAttributeTranslationsCommand.php | 17 +- .../Commands/MigrationsMigrateCommand.php | 17 +- .../Commands/PluginActivateCommand.php | 17 +- engine/Shopware/Commands/PluginCommand.php | 17 +- .../Commands/PluginConfigListCommand.php | 17 +- .../Commands/PluginConfigSetCommand.php | 17 +- .../Commands/PluginDeactivateCommand.php | 17 +- .../Shopware/Commands/PluginDeleteCommand.php | 17 +- .../Commands/PluginInstallCommand.php | 17 +- .../Shopware/Commands/PluginListCommand.php | 17 +- .../Commands/PluginRefreshCommand.php | 17 +- .../Commands/PluginReinstallCommand.php | 17 +- .../Commands/PluginUninstallCommand.php | 17 +- .../Shopware/Commands/PluginUpdateCommand.php | 17 +- .../Commands/RebuildCategoryTreeCommand.php | 17 +- .../Commands/RebuildSeoIndexCommand.php | 17 +- .../Commands/RefreshSearchIndexCommand.php | 17 +- .../Commands/RefreshTopsellerCommand.php | 17 +- .../Commands/SessionCleanupCommand.php | 17 +- .../SettingsLabelsFindMissingCommand.php | 17 +- engine/Shopware/Commands/ShopwareCommand.php | 17 +- .../Commands/SnippetsFindMissingCommand.php | 17 +- .../Commands/SnippetsRemoveCommand.php | 17 +- .../Shopware/Commands/SnippetsToDbCommand.php | 17 +- .../Commands/SnippetsToIniCommand.php | 17 +- .../Commands/SnippetsToSqlCommand.php | 17 +- .../Commands/SnippetsValidateCommand.php | 17 +- engine/Shopware/Commands/StoreCommand.php | 17 +- .../Commands/StoreDownloadCommand.php | 17 +- engine/Shopware/Commands/StoreListCommand.php | 17 +- .../Commands/StoreListDomainsCommand.php | 17 +- .../Commands/StoreListIntegratedCommand.php | 17 +- .../Commands/StoreListUpdatesCommand.php | 17 +- .../Commands/StreamIndexPopulateCommand.php | 17 +- .../Commands/ThemeCacheGenerateCommand.php | 18 +- .../Shopware/Commands/ThemeCreateCommand.php | 17 +- .../ThemeDumpConfigurationCommand.php | 17 +- .../Commands/ThemeInitializeCommand.php | 17 +- .../Commands/ThemeSynchronizeCommand.php | 17 +- .../Commands/ThumbnailCleanupCommand.php | 17 +- .../Commands/ThumbnailGenerateCommand.php | 17 +- .../Commands/WarmUpHttpCacheCommand.php | 17 +- engine/Shopware/Components/Acl.php | 17 +- .../Components/AddLinkHeaderSubscriber.php | 17 +- .../Components/Api/BatchInterface.php | 17 +- .../Components/Api/Exception/ApiException.php | 17 +- .../BatchInterfaceNotImplementedException.php | 17 +- .../Exception/CustomValidationException.php | 17 +- .../NonUniqueIdentifierUsedException.php | 17 +- .../Api/Exception/NotFoundException.php | 17 +- .../Components/Api/Exception/OrmException.php | 17 +- .../Exception/ParameterMissingException.php | 17 +- .../Api/Exception/PrivilegeException.php | 17 +- .../Api/Exception/ValidationException.php | 17 +- engine/Shopware/Components/Api/Manager.php | 17 +- .../Components/Api/Resource/Address.php | 17 +- .../Components/Api/Resource/Article.php | 17 +- .../Components/Api/Resource/Cache.php | 17 +- .../Components/Api/Resource/Category.php | 17 +- .../Components/Api/Resource/Country.php | 17 +- .../Components/Api/Resource/Customer.php | 17 +- .../Components/Api/Resource/CustomerGroup.php | 17 +- .../Api/Resource/CustomerStream.php | 17 +- .../Components/Api/Resource/EmotionPreset.php | 17 +- .../Components/Api/Resource/Manufacturer.php | 17 +- .../Components/Api/Resource/Media.php | 17 +- .../Components/Api/Resource/Order.php | 17 +- .../Api/Resource/PaymentMethods.php | 17 +- .../Components/Api/Resource/PropertyGroup.php | 17 +- .../Components/Api/Resource/Resource.php | 17 +- .../Shopware/Components/Api/Resource/Shop.php | 17 +- .../Components/Api/Resource/Translation.php | 17 +- .../Shopware/Components/Api/Resource/User.php | 17 +- .../Components/Api/Resource/Variant.php | 17 +- .../Components/AttributeSubscriber.php | 17 +- engine/Shopware/Components/Auth.php | 17 +- .../Components/Auth/Adapter/Default.php | 17 +- .../Components/Auth/Constraint/NoUrl.php | 17 +- .../Auth/Constraint/NoUrlValidator.php | 17 +- .../Components/Auth/Constraint/UserEmail.php | 17 +- .../Auth/Constraint/UserEmailValidator.php | 17 +- .../Components/Auth/Constraint/UserName.php | 17 +- .../Auth/Constraint/UserNameValidator.php | 17 +- .../Auth/Validator/UserValidator.php | 17 +- .../Auth/Validator/UserValidatorInterface.php | 17 +- .../Components/Backend/GlobalSearch.php | 17 +- .../BasketSignature/BasketPersister.php | 17 +- .../BasketSignatureGenerator.php | 17 +- .../BasketSignatureGeneratorInterface.php | 17 +- .../CleanupSignatureSubscriber.php | 17 +- .../Components/CSRFGetProtectionAware.php | 17 +- .../CSRFTokenValidationException.php | 17 +- .../Components/CSRFTokenValidator.php | 17 +- .../Components/CSRFWhitelistAware.php | 17 +- engine/Shopware/Components/CacheManager.php | 17 +- .../Shopware/Components/CacheSubscriber.php | 17 +- .../Components/Captcha/AbstractCaptcha.php | 17 +- .../Components/Captcha/CaptchaInterface.php | 17 +- .../Components/Captcha/CaptchaRepository.php | 17 +- .../Components/Captcha/CaptchaValidator.php | 17 +- .../Components/Captcha/DefaultCaptcha.php | 17 +- .../Exception/CaptchaNotFoundException.php | 17 +- .../Components/Captcha/HoneypotCaptcha.php | 17 +- .../Components/Captcha/LegacyCaptcha.php | 17 +- .../Shopware/Components/Captcha/NoCaptcha.php | 17 +- .../Shopware/Components/Cart/BasketHelper.php | 17 +- .../Components/Cart/BasketHelperInterface.php | 17 +- .../Components/Cart/BasketQueryHelper.php | 17 +- .../Cart/BasketQueryHelperInterface.php | 17 +- .../Components/Cart/CartMigration.php | 17 +- .../Components/Cart/CartMigrationCleaner.php | 17 +- .../Cart/CartMigrationCleanerInterface.php | 17 +- .../Cart/CartMigrationInterface.php | 17 +- .../Cart/CartOrderNumberProvider.php | 17 +- .../Cart/CartOrderNumberProviderInterface.php | 17 +- .../Components/Cart/CartPersistService.php | 17 +- .../Cart/CartPersistServiceInterface.php | 17 +- .../Cart/ConditionalLineItemService.php | 17 +- .../ConditionalLineItemServiceInterface.php | 17 +- .../NetRounding/RoundLineAfterQuantity.php | 17 +- .../Cart/NetRounding/RoundLineAfterTax.php | 17 +- .../Cart/NetRounding/RoundingInterface.php | 17 +- .../Components/Cart/PaymentTokenService.php | 17 +- .../Cart/PaymentTokenSubscriber.php | 17 +- .../Cart/ProportionalCartMerger.php | 17 +- .../Cart/ProportionalCartMergerInterface.php | 17 +- .../Cart/ProportionalCartNormalizer.php | 17 +- .../ProportionalCartNormalizerInterface.php | 17 +- .../Cart/ProportionalTaxCalculator.php | 17 +- .../ProportionalTaxCalculatorInterface.php | 17 +- .../Components/Cart/Struct/CartItemStruct.php | 17 +- .../Cart/Struct/DiscountContext.php | 17 +- .../Cart/Struct/PaymentTokenResult.php | 17 +- .../Shopware/Components/Cart/Struct/Price.php | 17 +- .../Components/Cart/TaxAggregator.php | 17 +- .../Cart/TaxAggregatorInterface.php | 17 +- .../CategoryHandling/CategoryDuplicator.php | 17 +- engine/Shopware/Components/Check/File.php | 17 +- .../Check/MySQLVersionExtractor.php | 17 +- engine/Shopware/Components/Check/Path.php | 17 +- .../Components/Check/Requirements.php | 17 +- .../Compatibility/LegacyEventManager.php | 17 +- .../Compatibility/LegacyStructConverter.php | 17 +- engine/Shopware/Components/Config.php | 17 +- engine/Shopware/Components/ConfigLoader.php | 17 +- engine/Shopware/Components/ConfigWriter.php | 17 +- .../Components/Console/Application.php | 17 +- .../Components/ContainerAwareEventManager.php | 17 +- engine/Shopware/Components/Cron/CronJob.php | 17 +- engine/Shopware/Components/CsvIterator.php | 17 +- .../CustomerStream/CookieSubscriber.php | 17 +- .../CustomerStreamCriteriaFactory.php | 17 +- ...CustomerStreamCriteriaFactoryInterface.php | 17 +- .../CustomerStream/StreamIndexer.php | 17 +- .../CustomerStream/StreamIndexerInterface.php | 17 +- .../DependencyInjection/Bridge/Cache.php | 17 +- .../DependencyInjection/Bridge/Config.php | 17 +- .../DependencyInjection/Bridge/Currency.php | 17 +- .../DependencyInjection/Bridge/Db.php | 17 +- .../DependencyInjection/Bridge/Front.php | 17 +- .../DependencyInjection/Bridge/Locale.php | 17 +- .../DependencyInjection/Bridge/Mail.php | 17 +- .../Bridge/MailTransport.php | 17 +- .../Bridge/ModelAnnotation.php | 17 +- .../DependencyInjection/Bridge/Models.php | 17 +- .../DependencyInjection/Bridge/Plugins.php | 17 +- .../DependencyInjection/Bridge/Router.php | 17 +- .../DependencyInjection/Bridge/Session.php | 17 +- .../DependencyInjection/Bridge/Template.php | 17 +- .../Bridge/TemplateMail.php | 17 +- .../DependencyInjection/Bridge/Validator.php | 17 +- .../Compiler/ConfigureApiResourcesPass.php | 17 +- .../ConfigureContainerAwareCommands.php | 17 +- .../DoctrineEventSubscriberCompilerPass.php | 17 +- .../Compiler/EventListenerCompilerPass.php | 17 +- .../Compiler/EventSubscriberCompilerPass.php | 17 +- .../Compiler/LegacyApiResourcesPass.php | 17 +- .../Compiler/PluginLoggerCompilerPass.php | 17 +- .../Compiler/PluginResourceCompilerPass.php | 17 +- .../Compiler/TagReplaceTrait.php | 17 +- .../DependencyInjection/Container.php | 17 +- .../ContainerAwareInterface.php | 17 +- .../DependencyInjection/LegacyPhpDumper.php | 17 +- .../DependencyInjection/ProxyFactory.php | 17 +- .../DependencyInjection/SimpleFactory.php | 17 +- .../Components/DispatchFormatHelper.php | 17 +- engine/Shopware/Components/Document.php | 17 +- .../Components/Emotion/ComponentInstaller.php | 17 +- .../Emotion/DeviceConfiguration.php | 17 +- .../Emotion/DeviceConfigurationInterface.php | 17 +- .../EmotionComponentViewSubscriber.php | 17 +- .../Components/Emotion/EmotionExporter.php | 17 +- .../Emotion/EmotionExporterInterface.php | 17 +- .../Components/Emotion/EmotionImporter.php | 17 +- .../Emotion/EmotionImporterInterface.php | 17 +- .../Emotion/EmotionTranslationImporter.php | 17 +- .../Exception/EmotionImportException.php | 17 +- .../Exception/MappingRequiredException.php | 17 +- .../Emotion/LandingPageViewLoader.php | 17 +- .../Emotion/LandingPageViewStruct.php | 17 +- .../AbstractComponentHandler.php | 17 +- .../BannerComponentHandler.php | 17 +- .../BannerSliderComponentHandler.php | 17 +- .../CategoryTeaserComponentHandler.php | 17 +- .../ComponentHandlerInterface.php | 17 +- .../Html5VideoComponentHandler.php | 17 +- .../Preset/EmotionToPresetDataTransformer.php | 17 +- ...motionToPresetDataTransformerInterface.php | 17 +- .../Exception/PresetAssetImportException.php | 17 +- .../Emotion/Preset/PresetDataSynchronizer.php | 17 +- .../PresetDataSynchronizerInterface.php | 17 +- .../Emotion/Preset/PresetInstaller.php | 17 +- .../Preset/PresetInstallerInterface.php | 17 +- .../Emotion/Preset/PresetLoader.php | 17 +- .../Emotion/Preset/PresetLoaderInterface.php | 17 +- .../Preset/PresetMetaDataInterface.php | 17 +- .../Shopware/Components/ErrorSubscriber.php | 17 +- .../Shopware/Components/Escaper/Escaper.php | 17 +- .../Components/Escaper/EscaperInterface.php | 17 +- .../AdapterFactoryNotFoundException.php | 17 +- .../DuplicateFilesystemFactoryException.php | 17 +- .../Filesystem/FilesystemFactory.php | 17 +- .../Filesystem/FilesystemFactoryInterface.php | 17 +- .../Filesystem/PrefixFilesystem.php | 17 +- .../Filesystem/PublicUrlGenerator.php | 17 +- .../PublicUrlGeneratorInterface.php | 17 +- engine/Shopware/Components/Form/Base.php | 17 +- engine/Shopware/Components/Form/Container.php | 17 +- .../Components/Form/Container/FieldSet.php | 17 +- .../Components/Form/Container/Tab.php | 17 +- .../Form/Container/TabContainer.php | 17 +- engine/Shopware/Components/Form/Field.php | 17 +- .../Components/Form/Field/Boolean.php | 17 +- .../Shopware/Components/Form/Field/Color.php | 17 +- .../Shopware/Components/Form/Field/Date.php | 17 +- engine/Shopware/Components/Form/Field/Em.php | 17 +- .../Shopware/Components/Form/Field/Media.php | 17 +- .../Shopware/Components/Form/Field/NoUrl.php | 17 +- .../Shopware/Components/Form/Field/Number.php | 17 +- .../Components/Form/Field/Percent.php | 17 +- .../Shopware/Components/Form/Field/Pixel.php | 17 +- .../Components/Form/Field/Selection.php | 17 +- .../Shopware/Components/Form/Field/Text.php | 17 +- .../Components/Form/Field/TextArea.php | 17 +- .../Components/Form/Interfaces/Container.php | 17 +- .../Components/Form/Interfaces/Element.php | 17 +- .../Components/Form/Interfaces/Field.php | 17 +- .../Components/Form/Interfaces/Persister.php | 17 +- .../Components/Form/Interfaces/Validate.php | 17 +- .../Components/Form/Persister/Theme.php | 17 +- .../Components/HolidayTableUpdater.php | 17 +- .../Components/HttpCache/AppCache.php | 17 +- .../Components/HttpCache/BlackHoleStore.php | 17 +- .../HttpCache/CacheRouteGenerationService.php | 17 +- .../HttpCache/CacheRouteInstaller.php | 17 +- .../HttpCache/CacheTimeServiceInterface.php | 17 +- .../Components/HttpCache/CacheWarmer.php | 17 +- .../HttpCache/DefaultCacheTimeService.php | 17 +- .../HttpCache/DefaultRouteService.php | 17 +- .../HttpCache/DynamicCacheTimeService.php | 17 +- .../HttpCache/InvalidationDate/BlogDate.php | 17 +- .../InvalidationDate/BlogListingDate.php | 17 +- .../InvalidationDate/CampaignDate.php | 17 +- .../InvalidationDateInterface.php | 17 +- .../InvalidationDateTrait.php | 17 +- .../InvalidationDate/ListingDate.php | 17 +- .../InvalidationDate/ListingDateFrontpage.php | 17 +- .../InvalidationDate/ProductDetailDate.php | 17 +- .../Shopware/Components/HttpCache/Store.php | 17 +- .../HttpCache/UrlProvider/BlogProvider.php | 17 +- .../UrlProvider/CategoryProvider.php | 17 +- .../HttpCache/UrlProvider/EmotionProvider.php | 17 +- .../HttpCache/UrlProvider/FormProvider.php | 17 +- .../UrlProvider/ManufacturerProvider.php | 17 +- .../HttpCache/UrlProvider/ProductProvider.php | 17 +- .../ProductWithCategoryProvider.php | 17 +- .../UrlProvider/ProductWithNumberProvider.php | 17 +- .../HttpCache/UrlProvider/StaticProvider.php | 17 +- .../UrlProvider/UrlProviderInterface.php | 17 +- .../UrlProvider/VariantSwitchProvider.php | 17 +- .../HttpCache/UrlProviderFactory.php | 17 +- .../HttpCache/UrlProviderFactoryInterface.php | 17 +- .../Components/HttpClient/GuzzleFactory.php | 17 +- .../HttpClient/GuzzleHttpClient.php | 17 +- .../HttpClient/HttpClientInterface.php | 17 +- .../HttpClient/RequestException.php | 17 +- .../Components/HttpClient/Response.php | 17 +- .../Shopware/Components/Install/Database.php | 17 +- .../Components/LastArticlesSubscriber.php | 17 +- .../LegacyRequestWrapper/CookieWrapper.php | 17 +- .../LegacyRequestWrapper/GetWrapper.php | 17 +- .../LegacyRequestWrapper/PostWrapper.php | 17 +- .../Exceptions/LicenseHostException.php | 17 +- .../Exceptions/LicenseInvalidException.php | 17 +- .../Exceptions/LicenseProductKeyException.php | 17 +- .../Service/LicenseServiceSubscriber.php | 17 +- .../Service/LicenseUnpackServiceInterface.php | 17 +- .../Service/LocalLicenseUnpackService.php | 17 +- .../Service/ShopwareEditionService.php | 17 +- .../ShopwareEditionServiceInterface.php | 17 +- .../License/Struct/LicenseInformation.php | 17 +- .../License/Struct/LicenseUnpackRequest.php | 17 +- .../License/Struct/ShopwareEdition.php | 17 +- .../Shopware/Components/LicenseInstaller.php | 17 +- .../Log/Formatter/HtmlFormatter.php | 17 +- .../Log/Formatter/WildfireFormatter.php | 17 +- .../Log/Handler/DoctrineDBALHandler.php | 17 +- .../Log/Handler/EnlightMailHandler.php | 17 +- .../Components/Log/Parser/LogfileParser.php | 17 +- .../ShopwareEnvironmentProcessor.php | 18 +- .../Components/LogawareReflectionHelper.php | 17 +- engine/Shopware/Components/Logger.php | 17 +- .../ManualSorting/PositionService.php | 17 +- .../PositionServiceInterface.php | 17 +- .../ManualSorting/ProductLoader.php | 17 +- .../ManualSorting/ProductLoaderInterface.php | 17 +- engine/Shopware/Components/MemoryLimit.php | 17 +- .../Migrations/AbstractMigration.php | 17 +- .../Migrations/AbstractPluginMigration.php | 17 +- .../Components/Migrations/Manager.php | 18 +- .../Migrations/PluginMigrationManager.php | 18 +- engine/Shopware/Components/Model/Cache.php | 17 +- .../Model/CategoryDenormalization.php | 17 +- .../Components/Model/CategorySubscriber.php | 17 +- .../Components/Model/Configuration.php | 17 +- .../Model/DBAL/Constraints/OrderNumber.php | 17 +- .../Shopware/Components/Model/DBAL/Result.php | 17 +- .../DBAL/Types/AllowInvalidArrayType.php | 17 +- .../Model/DBAL/Types/DateStringType.php | 17 +- .../Model/DBAL/Types/DateTimeStringType.php | 17 +- .../DBAL/Validator/OrderNumberValidator.php | 17 +- .../Components/Model/EventSubscriber.php | 17 +- .../Exception/ModelNotFoundException.php | 17 +- .../Shopware/Components/Model/Generator.php | 34 ++-- .../Components/Model/LazyFetchModelEntity.php | 17 +- .../Shopware/Components/Model/ModelEntity.php | 17 +- .../Components/Model/ModelManager.php | 17 +- .../Components/Model/ModelRepository.php | 17 +- .../Model/ProxyAwareRepositoryFactory.php | 17 +- .../Model/Query/Mysql/DateFormat.php | 17 +- .../Components/Model/Query/Mysql/IfElse.php | 17 +- .../Components/Model/Query/Mysql/IfNull.php | 17 +- .../Components/Model/Query/Mysql/RegExp.php | 17 +- .../Components/Model/Query/Mysql/Replace.php | 17 +- .../Query/SqlWalker/ForceIndexWalker.php | 17 +- .../Components/Model/QueryBuilder.php | 17 +- .../Model/QueryOperatorValidator.php | 17 +- .../Components/Model/SearchBuilder.php | 17 +- .../Components/Model/ZendDbInitializer.php | 17 +- engine/Shopware/Components/Modules.php | 17 +- .../Components/MultiEdit/Resource/Product.php | 17 +- .../MultiEdit/Resource/Product/Backup.php | 17 +- .../Resource/Product/BatchProcess.php | 17 +- .../MultiEdit/Resource/Product/DqlHelper.php | 17 +- .../MultiEdit/Resource/Product/Filter.php | 17 +- .../MultiEdit/Resource/Product/Grammar.php | 17 +- .../MultiEdit/Resource/Product/Queue.php | 17 +- .../MultiEdit/Resource/Product/Value.php | 17 +- .../MultiEdit/Resource/ResourceInterface.php | 17 +- .../Components/NumberRangeIncrementer.php | 17 +- .../NumberRangeIncrementerInterface.php | 17 +- .../Components/ObjectJsonSerializeTrait.php | 17 +- .../ObjectJsonSerializeTraitDeprecated.php | 17 +- .../Shopware/Components/OpenSSLVerifier.php | 17 +- engine/Shopware/Components/OptinService.php | 17 +- .../Components/OptinServiceInterface.php | 17 +- .../Exception/InvalidOrderNumberException.php | 17 +- .../OrderNumberValidatorInterface.php | 17 +- .../RegexOrderNumberValidator.php | 17 +- .../Components/Password/Encoder/Argon2i.php | 17 +- .../Components/Password/Encoder/Argon2id.php | 17 +- .../Components/Password/Encoder/Bcrypt.php | 17 +- .../Password/Encoder/LegacyBackendMd5.php | 17 +- .../Components/Password/Encoder/Md5.php | 17 +- .../Encoder/PasswordEncoderInterface.php | 17 +- .../Components/Password/Encoder/PreHashed.php | 17 +- .../Components/Password/Encoder/Sha256.php | 17 +- .../Shopware/Components/Password/Manager.php | 17 +- engine/Shopware/Components/Plugin.php | 17 +- .../Shopware/Components/Plugin/Bootstrap.php | 17 +- .../Components/Plugin/CachedConfigReader.php | 17 +- .../Components/Plugin/ConfigReader.php | 17 +- .../Components/Plugin/ConfigWriter.php | 17 +- .../Plugin/Configuration/CachedReader.php | 17 +- .../Layers/AbstractShopConfigurationLayer.php | 17 +- .../Layers/ConfigurationLayerInterface.php | 17 +- .../Configuration/Layers/DefaultLayer.php | 17 +- .../Configuration/Layers/DefaultShopLayer.php | 17 +- .../Layers/LanguageShopLayer.php | 17 +- .../Configuration/Layers/SubShopLayer.php | 17 +- .../Plugin/Configuration/Reader.php | 17 +- .../Plugin/Configuration/ReaderInterface.php | 17 +- .../Plugin/Configuration/Writer.php | 17 +- .../Plugin/Configuration/WriterException.php | 17 +- .../Plugin/Configuration/WriterInterface.php | 17 +- .../Plugin/Context/ActivateContext.php | 17 +- .../Plugin/Context/DeactivateContext.php | 17 +- .../Plugin/Context/InstallContext.php | 17 +- .../Plugin/Context/UninstallContext.php | 17 +- .../Plugin/Context/UpdateContext.php | 17 +- .../Components/Plugin/CronjobSynchronizer.php | 17 +- .../Components/Plugin/DBALConfigReader.php | 17 +- .../Components/Plugin/FormSynchronizer.php | 17 +- .../Components/Plugin/MenuSynchronizer.php | 17 +- .../Shopware/Components/Plugin/Namespace.php | 17 +- .../Components/Plugin/PaymentInstaller.php | 17 +- .../Plugin/RequirementValidator.php | 17 +- .../Components/Plugin/ResourceSubscriber.php | 17 +- .../Components/Plugin/XmlPluginInfoReader.php | 17 +- .../StoreExtjsValueParser.php | 17 +- .../StoreValueParserFactory.php | 17 +- .../StoreValueParserInterface.php | 17 +- .../StoreValueParser/StoreXmlValueParser.php | 17 +- .../Plugin/XmlReader/XmlConfigReader.php | 17 +- .../Plugin/XmlReader/XmlCronjobReader.php | 17 +- .../Plugin/XmlReader/XmlMenuReader.php | 17 +- .../Plugin/XmlReader/XmlPluginReader.php | 17 +- .../Plugin/XmlReader/XmlReaderBase.php | 17 +- .../Plugin/XmlReader/XmlReaderInterface.php | 17 +- .../Privacy/ConfigDependentIpAnonymizer.php | 17 +- .../Privacy/CookieRemoveSubscriber.php | 17 +- .../Components/Privacy/IpAnonymizer.php | 17 +- .../Privacy/IpAnonymizerInterface.php | 17 +- .../Privacy/PrivacyCleanupCronSubscriber.php | 17 +- .../Components/Privacy/PrivacyService.php | 17 +- .../Privacy/PrivacyServiceInterface.php | 17 +- .../ProductStream/CriteriaFactory.php | 17 +- .../CriteriaFactoryInterface.php | 17 +- .../Components/ProductStream/FacetFilter.php | 17 +- .../ProductStream/FacetFilterInterface.php | 17 +- .../Components/ProductStream/Repository.php | 17 +- .../ProductStream/RepositoryInterface.php | 17 +- .../Shopware/Components/QueryAliasMapper.php | 17 +- engine/Shopware/Components/Random.php | 17 +- .../Components/ReflectionAwareInterface.php | 17 +- .../Shopware/Components/ReflectionHelper.php | 17 +- .../Register/OptinCleanupService.php | 17 +- .../Register/OptinCleanupServiceInterface.php | 17 +- .../Register/OptinCleanupSubscriber.php | 17 +- .../Register/RegistrationCleanupService.php | 17 +- .../RegistrationCleanupServiceInterface.php | 17 +- .../RegistrationCleanupSubscriber.php | 17 +- .../Components/RobotsTxtGenerator.php | 17 +- .../RobotsTxtGeneratorInterface.php | 17 +- .../Shopware/Components/Routing/Context.php | 17 +- .../GeneratorFilters/DefaultPostFilter.php | 17 +- .../GeneratorFilters/DefaultPreFilter.php | 17 +- .../GeneratorFilters/FrontendPostFilter.php | 17 +- .../GeneratorFilters/FrontendPreFilter.php | 17 +- .../Components/Routing/GeneratorInterface.php | 17 +- .../Routing/GeneratorListInterface.php | 17 +- .../Routing/Generators/DefaultGenerator.php | 17 +- .../Routing/Generators/RewriteGenerator.php | 17 +- .../Components/Routing/MatcherInterface.php | 17 +- .../Routing/Matchers/DefaultMatcher.php | 17 +- .../Routing/Matchers/EventMatcher.php | 17 +- .../Routing/Matchers/RewriteMatcher.php | 17 +- .../Routing/PostFilterInterface.php | 17 +- .../Components/Routing/PreFilterInterface.php | 17 +- engine/Shopware/Components/Routing/Router.php | 17 +- .../Components/Routing/RouterInterface.php | 17 +- .../Security/AttributeCleanerTrait.php | 17 +- .../Components/Session/PdoSessionHandler.php | 17 +- .../Components/ShopRegistrationService.php | 17 +- .../ShopRegistrationServiceInterface.php | 17 +- .../Components/ShopwareReleaseStruct.php | 17 +- engine/Shopware/Components/SitePageMenu.php | 17 +- .../Components/SitemapXMLRepository.php | 17 +- .../Components/Slug/CocurSlugifyAdapter.php | 17 +- .../Components/Slug/SlugInterface.php | 17 +- .../Components/Snippet/DatabaseHandler.php | 17 +- .../Shopware/Components/Snippet/DbAdapter.php | 17 +- .../Shopware/Components/Snippet/Manager.php | 17 +- .../Components/Snippet/QueryHandler.php | 17 +- .../Components/Snippet/SnippetValidator.php | 17 +- .../Snippet/Writer/DatabaseWriter.php | 17 +- .../Components/Snippet/Writer/QueryWriter.php | 17 +- .../Components/StateTranslatorService.php | 17 +- .../StateTranslatorServiceInterface.php | 17 +- .../Components/StreamProtocolValidator.php | 17 +- .../StreamProtocolValidatorInterface.php | 17 +- engine/Shopware/Components/StringCompiler.php | 17 +- .../Template/HtmlCompressorInterface.php | 17 +- .../Components/Template/HtmlMinCompressor.php | 17 +- .../Shopware/Components/Template/Security.php | 17 +- engine/Shopware/Components/TemplateMail.php | 17 +- engine/Shopware/Components/Theme.php | 17 +- engine/Shopware/Components/Theme/Compiler.php | 17 +- .../Theme/Compressor/CompressorInterface.php | 17 +- .../Components/Theme/Compressor/Js.php | 17 +- .../Shopware/Components/Theme/ConfigSet.php | 17 +- .../Components/Theme/Configuration.php | 17 +- .../Components/Theme/Configurator.php | 17 +- .../Theme/DBALTimestampPersistor.php | 17 +- .../Theme/EventListener/BackendTheme.php | 17 +- .../Theme/EventListener/ConfigLoader.php | 17 +- .../Shopware/Components/Theme/Generator.php | 17 +- .../Shopware/Components/Theme/Inheritance.php | 17 +- .../Shopware/Components/Theme/Installer.php | 17 +- .../Components/Theme/JavascriptCollector.php | 17 +- .../Components/Theme/JavascriptDefinition.php | 17 +- .../Components/Theme/LessCollector.php | 17 +- .../Components/Theme/LessCompiler.php | 17 +- .../Theme/LessCompiler/Oyejorge.php | 17 +- .../Components/Theme/LessDefinition.php | 17 +- .../Components/Theme/PathResolver.php | 17 +- engine/Shopware/Components/Theme/Service.php | 17 +- .../Components/Theme/TimestampPersistor.php | 17 +- engine/Shopware/Components/Theme/Util.php | 17 +- .../Components/Thumbnail/Generator/Basic.php | 17 +- .../Generator/GeneratorInterface.php | 17 +- .../Shopware/Components/Thumbnail/Manager.php | 17 +- engine/Shopware/Components/Translation.php | 17 +- .../Translation/ObjectTranslator.php | 17 +- .../SwapProductVariantTranslationService.php | 17 +- ...ductVariantTranslationServiceInterface.php | 17 +- .../Components/UploadMaxSizeException.php | 17 +- .../Components/UploadMaxSizeValidator.php | 17 +- .../Components/Validator/EmailValidator.php | 17 +- .../Validator/EmailValidatorInterface.php | 17 +- .../Components/Validator/NoUrlValidator.php | 17 +- .../Validator/NoUrlValidatorInterface.php | 17 +- .../Validator/UserNameValidator.php | 17 +- .../Validator/UserNameValidatorInterface.php | 17 +- engine/Shopware/Components/WebLinkManager.php | 17 +- engine/Shopware/Configs/Default.php | 17 +- engine/Shopware/Configs/smarty_functions.php | 17 +- engine/Shopware/Controllers/Api/Addresses.php | 17 +- engine/Shopware/Controllers/Api/Articles.php | 17 +- engine/Shopware/Controllers/Api/Caches.php | 17 +- .../Shopware/Controllers/Api/Categories.php | 17 +- engine/Shopware/Controllers/Api/Countries.php | 17 +- .../Controllers/Api/CustomerGroups.php | 17 +- .../Controllers/Api/CustomerStreams.php | 17 +- engine/Shopware/Controllers/Api/Customers.php | 17 +- engine/Shopware/Controllers/Api/Error.php | 18 +- .../Controllers/Api/GenerateArticleImages.php | 17 +- .../Controllers/Api/Manufacturers.php | 17 +- engine/Shopware/Controllers/Api/Media.php | 17 +- engine/Shopware/Controllers/Api/Orders.php | 17 +- .../Controllers/Api/PaymentMethods.php | 17 +- .../Controllers/Api/PropertyGroups.php | 17 +- engine/Shopware/Controllers/Api/Rest.php | 17 +- engine/Shopware/Controllers/Api/Shops.php | 17 +- .../Shopware/Controllers/Api/Translations.php | 17 +- engine/Shopware/Controllers/Api/Users.php | 17 +- engine/Shopware/Controllers/Api/Variants.php | 17 +- engine/Shopware/Controllers/Api/Version.php | 22 +-- .../Shopware/Controllers/Backend/Address.php | 17 +- .../Controllers/Backend/Analytics.php | 18 +- .../Controllers/Backend/Application.php | 17 +- .../Shopware/Controllers/Backend/Article.php | 17 +- .../Controllers/Backend/ArticleList.php | 17 +- .../Backend/ArticlePriceVariation.php | 17 +- .../Shopware/Controllers/Backend/Banner.php | 17 +- engine/Shopware/Controllers/Backend/Base.php | 17 +- engine/Shopware/Controllers/Backend/Blog.php | 17 +- .../Controllers/Backend/CSRFToken.php | 18 +- engine/Shopware/Controllers/Backend/Cache.php | 39 +--- .../Controllers/Backend/CanceledOrder.php | 17 +- .../Shopware/Controllers/Backend/Category.php | 17 +- .../Shopware/Controllers/Backend/Config.php | 17 +- .../Controllers/Backend/CoreLicense.php | 17 +- .../Controllers/Backend/CustomFacet.php | 17 +- .../Controllers/Backend/CustomSorting.php | 17 +- .../Shopware/Controllers/Backend/Customer.php | 17 +- .../Controllers/Backend/CustomerQuickView.php | 17 +- .../Controllers/Backend/CustomerStream.php | 17 +- .../Shopware/Controllers/Backend/Document.php | 17 +- .../Shopware/Controllers/Backend/Emotion.php | 17 +- .../Controllers/Backend/EmotionPreset.php | 17 +- engine/Shopware/Controllers/Backend/Error.php | 17 +- .../Shopware/Controllers/Backend/Export.php | 17 +- engine/Shopware/Controllers/Backend/ExtJs.php | 17 +- .../Controllers/Backend/FirstRunWizard.php | 17 +- .../Backend/FirstRunWizardPluginManager.php | 17 +- engine/Shopware/Controllers/Backend/Form.php | 17 +- engine/Shopware/Controllers/Backend/Index.php | 17 +- engine/Shopware/Controllers/Backend/Log.php | 17 +- .../Shopware/Controllers/Backend/Logger.php | 17 +- engine/Shopware/Controllers/Backend/Login.php | 17 +- engine/Shopware/Controllers/Backend/Mail.php | 17 +- .../Controllers/Backend/ManualSorting.php | 17 +- .../Controllers/Backend/MediaManager.php | 17 +- .../Controllers/Backend/Newsletter.php | 17 +- .../Controllers/Backend/NewsletterManager.php | 18 +- .../Controllers/Backend/Notification.php | 17 +- engine/Shopware/Controllers/Backend/Order.php | 18 +- .../Backend/OrderProductSearch.php | 17 +- .../Shopware/Controllers/Backend/Overview.php | 17 +- .../Shopware/Controllers/Backend/Partner.php | 17 +- .../Shopware/Controllers/Backend/Payment.php | 17 +- .../Controllers/Backend/Performance.php | 17 +- .../Controllers/Backend/PluginInstaller.php | 17 +- .../Controllers/Backend/PluginManager.php | 17 +- .../Shopware/Controllers/Backend/Premium.php | 17 +- .../Controllers/Backend/ProductFeed.php | 17 +- .../Controllers/Backend/ProductStream.php | 17 +- .../Shopware/Controllers/Backend/Property.php | 17 +- .../Controllers/Backend/RiskManagement.php | 17 +- .../Shopware/Controllers/Backend/Search.php | 18 +- .../Shopware/Controllers/Backend/Shipping.php | 17 +- engine/Shopware/Controllers/Backend/Site.php | 17 +- .../Shopware/Controllers/Backend/Snippet.php | 17 +- .../Shopware/Controllers/Backend/Supplier.php | 17 +- .../Controllers/Backend/Systeminfo.php | 17 +- engine/Shopware/Controllers/Backend/Theme.php | 17 +- .../Controllers/Backend/Translation.php | 17 +- .../Controllers/Backend/UpdateWizard.php | 17 +- .../Controllers/Backend/UserConfig.php | 28 +-- .../Controllers/Backend/UserManager.php | 17 +- engine/Shopware/Controllers/Backend/Vote.php | 17 +- .../Shopware/Controllers/Backend/Voucher.php | 17 +- .../Shopware/Controllers/Backend/Widgets.php | 17 +- .../Shopware/Controllers/Frontend/Account.php | 18 +- .../Shopware/Controllers/Frontend/Address.php | 17 +- .../Controllers/Frontend/AjaxSearch.php | 17 +- engine/Shopware/Controllers/Frontend/Blog.php | 17 +- .../Controllers/Frontend/Campaign.php | 26 +-- .../Controllers/Frontend/Checkout.php | 17 +- .../Shopware/Controllers/Frontend/Compare.php | 18 +- .../Controllers/Frontend/Csrftoken.php | 18 +- .../Shopware/Controllers/Frontend/Custom.php | 17 +- .../Shopware/Controllers/Frontend/Detail.php | 17 +- .../Shopware/Controllers/Frontend/Error.php | 17 +- .../Shopware/Controllers/Frontend/Forms.php | 17 +- .../Shopware/Controllers/Frontend/Index.php | 17 +- .../Shopware/Controllers/Frontend/Listing.php | 17 +- .../Shopware/Controllers/Frontend/Media.php | 22 +-- .../Controllers/Frontend/Newsletter.php | 31 ++-- engine/Shopware/Controllers/Frontend/Note.php | 18 +- .../Shopware/Controllers/Frontend/Payment.php | 17 +- .../Controllers/Frontend/Register.php | 17 +- .../Controllers/Frontend/RobotsTxt.php | 17 +- .../Shopware/Controllers/Frontend/Search.php | 17 +- .../Shopware/Controllers/Frontend/Sitemap.php | 17 +- .../Controllers/Frontend/SitemapXml.php | 17 +- .../Controllers/Frontend/Tellafriend.php | 17 +- .../Controllers/Frontend/Tracking.php | 17 +- engine/Shopware/Controllers/Widgets/Blog.php | 17 +- .../Shopware/Controllers/Widgets/Campaign.php | 17 +- .../Shopware/Controllers/Widgets/Captcha.php | 17 +- .../Shopware/Controllers/Widgets/Checkout.php | 18 +- .../Shopware/Controllers/Widgets/Compare.php | 18 +- .../Shopware/Controllers/Widgets/Emotion.php | 17 +- engine/Shopware/Controllers/Widgets/Error.php | 18 +- engine/Shopware/Controllers/Widgets/Index.php | 17 +- .../Shopware/Controllers/Widgets/Listing.php | 17 +- .../Controllers/Widgets/Recommendation.php | 28 +-- engine/Shopware/Core/sAdmin.php | 18 +- engine/Shopware/Core/sArticles.php | 17 +- engine/Shopware/Core/sArticlesComparisons.php | 17 +- engine/Shopware/Core/sBasket.php | 18 +- engine/Shopware/Core/sCategories.php | 17 +- engine/Shopware/Core/sCms.php | 17 +- engine/Shopware/Core/sCore.php | 17 +- engine/Shopware/Core/sExport.php | 17 +- engine/Shopware/Core/sMarketing.php | 17 +- engine/Shopware/Core/sOrder.php | 17 +- engine/Shopware/Core/sRewriteTable.php | 17 +- engine/Shopware/Core/sSystem.php | 17 +- engine/Shopware/Kernel.php | 17 +- .../Shopware/Models/Analytics/Repository.php | 17 +- engine/Shopware/Models/Article/Article.php | 17 +- .../Article/Configurator/Dependency.php | 17 +- .../Models/Article/Configurator/Group.php | 17 +- .../Models/Article/Configurator/Option.php | 17 +- .../Article/Configurator/PriceVariation.php | 17 +- .../Models/Article/Configurator/Set.php | 17 +- .../Article/Configurator/Template/Price.php | 17 +- .../Configurator/Template/Template.php | 17 +- engine/Shopware/Models/Article/Detail.php | 17 +- engine/Shopware/Models/Article/Download.php | 17 +- engine/Shopware/Models/Article/Element.php | 17 +- engine/Shopware/Models/Article/Esd.php | 17 +- engine/Shopware/Models/Article/EsdSerial.php | 17 +- engine/Shopware/Models/Article/Image.php | 17 +- .../Shopware/Models/Article/Image/Mapping.php | 17 +- engine/Shopware/Models/Article/Image/Rule.php | 17 +- engine/Shopware/Models/Article/Link.php | 17 +- .../Shopware/Models/Article/Notification.php | 17 +- engine/Shopware/Models/Article/Price.php | 17 +- engine/Shopware/Models/Article/Repository.php | 17 +- .../Shopware/Models/Article/SeoCategory.php | 17 +- engine/Shopware/Models/Article/Supplier.php | 17 +- .../Models/Article/SupplierRepository.php | 17 +- engine/Shopware/Models/Article/Unit.php | 17 +- engine/Shopware/Models/Article/Vote.php | 17 +- .../Models/Attribute/Configuration.php | 17 +- engine/Shopware/Models/Banner/Banner.php | 17 +- engine/Shopware/Models/Banner/Repository.php | 17 +- engine/Shopware/Models/Blog/Blog.php | 17 +- engine/Shopware/Models/Blog/Comment.php | 17 +- engine/Shopware/Models/Blog/Media.php | 17 +- engine/Shopware/Models/Blog/Repository.php | 17 +- engine/Shopware/Models/Blog/Tag.php | 17 +- engine/Shopware/Models/Category/Category.php | 17 +- .../Models/Category/ManualSorting.php | 17 +- .../Shopware/Models/Category/Repository.php | 17 +- .../Models/CommentConfirm/CommentConfirm.php | 17 +- .../Models/CommentConfirm/Repository.php | 17 +- engine/Shopware/Models/Config/Element.php | 17 +- .../Models/Config/ElementTranslation.php | 17 +- engine/Shopware/Models/Config/Form.php | 17 +- .../Models/Config/FormTranslation.php | 17 +- engine/Shopware/Models/Config/Value.php | 17 +- engine/Shopware/Models/Country/Area.php | 17 +- engine/Shopware/Models/Country/Country.php | 17 +- engine/Shopware/Models/Country/Repository.php | 17 +- engine/Shopware/Models/Country/State.php | 17 +- engine/Shopware/Models/Customer/Address.php | 17 +- .../Models/Customer/AddressRepository.php | 17 +- engine/Shopware/Models/Customer/Customer.php | 17 +- engine/Shopware/Models/Customer/Discount.php | 17 +- engine/Shopware/Models/Customer/Group.php | 17 +- .../Shopware/Models/Customer/PaymentData.php | 17 +- .../Models/Customer/PaymentDataRepository.php | 17 +- .../Shopware/Models/Customer/PriceGroup.php | 17 +- .../Shopware/Models/Customer/Repository.php | 17 +- .../Models/CustomerStream/CustomerStream.php | 17 +- .../CustomerStreamRepository.php | 17 +- .../CustomerStreamRepositoryInterface.php | 17 +- .../Models/CustomerStream/Mapping.php | 17 +- engine/Shopware/Models/Dispatch/Dispatch.php | 17 +- engine/Shopware/Models/Dispatch/Holiday.php | 17 +- .../Shopware/Models/Dispatch/Repository.php | 17 +- .../Shopware/Models/Dispatch/ShippingCost.php | 17 +- .../Models/Document/Data/OrderData.php | 17 +- engine/Shopware/Models/Document/Document.php | 17 +- engine/Shopware/Models/Document/Element.php | 17 +- engine/Shopware/Models/Document/Order.php | 17 +- engine/Shopware/Models/Emotion/Data.php | 17 +- engine/Shopware/Models/Emotion/Element.php | 17 +- .../Models/Emotion/ElementViewport.php | 17 +- engine/Shopware/Models/Emotion/Emotion.php | 17 +- .../Shopware/Models/Emotion/LandingPage.php | 17 +- .../Models/Emotion/Library/Component.php | 17 +- .../Shopware/Models/Emotion/Library/Field.php | 17 +- engine/Shopware/Models/Emotion/Preset.php | 17 +- .../Models/Emotion/PresetTranslation.php | 17 +- engine/Shopware/Models/Emotion/Repository.php | 17 +- engine/Shopware/Models/Emotion/Template.php | 17 +- engine/Shopware/Models/Form/Field.php | 17 +- engine/Shopware/Models/Form/Form.php | 17 +- engine/Shopware/Models/Form/Repository.php | 17 +- engine/Shopware/Models/Log/Log.php | 17 +- engine/Shopware/Models/Mail/Attachment.php | 17 +- engine/Shopware/Models/Mail/Contact.php | 17 +- engine/Shopware/Models/Mail/File.php | 17 +- engine/Shopware/Models/Mail/Log.php | 17 +- engine/Shopware/Models/Mail/LogRepository.php | 17 +- .../Models/Mail/LogRepositoryInterface.php | 17 +- engine/Shopware/Models/Mail/Mail.php | 17 +- engine/Shopware/Models/Mail/Repository.php | 17 +- engine/Shopware/Models/Media/Album.php | 17 +- engine/Shopware/Models/Media/Media.php | 17 +- .../Shopware/Models/Media/MediaSubscriber.php | 17 +- engine/Shopware/Models/Media/Repository.php | 17 +- engine/Shopware/Models/Media/Settings.php | 17 +- engine/Shopware/Models/Menu/Menu.php | 17 +- engine/Shopware/Models/Menu/Repository.php | 17 +- engine/Shopware/Models/MultiEdit/Backup.php | 17 +- engine/Shopware/Models/MultiEdit/Filter.php | 17 +- engine/Shopware/Models/MultiEdit/Queue.php | 17 +- .../Models/MultiEdit/QueueArticle.php | 17 +- .../Shopware/Models/MultiEdit/Repository.php | 17 +- engine/Shopware/Models/Newsletter/Address.php | 17 +- .../Models/Newsletter/ContactData.php | 17 +- .../Shopware/Models/Newsletter/Container.php | 17 +- .../Newsletter/ContainerType/Article.php | 17 +- .../Newsletter/ContainerType/Banner.php | 17 +- .../Models/Newsletter/ContainerType/Link.php | 17 +- .../Models/Newsletter/ContainerType/Text.php | 17 +- engine/Shopware/Models/Newsletter/Group.php | 17 +- .../Shopware/Models/Newsletter/Newsletter.php | 17 +- .../Shopware/Models/Newsletter/Repository.php | 17 +- engine/Shopware/Models/Newsletter/Sender.php | 17 +- engine/Shopware/Models/Order/Basket.php | 17 +- engine/Shopware/Models/Order/Billing.php | 17 +- engine/Shopware/Models/Order/Detail.php | 17 +- engine/Shopware/Models/Order/DetailStatus.php | 17 +- .../Models/Order/Document/Document.php | 17 +- .../Models/Order/Document/Repository.php | 17 +- engine/Shopware/Models/Order/Esd.php | 17 +- engine/Shopware/Models/Order/History.php | 17 +- engine/Shopware/Models/Order/Number.php | 17 +- engine/Shopware/Models/Order/Order.php | 17 +- .../Models/Order/OrderHistorySubscriber.php | 17 +- engine/Shopware/Models/Order/Repository.php | 17 +- engine/Shopware/Models/Order/Shipping.php | 17 +- engine/Shopware/Models/Order/Status.php | 17 +- engine/Shopware/Models/Partner/Partner.php | 17 +- engine/Shopware/Models/Partner/Repository.php | 17 +- engine/Shopware/Models/Payment/Payment.php | 17 +- .../Models/Payment/PaymentInstance.php | 17 +- .../Payment/PaymentInstanceRepository.php | 17 +- engine/Shopware/Models/Payment/Repository.php | 17 +- engine/Shopware/Models/Payment/RuleSet.php | 17 +- engine/Shopware/Models/Plugin/License.php | 17 +- engine/Shopware/Models/Plugin/Plugin.php | 17 +- engine/Shopware/Models/Premium/Premium.php | 17 +- engine/Shopware/Models/Premium/Repository.php | 17 +- engine/Shopware/Models/Price/Discount.php | 17 +- engine/Shopware/Models/Price/Group.php | 17 +- .../Models/ProductFeed/ProductFeed.php | 17 +- .../Models/ProductFeed/Repository.php | 17 +- .../Models/ProductStream/ProductStream.php | 17 +- engine/Shopware/Models/Property/Group.php | 17 +- engine/Shopware/Models/Property/Option.php | 17 +- engine/Shopware/Models/Property/Relation.php | 17 +- .../Shopware/Models/Property/Repository.php | 17 +- engine/Shopware/Models/Property/Value.php | 17 +- engine/Shopware/Models/Search/CustomFacet.php | 17 +- .../Shopware/Models/Search/CustomSorting.php | 17 +- engine/Shopware/Models/Shop/Currency.php | 17 +- engine/Shopware/Models/Shop/DetachedShop.php | 17 +- .../Exception/ShopCurrencyNotSetException.php | 17 +- .../Exception/ShopLocaleNotSetException.php | 17 +- engine/Shopware/Models/Shop/Locale.php | 17 +- engine/Shopware/Models/Shop/Repository.php | 17 +- engine/Shopware/Models/Shop/Shop.php | 17 +- engine/Shopware/Models/Shop/Template.php | 17 +- .../Models/Shop/TemplateConfig/Element.php | 17 +- .../Models/Shop/TemplateConfig/Layout.php | 17 +- .../Models/Shop/TemplateConfig/Set.php | 17 +- .../Models/Shop/TemplateConfig/Value.php | 17 +- engine/Shopware/Models/Site/Group.php | 17 +- engine/Shopware/Models/Site/Repository.php | 17 +- engine/Shopware/Models/Site/Site.php | 17 +- engine/Shopware/Models/Sitemap/CustomUrl.php | 17 +- .../Shopware/Models/Sitemap/ExcludedUrl.php | 17 +- engine/Shopware/Models/Snippet/Snippet.php | 17 +- .../Models/Snippet/SnippetRepository.php | 17 +- engine/Shopware/Models/Tax/Repository.php | 17 +- engine/Shopware/Models/Tax/Rule.php | 17 +- engine/Shopware/Models/Tax/Tax.php | 17 +- engine/Shopware/Models/Theme/Settings.php | 17 +- .../Models/Tracking/ArticleImpression.php | 17 +- engine/Shopware/Models/Tracking/Banner.php | 17 +- .../Shopware/Models/Tracking/Repository.php | 17 +- .../Models/Translation/Translation.php | 17 +- engine/Shopware/Models/User/Privilege.php | 17 +- engine/Shopware/Models/User/Repository.php | 17 +- engine/Shopware/Models/User/Resource.php | 17 +- engine/Shopware/Models/User/Role.php | 17 +- engine/Shopware/Models/User/Rule.php | 17 +- engine/Shopware/Models/User/User.php | 17 +- engine/Shopware/Models/Voucher/Code.php | 17 +- engine/Shopware/Models/Voucher/Repository.php | 17 +- engine/Shopware/Models/Voucher/Voucher.php | 17 +- engine/Shopware/Models/Widget/View.php | 17 +- engine/Shopware/Models/Widget/Widget.php | 17 +- .../Default/Backend/Auth/Bootstrap.php | 17 +- .../Default/Backend/SwagUpdate/Bootstrap.php | 18 +- .../SwagUpdate/Components/Archive/Adapter.php | 17 +- .../Components/Archive/Entry/Zip.php | 17 +- .../SwagUpdate/Components/Archive/Zip.php | 17 +- .../SwagUpdate/Components/CheckInterface.php | 17 +- .../Checks/EmotionTemplateCheck.php | 17 +- .../Components/Checks/LicenseCheck.php | 17 +- .../Components/Checks/MySQLVersionCheck.php | 17 +- .../Components/Checks/PHPExtensionCheck.php | 17 +- .../Components/Checks/PHPVersionCheck.php | 17 +- .../Components/Checks/RegexCheck.php | 17 +- .../Components/Checks/WritableCheck.php | 17 +- .../SwagUpdate/Components/Download.php | 17 +- .../Exception/ApiLimitExceededException.php | 17 +- .../Exception/ExtensionMissingException.php | 17 +- .../ReleasePackageNotFoundException.php | 17 +- .../UpdatePackageNotFoundException.php | 17 +- .../Components/ExtJsResultMapper.php | 17 +- .../SwagUpdate/Components/FileSystem.php | 17 +- .../SwagUpdate/Components/PluginCheck.php | 17 +- .../Components/Steps/DownloadStep.php | 17 +- .../Components/Steps/ErrorResult.php | 17 +- .../Components/Steps/FinishResult.php | 17 +- .../Components/Steps/UnpackStep.php | 17 +- .../Components/Steps/ValidResult.php | 17 +- .../SwagUpdate/Components/Struct/Struct.php | 17 +- .../SwagUpdate/Components/Struct/Version.php | 17 +- .../SwagUpdate/Components/UpdateCheck.php | 17 +- .../SwagUpdate/Components/Validation.php | 17 +- .../Controllers/Backend/SwagUpdate.php | 17 +- .../Default/Core/ControllerBase/Bootstrap.php | 17 +- .../Plugins/Default/Core/Cron/Bootstrap.php | 18 +- .../Plugins/Default/Core/Cron/Cron.php | 17 +- .../Default/Core/CronBirthday/Bootstrap.php | 17 +- .../Core/CronProductExport/Bootstrap.php | 17 +- .../Default/Core/CronRating/Bootstrap.php | 17 +- .../Default/Core/CronStock/Bootstrap.php | 17 +- .../Default/Core/ErrorHandler/Bootstrap.php | 17 +- .../Default/Core/HttpCache/Bootstrap.php | 17 +- .../Default/Core/HttpCache/CacheControl.php | 17 +- .../Core/HttpCache/CacheIdCollector.php | 17 +- .../Core/MarketingAggregate/Bootstrap.php | 17 +- .../Components/AlsoBought.php | 17 +- .../Components/SimilarShown.php | 17 +- .../Components/TopSeller.php | 17 +- .../Controllers/AlsoBought.php | 18 +- .../Controllers/SimilarShown.php | 17 +- .../Controllers/TopSeller.php | 17 +- .../Core/PasswordEncoder/Bootstrap.php | 17 +- .../Default/Core/PaymentMethods/Bootstrap.php | 17 +- .../Components/BasePaymentMethod.php | 17 +- .../Components/DebitPaymentMethod.php | 17 +- .../Components/GenericPaymentMethod.php | 17 +- .../Components/SepaPaymentMethod.php | 17 +- .../Default/Core/PostFilter/Bootstrap.php | 17 +- .../Default/Core/RebuildIndex/Bootstrap.php | 17 +- .../Core/RebuildIndex/Components/SeoIndex.php | 17 +- .../RebuildIndex/Controllers/SearchIndex.php | 17 +- .../Core/RebuildIndex/Controllers/Seo.php | 17 +- .../Default/Core/RestApi/Bootstrap.php | 17 +- .../RestApi/Components/BasicAuthResolver.php | 17 +- .../Core/RestApi/Components/Router.php | 17 +- .../RestApi/Components/StaticResolver.php | 17 +- .../Plugins/Default/Core/Router/Bootstrap.php | 17 +- .../Plugins/Default/Core/System/Bootstrap.php | 17 +- .../Core/ViewportForward/Bootstrap.php | 17 +- .../Frontend/AdvancedMenu/Bootstrap.php | 17 +- .../Frontend/CronRefresh/Bootstrap.php | 17 +- .../Frontend/InputFilter/Bootstrap.php | 17 +- .../Frontend/Notification/Bootstrap.php | 17 +- .../Frontend/RouterRewrite/Bootstrap.php | 17 +- .../Default/Frontend/Seo/Bootstrap.php | 17 +- .../Default/Frontend/Statistics/Bootstrap.php | 17 +- .../Default/Frontend/TagCloud/Bootstrap.php | 17 +- engine/Shopware/Shopware.php | 17 +- recovery/common/autoload.php | 17 +- recovery/common/functions.php | 17 +- recovery/common/src/Archive/Adapter.php | 17 +- recovery/common/src/Archive/Entry/Zip.php | 17 +- recovery/common/src/Archive/Zip.php | 17 +- .../src/DependencyInjection/Container.php | 17 +- .../ContainerInterface.php | 17 +- recovery/common/src/DumpIterator.php | 17 +- recovery/common/src/HttpClient/Client.php | 17 +- .../common/src/HttpClient/ClientException.php | 17 +- recovery/common/src/HttpClient/CurlClient.php | 17 +- recovery/common/src/HttpClient/Response.php | 17 +- recovery/common/src/IOHelper.php | 17 +- .../common/src/Middelware/XssMiddleware.php | 17 +- recovery/common/src/Service/Notification.php | 17 +- .../common/src/Service/UniqueIdGenerator.php | 17 +- .../common/src/Service/UniqueIdPersister.php | 17 +- recovery/common/src/SystemLocker.php | 17 +- recovery/common/src/Utils.php | 17 +- recovery/install/check.php | 17 +- recovery/install/config/production.php | 17 +- recovery/install/data/lang/de.php | 17 +- recovery/install/data/lang/en.php | 17 +- recovery/install/data/lang/es.php | 17 +- recovery/install/data/lang/fr.php | 17 +- recovery/install/data/lang/it.php | 17 +- recovery/install/data/lang/nl.php | 17 +- recovery/install/data/lang/pl.php | 17 +- recovery/install/data/lang/pt.php | 17 +- recovery/install/index.php | 17 +- recovery/install/ping.php | 17 +- .../install/src/Command/InstallCommand.php | 17 +- recovery/install/src/Console/Application.php | 17 +- recovery/install/src/ContainerProvider.php | 17 +- recovery/install/src/DatabaseFactory.php | 17 +- recovery/install/src/DatabaseInteractor.php | 17 +- recovery/install/src/MenuHelper.php | 17 +- recovery/install/src/Requirements.php | 17 +- recovery/install/src/RequirementsPath.php | 17 +- .../install/src/RequirementsPathResult.php | 17 +- recovery/install/src/Service/AdminService.php | 17 +- recovery/install/src/Service/ConfigWriter.php | 17 +- .../install/src/Service/CurrencyService.php | 17 +- .../install/src/Service/DatabaseService.php | 17 +- .../Exceptions/LicenseHostException.php | 17 +- .../Exceptions/LicenseInvalidException.php | 17 +- .../Exceptions/LicenseProductKeyException.php | 17 +- .../install/src/Service/LicenseInstaller.php | 17 +- .../src/Service/LicenseUnpackService.php | 17 +- .../src/Service/LocalLicenseUnpackService.php | 17 +- .../src/Service/LocaleSettingsService.php | 17 +- recovery/install/src/Service/ShopService.php | 17 +- recovery/install/src/Service/ThemeService.php | 17 +- .../src/Service/TranslationService.php | 17 +- .../install/src/Service/WebserverCheck.php | 17 +- recovery/install/src/Struct/AdminUser.php | 17 +- recovery/install/src/Struct/Currency.php | 17 +- .../Struct/DatabaseConnectionInformation.php | 17 +- .../install/src/Struct/LicenseInformation.php | 17 +- .../src/Struct/LicenseUnpackRequest.php | 17 +- recovery/install/src/Struct/Locale.php | 17 +- recovery/install/src/Struct/Shop.php | 17 +- .../install/src/Struct/ShopwareEdition.php | 17 +- .../ShopwareEditionValidationRequest.php | 17 +- recovery/install/src/Struct/Struct.php | 17 +- recovery/install/src/app.php | 17 +- .../Install/Command/InstallCommandTest.php | 17 +- .../tests/Traits/InstallCommandTestTrait.php | 17 +- recovery/tests/Unit/XssMiddlewareTest.php | 17 +- recovery/tests/bootstrap.php | 17 +- recovery/update/config/config.php | 17 +- recovery/update/data/lang/de.php | 17 +- recovery/update/data/lang/en.php | 17 +- recovery/update/data/lang/nl.php | 17 +- recovery/update/index.php | 17 +- recovery/update/src/Cleanup.php | 17 +- recovery/update/src/CleanupFilesFinder.php | 17 +- recovery/update/src/Command/UpdateCommand.php | 17 +- recovery/update/src/Console/Application.php | 17 +- .../update/src/Controller/BatchController.php | 17 +- .../src/Controller/CleanupController.php | 17 +- .../src/Controller/RequirementsController.php | 17 +- .../src/DependencyInjection/Container.php | 17 +- recovery/update/src/DummyPluginFinder.php | 17 +- recovery/update/src/FilePermissionChanger.php | 17 +- recovery/update/src/FilesystemFactory.php | 17 +- recovery/update/src/PathBuilder.php | 17 +- recovery/update/src/PluginCheck.php | 17 +- recovery/update/src/Results/DeleteResult.php | 17 +- recovery/update/src/Steps/ErrorResult.php | 17 +- recovery/update/src/Steps/FinishResult.php | 17 +- recovery/update/src/Steps/MigrationStep.php | 17 +- recovery/update/src/Steps/ResultMapper.php | 17 +- recovery/update/src/Steps/SnippetStep.php | 17 +- recovery/update/src/Steps/UnpackStep.php | 17 +- recovery/update/src/Steps/ValidResult.php | 17 +- recovery/update/src/StoreApi.php | 17 +- recovery/update/src/Struct/Struct.php | 17 +- recovery/update/src/Struct/Version.php | 17 +- recovery/update/src/UpdateHtaccess.php | 17 +- recovery/update/src/Utils.php | 17 +- recovery/update/src/app.php | 17 +- shopware.php | 17 +- tests/Functional/Api/AbstractApiTestCase.php | 17 +- tests/Functional/Api/ArticleTest.php | 17 +- tests/Functional/Api/CategoryTest.php | 17 +- tests/Functional/Api/CustomerGroupTest.php | 17 +- tests/Functional/Api/CustomerTest.php | 17 +- .../Api/GenerateArticleImagesTest.php | 17 +- tests/Functional/Api/HttpKernelBrowser.php | 17 +- tests/Functional/Api/ManufacturerTest.php | 17 +- tests/Functional/Api/MediaTest.php | 17 +- tests/Functional/Api/OrderTest.php | 17 +- tests/Functional/Api/PaymentMethodsTest.php | 17 +- tests/Functional/Api/VersionTest.php | 17 +- .../AccountBundle/Controller/AccountTest.php | 17 +- .../AccountBundle/Controller/AddressTest.php | 17 +- .../AccountBundle/Controller/RegisterTest.php | 17 +- .../Service/AddressServiceTest.php | 17 +- .../Service/CustomerServiceTest.php | 17 +- .../Service/CustomerUnlockServiceTest.php | 17 +- .../Service/RegisterServiceTest.php | 17 +- .../Bundle/AttributeBundle/DataLoaderTest.php | 17 +- .../Repository/CustomerRepositoryTest.php | 17 +- .../Repository/OrderRepositoryTest.php | 17 +- .../Repository/Reader/OrderReaderTest.php | 17 +- .../AttributeBundle/SchemaOperatorTest.php | 17 +- .../FieldResolver/MediaResolverTest.php | 17 +- .../FieldResolver/ProductResolverTest.php | 17 +- .../FieldResolver/ShopResolverTest.php | 17 +- .../Services/AclSynchronizerTest.php | 17 +- .../ContentTypeCleanupServiceTest.php | 17 +- .../Services/ExtjsBuilderTest.php | 17 +- .../ControllerBundle/ControllerActionTest.php | 17 +- .../ControllerBundle/TestController/Test.php | 17 +- .../ControllerBundle/TestService/FooBar.php | 17 +- .../Services/CookieCollectorTest.php | 17 +- .../Services/CookieHandlerTest.php | 17 +- .../Services/CookieRemoveHandlerTest.php | 17 +- .../AccountModeConditionHandlerTest.php | 17 +- .../AgeConditionHandlerTest.php | 17 +- .../CustomerAttributeConditionHandlerTest.php | 17 +- ...AddressWithCountryConditionHandlerTest.php | 17 +- .../HasCanceledOrdersConditionHandlerTest.php | 17 +- ...letterRegistrationConditionHandlerTest.php | 17 +- ...AddressWithCountryConditionHandlerTest.php | 17 +- ...asNoCanceledOrdersConditionHandlerTest.php | 17 +- ...letterRegistrationConditionHandlerTest.php | 17 +- .../HasOrderCountConditionHandlerTest.php | 17 +- ...asTotalOrderAmountConditionHandlerTest.php | 17 +- .../IsCustomerSinceConditionHandlerTest.php | 17 +- .../IsInCustomerGroupConditionHandlerTest.php | 17 +- ...NotInCustomerGroupConditionHandlerTest.php | 17 +- ...tOrderedInLastDaysConditionHandlerTest.php | 17 +- .../NotOrderedInShopConditionHandlerTest.php | 17 +- .../NotOrderedProductConditionHandlerTest.php | 17 +- ...dProductOfCategoryConditionHandlerTest.php | 17 +- ...ductOfManufacturerConditionHandlerTest.php | 17 +- ...rderedWithDeliveryConditionHandlerTest.php | 17 +- ...OrderedWithPaymentConditionHandlerTest.php | 17 +- ...otRegisteredInShopConditionHandlerTest.php | 17 +- .../NotSalutationConditionHandlerTest.php | 17 +- .../OrderedAtWeekdayConditionHandlerTest.php | 17 +- .../OrderedInLastDaysConditionHandlerTest.php | 17 +- .../OrderedInShopConditionHandlerTest.php | 17 +- .../OrderedOnDeviceConditionHandlerTest.php | 17 +- .../OrderedProductConditionHandlerTest.php | 17 +- ...dProductOfCategoryConditionHandlerTest.php | 17 +- ...ductOfManufacturerConditionHandlerTest.php | 17 +- ...rderedWithDeliveryConditionHandlerTest.php | 17 +- ...OrderedWithPaymentConditionHandlerTest.php | 17 +- .../RegisteredInShopConditionHandlerTest.php | 17 +- .../SalutationConditionHandlerTest.php | 17 +- .../SearchTermConditionHandlerTest.php | 17 +- .../CustomerNumberSearchTest.php | 17 +- .../HandlerRegistryTest.php | 17 +- .../PaginationTest.php | 17 +- .../SearchResultTest.php | 17 +- .../CustomerSearchBundleDBAL/TestCase.php | 17 +- .../ESIndexingBundle/BacklogProcessorTest.php | 17 +- .../CombinedConditionQueryBuilderTest.php | 17 +- .../Commands/BacklogSyncCommandTest.php | 17 +- .../Commands/IndexPopulateCommandTest.php | 17 +- .../ProductListingVariationLoaderTest.php | 18 +- .../Property/PropertyQueryFactoryTest.php | 17 +- .../Subscriber/ORMBacklogSubscriberTest.php | 17 +- .../TextMapping/TextMappingTest.php | 17 +- .../ContentTypeComponentHandlerTest.php | 17 +- .../EventComponentHandlerTest.php | 17 +- .../ProductSliderComponentHandlerTest.php | 17 +- .../Bundle/EsBackendBundle/BacklogTest.php | 17 +- .../Customer/CustomerIndexingTest.php | 17 +- .../Bundle/MailBundle/LogEntryBuilderTest.php | 17 +- .../MailBundle/LogEntryMailBuilderTest.php | 17 +- .../Bundle/MailBundle/LogRepositoryTest.php | 17 +- .../Bundle/MailBundle/LogServiceTest.php | 17 +- .../Bundle/MailBundle/MailBundleTestTrait.php | 17 +- .../Bundle/MediaBundle/FilesystemTest.php | 17 +- .../GarbageCollectorFactoryTest.php | 17 +- .../MediaBundle/MediaReplaceServiceTest.php | 17 +- .../OrderBundle/OrderListProductService.php | 17 +- .../Bundle/OrderBundle/StockServiceTest.php | 17 +- .../Fixture/MyPlugin/MyPlugin.php | 17 +- .../Service/PluginInstallerTest.php | 17 +- .../Service/PluginLocalServiceTest.php | 17 +- .../Service/SubscriptionServiceTest.php | 17 +- .../Service/UniqueIdGeneratorTest.php | 17 +- .../BatchProductNumberSearchTest.php | 17 +- .../SearchBundle/BatchProductSearchTest.php | 17 +- .../Condition/CategoryConditionTest.php | 17 +- .../Condition/CustomerGroupConditionTest.php | 17 +- ...sPseudoPriceConditionCustomerGroupTest.php | 17 +- .../Condition/HasPseudoPriceConditionTest.php | 17 +- .../ImmediateDeliveryConditionTest.php | 17 +- .../Condition/IsNewConditionTest.php | 17 +- .../Condition/ManufacturerConditionTest.php | 17 +- .../Condition/OrderNumberConditionTest.php | 17 +- .../Condition/PriceConditionTest.php | 17 +- .../ProductAttributeConditionTest.php | 17 +- .../Condition/PropertyConditionTest.php | 17 +- .../Condition/SalesConditionTest.php | 17 +- .../Condition/SearchTermConditionTest.php | 17 +- .../Condition/ShippingFreeConditionTest.php | 17 +- .../Condition/SimilarProductConditionTest.php | 17 +- .../Condition/VariantConditionOnSaleTest.php | 17 +- .../Condition/VariantConditionTest.php | 17 +- .../VariantConditionWithCurrencyFactor.php | 17 +- .../VariantConditionWithGraduationTest.php | 17 +- .../VariantConditionWithPriceGroupTest.php | 17 +- .../Condition/VoteAverageConditionTest.php | 17 +- .../Bundle/SearchBundle/CriteriaTest.php | 17 +- .../SearchBundle/Facet/CategoryFacetTest.php | 17 +- .../Facet/ImmediateDeliveryFacetTest.php | 17 +- .../Facet/ManufacturerFacetTest.php | 17 +- .../SearchBundle/Facet/PriceFacetTest.php | 17 +- .../Facet/ProductAttributeFacetTest.php | 17 +- .../SearchBundle/Facet/PropertyFacetTest.php | 17 +- .../Facet/ShippingFreeFacetTest.php | 17 +- .../Facet/VoteAverageFacetTest.php | 17 +- .../Bundle/SearchBundle/HideNoInStockTest.php | 17 +- .../SearchBundleDBALSubscriberTest.php | 17 +- .../Sorting/ManualSortingTest.php | 17 +- .../Sorting/PopularitySortingTest.php | 17 +- .../SearchBundle/Sorting/PriceSortingTest.php | 17 +- .../Sorting/ProductAttributeSortingTest.php | 17 +- .../Sorting/ProductNameSortingTest.php | 17 +- .../Sorting/ProductNumberSortingTest.php | 17 +- .../Sorting/ReleaseDateSortingTest.php | 17 +- .../FacetHandler/PropertyFacetHandlerTest.php | 17 +- .../SearchBundleDBAL/SearchIndexerTest.php | 17 +- .../SearchTerm/SearchTermQueryBuilderTest.php | 17 +- .../ProductAttributeConditionHandlerTest.php | 18 +- .../ProductAttributeFacetHandlerTest.php | 18 +- .../FacetHandler/_fixtures/ElasticResult.php | 18 +- .../Provider/CategoryUrlProviderTest.php | 17 +- .../Provider/CustomUrlProviderTest.php | 17 +- .../Bundle/SitemapBundle/SitemapLockTest.php | 17 +- .../Bundle/StoreFrontBundle/BasePriceTest.php | 17 +- .../StoreFrontBundle/CategoryServiceTest.php | 17 +- .../StoreFrontBundle/CheapestPriceTest.php | 17 +- .../ConfiguratorServiceTest.php | 17 +- .../StoreFrontBundle/ConfiguratorTest.php | 17 +- .../Bundle/StoreFrontBundle/Converter.php | 17 +- .../Bundle/StoreFrontBundle/CoverTest.php | 17 +- .../Bundle/StoreFrontBundle/DownloadTest.php | 17 +- .../Gateway/Dbal/ConfiguratorGatewayTest.php | 17 +- .../Gateway/Dbal/CountryGatewayTest.php | 17 +- .../StoreFrontBundle/GraduatedPricesTest.php | 17 +- .../Bundle/StoreFrontBundle/Helper.php | 17 +- .../Helper/ProgressHelper.php | 17 +- .../Bundle/StoreFrontBundle/HrefLangTest.php | 17 +- .../StoreFrontBundle/ListProductTest.php | 17 +- .../StoreFrontBundle/ManufacturerTest.php | 17 +- .../StoreFrontBundle/PriceCalculationTest.php | 17 +- .../StoreFrontBundle/ProductMediaTest.php | 17 +- .../StoreFrontBundle/PropertyHydratorTest.php | 17 +- .../StoreFrontBundle/SimilarProductsTest.php | 17 +- .../Bundle/StoreFrontBundle/TestCase.php | 17 +- .../Bundle/StoreFrontBundle/TestContext.php | 17 +- .../StoreFrontBundle/TranslationTest.php | 17 +- .../Bundle/StoreFrontBundle/VoteTest.php | 17 +- .../Commands/ConfigSetCommandTest.php | 17 +- .../Commands/PluginListCommandTest.php | 17 +- .../Commands/RefreshSearchIndexTest.php | 17 +- tests/Functional/Components/AclTest.php | 17 +- .../Functional/Components/Api/AddressTest.php | 17 +- .../Functional/Components/Api/ArticleTest.php | 17 +- tests/Functional/Components/Api/CacheTest.php | 17 +- .../Components/Api/CategoryTest.php | 17 +- .../Functional/Components/Api/CountryTest.php | 17 +- .../Components/Api/CustomerGroupTest.php | 17 +- .../Components/Api/CustomerStreamTest.php | 17 +- .../Components/Api/CustomerTest.php | 17 +- .../Components/Api/EmotionPresetTest.php | 17 +- .../Components/Api/ManufacturerTest.php | 17 +- tests/Functional/Components/Api/MediaTest.php | 17 +- tests/Functional/Components/Api/OrderTest.php | 17 +- .../Components/Api/PropertyGroupTest.php | 17 +- .../Components/Api/ResourceTest.php | 17 +- tests/Functional/Components/Api/ShopTest.php | 17 +- tests/Functional/Components/Api/TestCase.php | 17 +- .../Components/Api/TranslationTest.php | 17 +- tests/Functional/Components/Api/UserTest.php | 17 +- .../Functional/Components/Api/VariantTest.php | 17 +- .../Components/Api/fixtures/base64image.php | 17 +- .../Components/Auth/Adapter/DefaultTest.php | 17 +- .../Components/Auth/Constraint/NoUrlTest.php | 17 +- .../Auth/Constraint/NoUrlValidatorTest.php | 18 +- tests/Functional/Components/AuthTest.php | 17 +- .../Components/CSRFTokenValidatorTest.php | 17 +- .../Components/CacheSubscriberTest.php | 17 +- .../Captcha/CaptchaRepositoryTest.php | 17 +- .../Captcha/CaptchaValidatorTest.php | 17 +- .../Components/Captcha/DefaultCaptchaTest.php | 17 +- .../Captcha/fixtures/honeypotRequest.php | 17 +- .../Components/Cart/BasketQueryHelperTest.php | 17 +- .../Cart/CalculationOnLogoutTest.php | 17 +- .../Components/Cart/CartDatabaseViewTest.php | 17 +- .../Components/Cart/CartMigrationTest.php | 17 +- .../Cart/CartOrderNumberProviderTest.php | 17 +- .../Cart/CartPersistServiceTest.php | 17 +- .../Components/Cart/CartRaceConditionTest.php | 17 +- .../Cart/CartToOrderAttributeTest.php | 17 +- .../Cart/ConditionalLineItemServiceTest.php | 17 +- .../Cart/FloatTaxCalculationTest.php | 17 +- .../Components/Cart/NetRoundingTest.php | 17 +- .../Cart/PaymentTokenServiceTest.php | 17 +- ...tionalCartCalculationCustomerGroupTest.php | 17 +- ...roportionalCartCalculationDispatchTest.php | 17 +- ...oportionalCartCalculationSurchargeTest.php | 17 +- ...ProportionalCartCalculationVoucherTest.php | 17 +- .../Cart/ProportionalTaxCalculatorTest.php | 17 +- .../Components/CheckoutTestCase.php | 17 +- .../Components/Config/ConfigTest.php | 17 +- .../Components/Config/ShopwareConfigTest.php | 17 +- .../Components/Console/ApplicationTest.php | 17 +- .../DependencyInjection/Bridge/CacheTest.php | 17 +- .../DependencyInjection/Bridge/DbTest.php | 17 +- .../ConfigureApiResourcesPassTest.php | 17 +- .../ConfigureContainerAwareCommandsTest.php | 17 +- .../Compiler/LegacyApiResourcesPassTest.php | 17 +- .../DependencyInjection/ContainerTest.php | 17 +- .../DependencyInjection/DecoratingService.php | 17 +- .../LegacyPhpDumperTest.php | 17 +- .../DependencyInjection/OriginalService.php | 17 +- .../_fixtures/PrivateTestService.php | 17 +- .../_fixtures/PublicTestService.php | 17 +- .../EmotionToPresetDataTransformerTest.php | 17 +- .../Preset/PresetDataSynchronizerTest.php | 17 +- .../Emotion/Preset/PresetInstallerTest.php | 17 +- .../Emotion/Preset/PresetLoaderTest.php | 17 +- .../HttpCache/CacheRouteInstallerTest.php | 17 +- .../LegacyRequestWrapper/GetWrapperTest.php | 17 +- .../LegacyRequestWrapper/PostWrapperTest.php | 17 +- tests/Functional/Components/MailTest.php | 17 +- .../Migrations_Migration1607Test.php | 17 +- .../Functional/Components/Model/CacheTest.php | 17 +- .../Components/Model/GeneratorTest.php | 17 +- .../MultiEdit/Resource/Product/BackupTest.php | 17 +- .../Components/NumberRangeIncrementerTest.php | 17 +- .../Components/OptinServiceTest.php | 17 +- .../Components/Plugin/BootstrapTest.php | 17 +- .../Components/Plugin/ConfigReaderTest.php | 17 +- .../Components/Plugin/ConfigWriterTest.php | 17 +- .../Plugin/FormSynchronizerTest.php | 17 +- .../Plugin/LegacyConfigReaderTest.php | 17 +- .../Plugin/LegacyConfigWriterTest.php | 17 +- .../Plugin/MenuSynchronizerTest.php | 17 +- .../Components/Plugin/PluginMigrationTest.php | 17 +- .../Functional/Components/Plugin/TestCase.php | 17 +- .../Plugin/fixtures/2-rename-foo.php | 17 +- .../Resources/migrations/1-add-foo.php | 17 +- .../Plugin/fixtures/SwagTest/SwagTest.php | 17 +- .../Components/Plugin/fixtures/TestPlugin.php | 17 +- .../ConfigDependentIpAnonymizerTest.php | 17 +- .../Privacy/CookieRemoveSubscriberTest.php | 17 +- .../Components/Privacy/IpAnonymizerTest.php | 17 +- .../Components/Privacy/PrivacyServiceTest.php | 17 +- .../ProductStream/RepositoryTest.php | 17 +- tests/Functional/Components/RandomTest.php | 17 +- .../Components/ReflectionHelperTest.php | 17 +- .../Generators/RewriteGeneratorTest.php | 17 +- .../Components/Router/RouterTest.php | 17 +- .../Components/Router/RouterTestObject.php | 17 +- .../Routing/Matchers/RewriteMatcherTest.php | 17 +- .../Components/SitePageMenuTest.php | 17 +- .../Snippet/DatabaseHandlerTest.php | 17 +- .../Snippet/SnippetStructureTest.php | 17 +- .../Components/StateTranslatorServiceTest.php | 17 +- .../StreamProtocolValidatorTest.php | 17 +- .../Components/StringCompilerTest.php | 17 +- .../Template/TemplateManagerTest.php | 17 +- .../Components/TemplateMailTest.php | 17 +- tests/Functional/Components/Theme/Base.php | 17 +- .../Components/Theme/ConfiguratorTest.php | 17 +- .../Components/Theme/InheritanceTest.php | 17 +- .../Components/Theme/InstallerTest.php | 17 +- .../Theme/Themes/TestBare/Theme.php | 17 +- .../Theme/Themes/TestResponsive/Theme.php | 17 +- .../Components/Thumbnail/ManagerTest.php | 17 +- ...apProductVariantTranslationServiceTest.php | 17 +- .../Functional/Components/TranslationTest.php | 17 +- .../_fixtures/OrdersWithoutDocument.php | 17 +- .../Controllers/Backend/AnalyticsTest.php | 17 +- .../Controllers/Backend/ApplicationTest.php | 17 +- .../Controllers/Backend/ArticleTest.php | 17 +- .../Controllers/Backend/BannerTest.php | 17 +- .../Controllers/Backend/BaseTest.php | 17 +- .../Controllers/Backend/CanceledOrderTest.php | 17 +- .../Controllers/Backend/CategoryTest.php | 17 +- .../Controllers/Backend/ConfigGetFormTest.php | 17 +- .../Controllers/Backend/ConfigTest.php | 17 +- .../Backend/ContentTypeManagerTest.php | 17 +- .../Backend/CustomerStreamTest.php | 17 +- .../Controllers/Backend/CustomerTest.php | 17 +- .../Controllers/Backend/EmotionPresetTest.php | 17 +- .../Controllers/Backend/ErrorTest.php | 17 +- .../Controllers/Backend/FormTest.php | 17 +- .../Controllers/Backend/LogTest.php | 17 +- .../Controllers/Backend/MailTest.php | 17 +- .../Controllers/Backend/MediaManagerTest.php | 17 +- .../Mock/ApplicationControllerMock.php | 17 +- .../Backend/NewsletterManagerTest.php | 17 +- .../Controllers/Backend/NewsletterTest.php | 17 +- .../Controllers/Backend/NotificationTest.php | 17 +- .../Backend/OrderProductSearchTest.php | 18 +- .../Controllers/Backend/OrderTest.php | 17 +- .../Controllers/Backend/PartnerTest.php | 17 +- .../Controllers/Backend/PaymentTest.php | 17 +- .../Controllers/Backend/PremiumTest.php | 17 +- .../Controllers/Backend/ProductFeedTest.php | 17 +- .../Backend/RiskManagementTest.php | 17 +- .../Controllers/Backend/SearchTest.php | 17 +- .../Controllers/Backend/ShippingTest.php | 17 +- .../Controllers/Backend/SupplierTest.php | 17 +- .../Controllers/Backend/SystemInfoTest.php | 17 +- .../Controllers/Backend/UserManagerTest.php | 17 +- .../Controllers/Backend/VoteTest.php | 17 +- .../Controllers/Backend/VoucherTest.php | 17 +- .../Controllers/Backend/WidgetsTest.php | 17 +- .../_assets/getProductVariantsParams.php | 17 +- .../Backend/_fixtures/article/productData.php | 17 +- .../Controllers/Frontend/AccountTest.php | 17 +- .../Controllers/Frontend/AddressTest.php | 17 +- .../Controllers/Frontend/BlogTest.php | 17 +- .../Controllers/Frontend/CheckoutTest.php | 17 +- .../Controllers/Frontend/CustomTest.php | 17 +- .../Controllers/Frontend/DetailTest.php | 17 +- .../ExpectResourceNotFoundExceptionTest.php | 17 +- .../Controllers/Frontend/FormTest.php | 17 +- .../Controllers/Frontend/ListingTest.php | 17 +- .../Frontend/RegisterWithCaptchaTest.php | 17 +- .../Frontend/ResetPasswordWithCaptchaTest.php | 17 +- .../Controllers/Frontend/RobotsTxtTest.php | 18 +- .../Controllers/Frontend/SearchTest.php | 17 +- .../Controllers/Frontend/SitemapTest.php | 17 +- .../Frontend/fixtures/captchaRequest.php | 17 +- .../Controllers/Widgets/IndexTest.php | 17 +- .../Controllers/Widgets/ListingTest.php | 17 +- .../Controllers/Widgets/Stub/TestFacet.php | 17 +- .../Controllers/Widgets/Stub/TestHydrator.php | 17 +- .../Functional/Core/AdminSGetUserDataTest.php | 17 +- tests/Functional/Core/AdminTest.php | 17 +- .../Core/BasketAddBasketAttributesTest.php | 17 +- tests/Functional/Core/BasketTest.php | 17 +- tests/Functional/Core/ExportTest.php | 17 +- tests/Functional/Core/MarketingTest.php | 17 +- tests/Functional/Core/OrderTest.php | 17 +- tests/Functional/Core/RewriteTest.php | 17 +- tests/Functional/Core/sArticlesTest.php | 17 +- .../Core/sBasketSAddVoucherTest.php | 17 +- tests/Functional/Core/sCategoriesTest.php | 17 +- tests/Functional/Core/sCmsTest.php | 17 +- tests/Functional/Core/sCoreTest.php | 17 +- tests/Functional/Helper/Utils.php | 17 +- tests/Functional/KernelStorage.php | 17 +- .../Template/Plugins/CurrencyModifierTest.php | 17 +- tests/Functional/Library/Zend/ZendDBTest.php | 17 +- .../Library/Zend/ZendLocaleTest.php | 17 +- .../Functional/Models/Article/ArticleTest.php | 17 +- .../Functional/Models/Article/DetailTest.php | 17 +- .../Models/Article/SupplierTest.php | 17 +- tests/Functional/Models/Blog/BlogTest.php | 17 +- .../BlogCategoryTreeListQueryTest.php | 17 +- .../Models/Category/PathByIdTest.php | 17 +- .../Functional/Models/Country/CountryTest.php | 17 +- .../Models/Customer/CustomerTest.php | 17 +- .../CustomerStreamRepositoryTest.php | 17 +- .../Functional/Models/Document/OrderTest.php | 17 +- .../Functional/Models/Emotion/EmotionTest.php | 17 +- tests/Functional/Models/EsdTest.php | 17 +- tests/Functional/Models/Form/FormTest.php | 17 +- tests/Functional/Models/FormTest.php | 17 +- tests/Functional/Models/LazyLoadingTest.php | 17 +- tests/Functional/Models/Mail/LogTest.php | 17 +- tests/Functional/Models/MailTest.php | 17 +- tests/Functional/Models/Order/BillingTest.php | 17 +- .../Order/OrderDocumentDocumentTest.php | 17 +- tests/Functional/Models/Order/OrderTest.php | 17 +- .../Functional/Models/Order/ShippingTest.php | 17 +- tests/Functional/Models/Order/StatusTest.php | 17 +- .../Models/Shop/ShopRepositoryTest.php | 17 +- tests/Functional/Models/Site/SiteTest.php | 17 +- tests/Functional/Models/SnippetTest.php | 17 +- tests/Functional/Models/VoucherTest.php | 17 +- tests/Functional/Models/_assets/keywords.php | 17 +- .../Acl/RemoveAndCreateResourceTest.php | 17 +- .../Articles/BasePriceCalculationTest.php | 17 +- .../Modules/Articles/CompareTest.php | 17 +- .../Modules/Articles/SeoCategoryTest.php | 17 +- .../Articles/fixtures/category_filters.php | 18 +- .../Modules/Articles/sGetArticleByIdTest.php | 17 +- .../Articles/sGetArticlesByCategoryTest.php | 17 +- .../Modules/Category/sGetCategoriesTest.php | 17 +- .../Plugins/Core/HttpCache/BootstrapTest.php | 17 +- .../HttpCache/DynamicCacheTimeServiceTest.php | 17 +- .../MarketingAggregate/AbstractMarketing.php | 17 +- .../Components/AlsoBoughtTest.php | 17 +- .../Components/SimilarShownTest.php | 17 +- .../Components/TopSellerTest.php | 17 +- .../Components/fixtures/similarShown.php | 17 +- .../Modules/ArticleTest.php | 17 +- .../Components/SepaPaymentMethodTest.php | 17 +- .../Core/RestApi/Components/RouterTest.php | 17 +- .../Plugins/Core/Router/BootstrapTest.php | 17 +- .../Plugins/Frontend/NotificationTest.php | 18 +- .../Plugins/Frontend/StatisticsTest.php | 18 +- .../Recovery/Update/UpdateHtaccessTest.php | 17 +- .../Functional/Regressions/Ticket4609Test.php | 17 +- .../Functional/Regressions/Ticket4788Test.php | 17 +- .../Functional/Regressions/Ticket5217Test.php | 17 +- .../Validator/CustomerValidatorTest.php | 17 +- tests/Functional/TestKernel.php | 18 +- tests/Functional/Traits/ContainerTrait.php | 17 +- .../Functional/Traits/CustomerLoginTrait.php | 17 +- .../Traits/DatabaseTransactionBehaviour.php | 17 +- .../Traits/DirectoryDeletionTrait.php | 17 +- tests/Functional/Traits/FixtureBehaviour.php | 17 +- .../Functional/Traits/MigrationTestTrait.php | 17 +- tests/Functional/Traits/ShopContextTrait.php | 17 +- .../Migrations_Migration1722Test.php | 17 +- tests/Functional/bootstrap.php | 18 +- tests/Functional/config.php | 17 +- .../Initializer/KernelAwareInitializer.php | 17 +- .../Context/KernelAwareContext.php | 17 +- .../ServiceContainer/ShopwareExtension.php | 17 +- tests/Mink/Page/Backend/Backend/Backend.php | 17 +- .../ContentTypeManager/ContentTypeManager.php | 17 +- .../ContentTypeManager/Elements/AddButton.php | 17 +- .../Elements/AddFieldButton.php | 17 +- .../ContentTypeManagerDetailWindow.php | 17 +- .../ContentTypeManagerFieldWindow.php | 17 +- .../Elements/ContentTypeManagerListWindow.php | 17 +- .../Elements/SaveButton.php | 17 +- .../Elements/SelectorScopedElement.php | 17 +- .../Backend/CustomRecipes/CustomRecipes.php | 17 +- .../Elements/CustomRecipesListWindow.php | 17 +- tests/Mink/Page/Frontend/Account/Account.php | 17 +- .../Account/Elements/AccountBilling.php | 17 +- .../Account/Elements/AccountOrder.php | 17 +- .../Account/Elements/AccountPayment.php | 17 +- .../Account/Elements/AccountShipping.php | 17 +- tests/Mink/Page/Frontend/Address/Address.php | 17 +- .../Page/Frontend/Address/AddressDelete.php | 17 +- .../Page/Frontend/Address/AddressEdit.php | 17 +- .../Frontend/Address/Elements/AddressBox.php | 17 +- .../Elements/AddressManagementAddressBox.php | 17 +- .../Frontend/Article/Elements/Article.php | 17 +- .../Frontend/Article/Elements/ArticleBox.php | 17 +- .../Article/Elements/ArticleEvaluation.php | 17 +- .../Article/Elements/ArticleSlider.php | 17 +- tests/Mink/Page/Frontend/Blog/Blog.php | 17 +- .../Frontend/Blog/Elements/BlogArticle.php | 17 +- .../Frontend/Blog/Elements/BlogArticleBox.php | 17 +- .../Page/Frontend/Blog/Elements/BlogBox.php | 17 +- .../Frontend/Blog/Elements/BlogComment.php | 17 +- .../Page/Frontend/Checkout/CheckoutCart.php | 17 +- .../Frontend/Checkout/CheckoutConfirm.php | 17 +- .../Checkout/Elements/CartPositionProduct.php | 17 +- .../Checkout/Elements/CartPositionRebate.php | 17 +- .../Checkout/Elements/CheckoutAddressBox.php | 17 +- .../Elements/CheckoutAddressBoxModal.php | 17 +- .../Checkout/Elements/CheckoutBilling.php | 17 +- .../Elements/CheckoutModalAddressEditor.php | 17 +- .../CheckoutModalAddressSelection.php | 17 +- .../Checkout/Elements/CheckoutPayment.php | 17 +- .../Checkout/Elements/CheckoutShipping.php | 17 +- tests/Mink/Page/Frontend/Detail/Detail.php | 17 +- tests/Mink/Page/Frontend/Form/Form.php | 17 +- .../Page/Frontend/Generic/GenericPage.php | 17 +- .../Frontend/Homepage/Elements/Banner.php | 17 +- .../Homepage/Elements/CategoryTeaser.php | 17 +- .../Homepage/Elements/CompareColumn.php | 17 +- .../Homepage/Elements/ManufacturerSlider.php | 17 +- .../Frontend/Homepage/Elements/SearchForm.php | 17 +- .../Homepage/Elements/SliderElement.php | 17 +- .../Frontend/Homepage/Elements/YouTube.php | 17 +- .../Mink/Page/Frontend/Homepage/Homepage.php | 17 +- .../Page/Frontend/Listing/Elements/Paging.php | 17 +- tests/Mink/Page/Frontend/Listing/Listing.php | 17 +- .../Page/Frontend/Newsletter/Newsletter.php | 17 +- .../Frontend/Note/Elements/NotePosition.php | 17 +- tests/Mink/Page/Frontend/Note/Note.php | 17 +- .../Sitemap/Elements/SitemapGroup.php | 17 +- tests/Mink/Page/Frontend/Sitemap/Sitemap.php | 17 +- .../Page/Frontend/Sitemap/SitemapIndexXml.php | 17 +- .../Page/Helper/Elements/BannerSlider.php | 17 +- .../Mink/Page/Helper/Elements/FilterGroup.php | 17 +- .../Mink/Page/Helper/Elements/HeaderCart.php | 17 +- .../Page/Helper/Elements/LanguageSwitcher.php | 17 +- .../Page/Helper/Elements/MultipleElement.php | 17 +- .../Backend/bootstrap/BackendContext.php | 17 +- .../BackendContentTypeManagerContext.php | 17 +- .../bootstrap/BackendCustomRecipesContext.php | 17 +- .../Export/bootstrap/ExportContext.php | 17 +- .../Account/bootstrap/AccountContext.php | 17 +- .../Frontend/Blog/bootstrap/BlogContext.php | 17 +- .../Checkout/bootstrap/CheckoutContext.php | 17 +- .../Detail/bootstrap/DetailContext.php | 17 +- .../Frontend/Detail/bootstrap/FormContext.php | 17 +- .../Homepage/bootstrap/SecurityContext.php | 17 +- .../Homepage/bootstrap/ShopwareContext.php | 17 +- .../Listing/bootstrap/ListingContext.php | 17 +- .../Frontend/Listing/bootstrap/SeoContext.php | 17 +- .../Frontend/Note/bootstrap/NoteContext.php | 17 +- .../Sitemap/bootstrap/SitemapContext.php | 17 +- .../Tests/General/Helpers/FeatureContext.php | 17 +- tests/Mink/Tests/General/Helpers/Helper.php | 17 +- .../Helpers/HelperSelectorInterface.php | 17 +- .../Tests/General/Helpers/SpecialContext.php | 17 +- .../Mink/Tests/General/Helpers/SubContext.php | 17 +- .../General/Helpers/TransformContext.php | 17 +- .../SmartyClassDynamicReturnTypeExtension.php | 17 +- tests/TestReflectionHelper.php | 17 +- tests/Unit/ArrayCollectionTest.php | 17 +- .../RegisterDynamicControllerTest.php | 17 +- .../RegisterFieldsCompilerPassTest.php | 17 +- .../RegisterTypeRepositoriesTest.php | 17 +- .../DependencyInjection/TypeReaderTest.php | 17 +- .../Field/Shopware/AbstractGridFieldTest.php | 17 +- .../AbstractSingleSelectionFieldTest.php | 17 +- .../Services/FrontendTypeTranslatorTest.php | 17 +- .../ContentTypeBundle/XmlReaderTest.php | 17 +- .../CookieBundle/CookieCollectionTest.php | 17 +- .../CookieGroupCollectionTest.php | 17 +- .../Factory/TextMappingFactoryTest.php | 17 +- .../Product/ProductMappingTest.php | 17 +- .../Property/PropertyMappingTest.php | 17 +- .../EventComponentHandlerTest.php | 17 +- .../SearchQueryBuilderTest.php | 17 +- .../FormBundle/StringRendererServiceTest.php | 17 +- .../Unit/Bundle/FormBundle/fixtures/View.php | 17 +- .../MediaBundle/CacheOptimizerServiceTest.php | 17 +- .../MediaBundle/CdnOptimizerServiceTest.php | 17 +- .../Commands/MediaOptimizeCommandTest.php | 17 +- .../MediaBundle/GarbageCollectorTest.php | 17 +- .../MediaExtensionMappingServiceTest.php | 17 +- .../MediaBundle/OptimizerServiceTest.php | 17 +- .../MediaBundle/Strategy/Md5StrategyTest.php | 17 +- .../Strategy/PlainStrategyTest.php | 17 +- .../OrderBundle/ShippingConstServiceTest.php | 17 +- .../Fixtures/TestPlugin/TestPlugin.php | 17 +- .../Service/PluginInstallerTest.php | 17 +- .../UniqueIdGeneratorTest.php | 17 +- .../BatchProductNumberSearchTest.php | 17 +- .../SearchBundle/BatchProductSearchTest.php | 17 +- .../Unit/Bundle/SearchBundle/CriteriaTest.php | 17 +- .../SearchTerm/TermHelperTest.php | 17 +- .../Service/FilterContainerFactoryTest.php | 17 +- .../SitemapBundle/Service/UrlFilterTest.php | 17 +- .../SitemapBundle/SitemapListenerTest.php | 17 +- .../Bundle/SitemapBundle/SitemapLockTest.php | 17 +- .../SitemapNameGeneratorTest.php | 17 +- .../SitemapBundle/UrlFilter/BaseTest.php | 17 +- .../SitemapBundle/UrlFilter/Example.php | 17 +- .../Gateway/Dbal/ProductHydratorTest.php | 17 +- .../Gateway/Dbal/_fixtures/ProductData.php | 17 +- .../Service/BlogServiceTest.php | 18 +- .../Service/ConfiguratorServiceTest.php | 17 +- .../Service/Core/ShopContextFactoryTest.php | 18 +- .../Struct/AttributeStructTest.php | 17 +- .../Struct/CloneStructTest.php | 17 +- .../BasketSignatureCreatorTest.php | 17 +- .../Cart/CartLineCalculationTest.php | 17 +- .../Components/Cart/TaxAggregatorTest.php | 17 +- .../LegacyStructConverterTest.php | 17 +- .../Unit/Components/CookieSubscriberTest.php | 17 +- tests/Unit/Components/CsvIteratorTest.php | 17 +- .../RegisterControllerCompilerPassTest.php | 17 +- .../BackendController/BackendController.php | 17 +- .../Controllers/Backend/BackendController.php | 17 +- .../Controllers/Api/MyController.php | 17 +- .../Controllers/Backend/MyController.php | 17 +- .../Controllers/Frontend/MyController.php | 17 +- .../Controllers/Widgets/MyController.php | 17 +- .../DifferentController.php | 17 +- .../NoneController/NoneController.php | 17 +- .../Compiler/TagReplaceTraitTest.php | 17 +- .../DependencyInjection/ContainerTest.php | 17 +- .../ProjectServiceContainer.php | 17 +- .../DependencyInjection/Service.php | 17 +- .../Components/DispatchFormatHelperTest.php | 17 +- tests/Unit/Components/EmailValidatorTest.php | 17 +- .../Emotion/DeviceConfigurationTest.php | 17 +- tests/Unit/Components/Escaper/EscaperTest.php | 17 +- .../Event/ContainerAwareEventManagerTest.php | 17 +- .../Components/Event/EventManagerTest.php | 17 +- .../Components/Event/SubscriberArrayTest.php | 17 +- .../Components/Event/SubscriberConfigTest.php | 17 +- .../Filesystem/Adapter/AwsS3v3FactoryTest.php | 17 +- .../Adapter/GoogleStorageFactoryTest.php | 17 +- .../Filesystem/Adapter/LocalFactoryTest.php | 17 +- .../Filesystem/FilesystemFactoryTest.php | 17 +- .../Filesystem/PrefixFilesystemTest.php | 17 +- .../Hook/EnlightHookProxyFactoryTest.php | 17 +- .../Unit/Components/Hook/HookManagerTest.php | 17 +- .../Hook/HookManagerTestNoTarget.php | 17 +- .../Components/Hook/HookManagerTestTarget.php | 17 +- .../Unit/Components/Hook/MyBasicTestClass.php | 17 +- tests/Unit/Components/Hook/MyInterface.php | 17 +- .../Components/Hook/MyReferenceInterface.php | 17 +- .../Components/Hook/MyReferenceTestClass.php | 17 +- .../Unit/Components/Hook/TestProxyFactory.php | 17 +- .../Components/HttpCache/AppCacheTest.php | 17 +- tests/Unit/Components/HttpCache/StoreTest.php | 17 +- .../LegacyRequestWrapper/GetWrapperTest.php | 17 +- .../LegacyRequestWrapper/PostWrapperTest.php | 17 +- tests/Unit/Components/MailTest.php | 17 +- tests/Unit/Components/MemoryLimitTest.php | 17 +- .../Model/CategoryDenormalizationTest.php | 17 +- .../Unit/Components/Model/ModelEntityTest.php | 17 +- .../Components/Model/ModelManagerTest.php | 17 +- .../Components/Model/ModelRepositoryTest.php | 17 +- .../Components/Model/QueryBuilderTest.php | 17 +- .../RegexOrderNumberValidatorTest.php | 17 +- .../Password/Encoder/Argon2iTest.php | 17 +- .../Password/Encoder/Argon2idTest.php | 17 +- .../Password/Encoder/BcryptTest.php | 17 +- .../Password/Encoder/PreHashedTest.php | 17 +- .../Password/Encoder/Sha256Test.php | 17 +- .../Unit/Components/Password/ManagerTest.php | 17 +- .../Components/Plugin/PluginContextTest.php | 17 +- .../Plugin/PluginResourceCompilerPassTest.php | 17 +- .../Plugin/RequirementValidatorTest.php | 17 +- .../Plugin/ResourceSubscriberTest.php | 17 +- .../StoreExtjsValueParserTest.php | 17 +- .../StoreValueParserFactoryTest.php | 17 +- .../StoreXmlValueParserTest.php | 17 +- .../Plugin/XmlReader/XmlConfigReaderTest.php | 17 +- .../Plugin/XmlReader/XmlCronjobReaderTest.php | 17 +- .../Plugin/XmlReader/XmlMenuReaderTest.php | 17 +- .../Plugin/XmlReader/XmlPluginReaderTest.php | 17 +- .../Plugin/XmlReader/XmlReaderBaseTest.php | 17 +- tests/Unit/Components/PluginTest.php | 17 +- .../Unit/Components/QueryAliasMapperTest.php | 17 +- .../Components/Template/FileCheckerTrait.php | 17 +- .../Template/JavascriptEventTest.php | 17 +- .../Template/SmartyTaxModifierTest.php | 17 +- .../Components/Template/TemplateBlockTest.php | 17 +- .../Components/Theme/PathResolverTest.php | 17 +- .../Components/UploadMaxSizeValidatorTest.php | 17 +- tests/Unit/Controllers/Backend/ConfigTest.php | 18 +- .../Unit/Controllers/Backend/EmotionTest.php | 17 +- .../FirstRunWizardPluginManagerTest.php | 17 +- tests/Unit/Controllers/Backend/OrderTest.php | 17 +- tests/Unit/Core/sArticlesTest.php | 17 +- tests/Unit/Core/sCategoriesTest.php | 17 +- tests/Unit/EnlightLoaderTest.php | 17 +- .../Enlight/Controller/DefaultTest.php | 17 +- tests/Unit/Library/RequestHttpTest.php | 17 +- tests/Unit/Library/ResponseHttpTest.php | 17 +- tests/Unit/Library/ZendMailProtocolTest.php | 17 +- tests/Unit/Model/Album/MediaTest.php | 17 +- tests/Unit/Model/Album/SettingsTest.php | 17 +- tests/Unit/Model/OrderNumberValidatorTest.php | 17 +- .../Plugin/Backend/Auth/BootstrapTest.php | 17 +- .../SwagUpdate/Components/SwagUpdateTest.php | 17 +- .../Frontend/InputFilter/FilterTest.php | 17 +- tests/phpstan-console-application.php | 17 +- tests/phpstan-dba-bootstrap.php | 17 +- tests/phpstan-doctrine-model-manager.php | 17 +- themes/Frontend/Bare/Theme.php | 17 +- themes/Frontend/Responsive/Theme.php | 17 +- 3497 files changed, 28169 insertions(+), 31842 deletions(-) diff --git a/.danger.php b/.danger.php index 9d2f4181b62..94a01534447 100644 --- a/.danger.php +++ b/.danger.php @@ -1,5 +1,27 @@ addSql($sql); $sql = <<<'EOD' -INSERT IGNORE INTO `s_core_config_element_translations` +INSERT IGNORE INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`, `description`) VALUES (@elementId, '2', 'Use captcha for newsletter', 'The selected captcha method is used in the newsletter registration in the frontend.'); diff --git a/_sql/migrations/1213-add-laststock-on-variant-template-generation.php b/_sql/migrations/1213-add-laststock-on-variant-template-generation.php index 87f708a6cca..2438e3fa767 100644 --- a/_sql/migrations/1213-add-laststock-on-variant-template-generation.php +++ b/_sql/migrations/1213-add-laststock-on-variant-template-generation.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1213 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1214-improve-email-header-field.php b/_sql/migrations/1214-improve-email-header-field.php index 984acbc93bb..d6160b41af7 100644 --- a/_sql/migrations/1214-improve-email-header-field.php +++ b/_sql/migrations/1214-improve-email-header-field.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1214 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1215-form-active-status.php b/_sql/migrations/1215-form-active-status.php index 16bdc4cd3be..5d085cdc724 100644 --- a/_sql/migrations/1215-form-active-status.php +++ b/_sql/migrations/1215-form-active-status.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1215 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1216-remove-shopware-connect-menu.php b/_sql/migrations/1216-remove-shopware-connect-menu.php index 189419ef422..9bd58126bac 100644 --- a/_sql/migrations/1216-remove-shopware-connect-menu.php +++ b/_sql/migrations/1216-remove-shopware-connect-menu.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1216 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1217-change-smtp-password-fieldtype.php b/_sql/migrations/1217-change-smtp-password-fieldtype.php index 0673be69f1c..79986f7ab0b 100644 --- a/_sql/migrations/1217-change-smtp-password-fieldtype.php +++ b/_sql/migrations/1217-change-smtp-password-fieldtype.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1217 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1218-change-privacy-options.php b/_sql/migrations/1218-change-privacy-options.php index f9b5f4f8f64..0d5a2c046a1 100644 --- a/_sql/migrations/1218-change-privacy-options.php +++ b/_sql/migrations/1218-change-privacy-options.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1218 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1219-add-cron-for-personal-data-cleanup.php b/_sql/migrations/1219-add-cron-for-personal-data-cleanup.php index 81f8622ba97..542e2ede8f9 100644 --- a/_sql/migrations/1219-add-cron-for-personal-data-cleanup.php +++ b/_sql/migrations/1219-add-cron-for-personal-data-cleanup.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1219 extends Shopware\Components\Migrations\AbstractMigration @@ -47,7 +46,7 @@ public function up($modus) $this->addSql('SET @elementId = LAST_INSERT_ID();'); $sql = <<<'EOD' -INSERT IGNORE INTO `s_core_config_element_translations` +INSERT IGNORE INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`, `description`) VALUES (@elementId, '2', 'Delete accountless customers without orders after x months', 'The cronjob \"Guest customer cleanup\" must be active'); diff --git a/_sql/migrations/122-optimize-search-index-queries.php b/_sql/migrations/122-optimize-search-index-queries.php index 1a7505a5b4e..86944a8a460 100644 --- a/_sql/migrations/122-optimize-search-index-queries.php +++ b/_sql/migrations/122-optimize-search-index-queries.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration122 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1221-add-double-opt-in-dates.php b/_sql/migrations/1221-add-double-opt-in-dates.php index 1f25f3cbc86..095a8768ae5 100644 --- a/_sql/migrations/1221-add-double-opt-in-dates.php +++ b/_sql/migrations/1221-add-double-opt-in-dates.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1221 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1222-privacy-checkbox-note.php b/_sql/migrations/1222-privacy-checkbox-note.php index e422aa7fd92..89b20a9c90c 100644 --- a/_sql/migrations/1222-privacy-checkbox-note.php +++ b/_sql/migrations/1222-privacy-checkbox-note.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1222 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1223-add-ip-anonymization.php b/_sql/migrations/1223-add-ip-anonymization.php index 7e48baa1c5a..79a73f4c521 100644 --- a/_sql/migrations/1223-add-ip-anonymization.php +++ b/_sql/migrations/1223-add-ip-anonymization.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1223 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1224-cleanup-optin-table.php b/_sql/migrations/1224-cleanup-optin-table.php index 4b346c03905..dc9414febd4 100644 --- a/_sql/migrations/1224-cleanup-optin-table.php +++ b/_sql/migrations/1224-cleanup-optin-table.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1224 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1225-add-double-opt-in-register.php b/_sql/migrations/1225-add-double-opt-in-register.php index 77209154ef0..55ae8b3b5ce 100644 --- a/_sql/migrations/1225-add-double-opt-in-register.php +++ b/_sql/migrations/1225-add-double-opt-in-register.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1225 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1226-add-blog-comment-mailtemplate.php b/_sql/migrations/1226-add-blog-comment-mailtemplate.php index 1d89e94630e..93bc68336f7 100644 --- a/_sql/migrations/1226-add-blog-comment-mailtemplate.php +++ b/_sql/migrations/1226-add-blog-comment-mailtemplate.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1226 extends Shopware\Components\Migrations\AbstractMigration @@ -42,7 +41,7 @@ public function up($modus) if ($modus === self::MODUS_UPDATE) { // Insert for every subshop whichs setting was 'on' (standard) $sql = "INSERT INTO `s_core_config_values` (`element_id`, `shop_id`, `value`) - SELECT + SELECT @optinid, `id`, 'b:1;' diff --git a/_sql/migrations/1227-change-minimum-order-surcharge.php b/_sql/migrations/1227-change-minimum-order-surcharge.php index a875b95439c..5694703b437 100644 --- a/_sql/migrations/1227-change-minimum-order-surcharge.php +++ b/_sql/migrations/1227-change-minimum-order-surcharge.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1227 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1228-soptinregister-english-on-update.php b/_sql/migrations/1228-soptinregister-english-on-update.php index 00fe6230f12..5b2a071a7d6 100644 --- a/_sql/migrations/1228-soptinregister-english-on-update.php +++ b/_sql/migrations/1228-soptinregister-english-on-update.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1228 extends Shopware\Components\Migrations\AbstractMigration @@ -29,16 +28,16 @@ public function up($modus) if ($modus === self::MODUS_UPDATE) { // Store localePrefix $sql = - "SET @localePrefix = ( - SELECT MID(`locale`, 1, 2) AS localePrefix - FROM `s_core_locales` - WHERE `id` = ( - SELECT locale_id - FROM `s_core_shops` - WHERE `default` = '1' - LIMIT 1 - ) - LIMIT 1 + "SET @localePrefix = ( + SELECT MID(`locale`, 1, 2) AS localePrefix + FROM `s_core_locales` + WHERE `id` = ( + SELECT locale_id + FROM `s_core_shops` + WHERE `default` = '1' + LIMIT 1 + ) + LIMIT 1 );"; $this->addSql($sql); diff --git a/_sql/migrations/1229-accountless-optin-switch.php b/_sql/migrations/1229-accountless-optin-switch.php index a91a2d81a0b..2794c57e3f9 100644 --- a/_sql/migrations/1229-accountless-optin-switch.php +++ b/_sql/migrations/1229-accountless-optin-switch.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1229 extends Shopware\Components\Migrations\AbstractMigration @@ -72,7 +71,7 @@ public function up($modus) '{config name=shopName}', 'Bitte bestätigen Sie Ihre E-Mail-Adresse für Ihre Bestellung bei {config name=shopName}', '{include file="string:{config name=emailheaderplain}"} - + Hallo, Bitte bestätigen Sie Ihre E-Mail-Adresse über den nachfolgenden Link: diff --git a/_sql/migrations/123-add-dummy-plugins.php b/_sql/migrations/123-add-dummy-plugins.php index aef0a22d576..5526889235a 100644 --- a/_sql/migrations/123-add-dummy-plugins.php +++ b/_sql/migrations/123-add-dummy-plugins.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration123 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1230-add-cookie-removal.php b/_sql/migrations/1230-add-cookie-removal.php index 65c1efc10ba..ce692dfa879 100644 --- a/_sql/migrations/1230-add-cookie-removal.php +++ b/_sql/migrations/1230-add-cookie-removal.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1230 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1231-add-description-to-hideNoInStock-config-element.php b/_sql/migrations/1231-add-description-to-hideNoInStock-config-element.php index ae458315758..d7b15e7cf60 100644 --- a/_sql/migrations/1231-add-description-to-hideNoInStock-config-element.php +++ b/_sql/migrations/1231-add-description-to-hideNoInStock-config-element.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1231 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/124-remove-router-url-cache.php b/_sql/migrations/124-remove-router-url-cache.php index 093003ed243..35f5b8d95d5 100644 --- a/_sql/migrations/124-remove-router-url-cache.php +++ b/_sql/migrations/124-remove-router-url-cache.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration124 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/125-adds-filter-performance-sql.php b/_sql/migrations/125-adds-filter-performance-sql.php index 136cfcc2fa7..7603ee4fde0 100644 --- a/_sql/migrations/125-adds-filter-performance-sql.php +++ b/_sql/migrations/125-adds-filter-performance-sql.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration125 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/126-update-cache-menu-items.php b/_sql/migrations/126-update-cache-menu-items.php index 4eb2b370f97..13b95c7270e 100644 --- a/_sql/migrations/126-update-cache-menu-items.php +++ b/_sql/migrations/126-update-cache-menu-items.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration126 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/127-install-http-plugin.php b/_sql/migrations/127-install-http-plugin.php index 53e7bced507..19364eff0f8 100644 --- a/_sql/migrations/127-install-http-plugin.php +++ b/_sql/migrations/127-install-http-plugin.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration127 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/128-adds-community-store-resource.php b/_sql/migrations/128-adds-community-store-resource.php index d5969281b7f..79662e677d8 100644 --- a/_sql/migrations/128-adds-community-store-resource.php +++ b/_sql/migrations/128-adds-community-store-resource.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration128 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/129-fix-mailer-config-help-text-typo.php b/_sql/migrations/129-fix-mailer-config-help-text-typo.php index bec27800cb6..295d691d49e 100644 --- a/_sql/migrations/129-fix-mailer-config-help-text-typo.php +++ b/_sql/migrations/129-fix-mailer-config-help-text-typo.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration129 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/130-fix-typo-in-no-script-notices-snippet.php b/_sql/migrations/130-fix-typo-in-no-script-notices-snippet.php index 33e9c610902..cb8d36f21e7 100644 --- a/_sql/migrations/130-fix-typo-in-no-script-notices-snippet.php +++ b/_sql/migrations/130-fix-typo-in-no-script-notices-snippet.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration130 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/131-add-top-seller-index.php b/_sql/migrations/131-add-top-seller-index.php index 2642f80a52c..6bbb4dec037 100644 --- a/_sql/migrations/131-add-top-seller-index.php +++ b/_sql/migrations/131-add-top-seller-index.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration131 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/132-remove-similar-shown-listener.php b/_sql/migrations/132-remove-similar-shown-listener.php index 074b775cd65..c82439ecf71 100644 --- a/_sql/migrations/132-remove-similar-shown-listener.php +++ b/_sql/migrations/132-remove-similar-shown-listener.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration132 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/133-add-esd-payment-status-config.php b/_sql/migrations/133-add-esd-payment-status-config.php index 202192e1264..8639ce5cb36 100644 --- a/_sql/migrations/133-add-esd-payment-status-config.php +++ b/_sql/migrations/133-add-esd-payment-status-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration133 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/134-add-http-cache-cleanup-cronjob.php b/_sql/migrations/134-add-http-cache-cleanup-cronjob.php index 78dd69758e0..47845a39c26 100644 --- a/_sql/migrations/134-add-http-cache-cleanup-cronjob.php +++ b/_sql/migrations/134-add-http-cache-cleanup-cronjob.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration134 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/135-add-main-image-listing-config.php b/_sql/migrations/135-add-main-image-listing-config.php index 1aeb778e5ea..3a6f98dd769 100644 --- a/_sql/migrations/135-add-main-image-listing-config.php +++ b/_sql/migrations/135-add-main-image-listing-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration135 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/136-add-send-order-mail-config.php b/_sql/migrations/136-add-send-order-mail-config.php index b12bd814757..2b3bf719f5e 100644 --- a/_sql/migrations/136-add-send-order-mail-config.php +++ b/_sql/migrations/136-add-send-order-mail-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration136 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/137-remove-lastarticles-save-time.php b/_sql/migrations/137-remove-lastarticles-save-time.php index bfa049843c0..8f969f516c1 100644 --- a/_sql/migrations/137-remove-lastarticles-save-time.php +++ b/_sql/migrations/137-remove-lastarticles-save-time.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration137 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/138-fix-typo-last-articles-headline.php b/_sql/migrations/138-fix-typo-last-articles-headline.php index e3b1bc43674..1331adec6a4 100644 --- a/_sql/migrations/138-fix-typo-last-articles-headline.php +++ b/_sql/migrations/138-fix-typo-last-articles-headline.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration138 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/139-remove-plugin-form-from-config.php b/_sql/migrations/139-remove-plugin-form-from-config.php index 6e9430b70a5..6519c04fb9c 100644 --- a/_sql/migrations/139-remove-plugin-form-from-config.php +++ b/_sql/migrations/139-remove-plugin-form-from-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration139 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/140-fix-emotion-grid-id.php b/_sql/migrations/140-fix-emotion-grid-id.php index dd76dbefa0f..a9d6738f0b5 100644 --- a/_sql/migrations/140-fix-emotion-grid-id.php +++ b/_sql/migrations/140-fix-emotion-grid-id.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration140 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1400-add-benchmark-config-table.php b/_sql/migrations/1400-add-benchmark-config-table.php index b4fd3a69fc3..12acc6efda6 100644 --- a/_sql/migrations/1400-add-benchmark-config-table.php +++ b/_sql/migrations/1400-add-benchmark-config-table.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1400 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1401-add-benchmark-menu.php b/_sql/migrations/1401-add-benchmark-menu.php index 80e7e8d3bcd..b4c95f6d041 100644 --- a/_sql/migrations/1401-add-benchmark-menu.php +++ b/_sql/migrations/1401-add-benchmark-menu.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1401 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1402-add-benchmark-teaser-config.php b/_sql/migrations/1402-add-benchmark-teaser-config.php index eec104e0a66..4ccdc66bd68 100644 --- a/_sql/migrations/1402-add-benchmark-teaser-config.php +++ b/_sql/migrations/1402-add-benchmark-teaser-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1402 extends Shopware\Components\Migrations\AbstractMigration @@ -28,7 +27,7 @@ public function up($modus) { $sql = <<addSql($sql); diff --git a/_sql/migrations/1403-implement-document-type-key.php b/_sql/migrations/1403-implement-document-type-key.php index 0f19d32b6d7..303111280d3 100644 --- a/_sql/migrations/1403-implement-document-type-key.php +++ b/_sql/migrations/1403-implement-document-type-key.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1403 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1404-remove-language-distinction-from-shop-pages.php b/_sql/migrations/1404-remove-language-distinction-from-shop-pages.php index 540f222f9bc..ef2c0363e21 100644 --- a/_sql/migrations/1404-remove-language-distinction-from-shop-pages.php +++ b/_sql/migrations/1404-remove-language-distinction-from-shop-pages.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1404 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1405-add-es-backend-backlog.php b/_sql/migrations/1405-add-es-backend-backlog.php index d3b329ebd80..12560c8ada2 100644 --- a/_sql/migrations/1405-add-es-backend-backlog.php +++ b/_sql/migrations/1405-add-es-backend-backlog.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1405 extends Shopware\Components\Migrations\AbstractMigration @@ -32,7 +31,7 @@ public function up($modus) `entity` varchar(500) NOT NULL, `entity_id` int NOT NULL, `time` datetime NOT NULL -); +); EOF; $this->addSql($sql); diff --git a/_sql/migrations/1406-add-changed-timestamp-columns.php b/_sql/migrations/1406-add-changed-timestamp-columns.php index f8329f2d134..ab39ab4102e 100644 --- a/_sql/migrations/1406-add-changed-timestamp-columns.php +++ b/_sql/migrations/1406-add-changed-timestamp-columns.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/1407-add-english-translations.php b/_sql/migrations/1407-add-english-translations.php index 818f3830545..4f0dad952f9 100644 --- a/_sql/migrations/1407-add-english-translations.php +++ b/_sql/migrations/1407-add-english-translations.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1407 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1408-proportional-tax-calculation.php b/_sql/migrations/1408-proportional-tax-calculation.php index dd7c7d8b04a..63fa2751f9c 100644 --- a/_sql/migrations/1408-proportional-tax-calculation.php +++ b/_sql/migrations/1408-proportional-tax-calculation.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1408 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1409-add-shipping-tax-column.php b/_sql/migrations/1409-add-shipping-tax-column.php index b433341604e..80d6377fb8e 100644 --- a/_sql/migrations/1409-add-shipping-tax-column.php +++ b/_sql/migrations/1409-add-shipping-tax-column.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1409 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/141-add-force-canonical-http-config.php b/_sql/migrations/141-add-force-canonical-http-config.php index 1871536c393..8c1bf28b23c 100644 --- a/_sql/migrations/141-add-force-canonical-http-config.php +++ b/_sql/migrations/141-add-force-canonical-http-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration141 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1410-add-sqli-privilege.php b/_sql/migrations/1410-add-sqli-privilege.php index 65b98fd32c1..34a33336fa2 100644 --- a/_sql/migrations/1410-add-sqli-privilege.php +++ b/_sql/migrations/1410-add-sqli-privilege.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1410 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1411-change-order-documents-key.php b/_sql/migrations/1411-change-order-documents-key.php index cd814acee37..2c0c997a4d1 100644 --- a/_sql/migrations/1411-change-order-documents-key.php +++ b/_sql/migrations/1411-change-order-documents-key.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1411 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1413-href-lang-configuration.php b/_sql/migrations/1413-href-lang-configuration.php index e15378cd250..7d86114951f 100644 --- a/_sql/migrations/1413-href-lang-configuration.php +++ b/_sql/migrations/1413-href-lang-configuration.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1413 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1414-add-statistics-acl-role.php b/_sql/migrations/1414-add-statistics-acl-role.php index 2484721519b..508c2428cfe 100644 --- a/_sql/migrations/1414-add-statistics-acl-role.php +++ b/_sql/migrations/1414-add-statistics-acl-role.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1414 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1415-add-necessary-columns-to-bi.php b/_sql/migrations/1415-add-necessary-columns-to-bi.php index f1fc6e268c3..59547b8fd06 100644 --- a/_sql/migrations/1415-add-necessary-columns-to-bi.php +++ b/_sql/migrations/1415-add-necessary-columns-to-bi.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1415 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1416-add-article-detail-id-to-s-order-details.php b/_sql/migrations/1416-add-article-detail-id-to-s-order-details.php index 64297044aab..022f5b4991c 100644 --- a/_sql/migrations/1416-add-article-detail-id-to-s-order-details.php +++ b/_sql/migrations/1416-add-article-detail-id-to-s-order-details.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1416 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1418-add-sitemap-configuration.php b/_sql/migrations/1418-add-sitemap-configuration.php index d094d85673f..ef5ff433be1 100644 --- a/_sql/migrations/1418-add-sitemap-configuration.php +++ b/_sql/migrations/1418-add-sitemap-configuration.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1418 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1419-add-cron-for-personal-data-cleanup.php b/_sql/migrations/1419-add-cron-for-personal-data-cleanup.php index af271627bc3..89489cda51e 100644 --- a/_sql/migrations/1419-add-cron-for-personal-data-cleanup.php +++ b/_sql/migrations/1419-add-cron-for-personal-data-cleanup.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1419 extends Shopware\Components\Migrations\AbstractMigration @@ -56,7 +55,7 @@ public function up($modus) $this->addSql('SET @elementId = LAST_INSERT_ID();'); $sql = <<<'EOD' -INSERT IGNORE INTO `s_core_config_element_translations` +INSERT IGNORE INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`, `description`) VALUES (@elementId, '2', 'Delete accountless customers without orders after x months', 'The cronjob \"Guest customer cleanup\" must be active'); diff --git a/_sql/migrations/142-add-listing-description-config.php b/_sql/migrations/142-add-listing-description-config.php index dacb53e2f6e..4ffe4510169 100644 --- a/_sql/migrations/142-add-listing-description-config.php +++ b/_sql/migrations/142-add-listing-description-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration142 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1421-add-double-opt-in-dates.php b/_sql/migrations/1421-add-double-opt-in-dates.php index 63172e92eae..4f64f3ca70c 100644 --- a/_sql/migrations/1421-add-double-opt-in-dates.php +++ b/_sql/migrations/1421-add-double-opt-in-dates.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1421 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1422-privacy-checkbox-note.php b/_sql/migrations/1422-privacy-checkbox-note.php index 87aa0ddb29d..e0f0266c2a7 100644 --- a/_sql/migrations/1422-privacy-checkbox-note.php +++ b/_sql/migrations/1422-privacy-checkbox-note.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1422 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1423-add-ip-anonymization.php b/_sql/migrations/1423-add-ip-anonymization.php index ff9622c6a06..4ad13408bd7 100644 --- a/_sql/migrations/1423-add-ip-anonymization.php +++ b/_sql/migrations/1423-add-ip-anonymization.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1423 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1424-cleanup-optin-table.php b/_sql/migrations/1424-cleanup-optin-table.php index 7486cbd00b2..ea6fd34cc28 100644 --- a/_sql/migrations/1424-cleanup-optin-table.php +++ b/_sql/migrations/1424-cleanup-optin-table.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1424 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1425-add-double-opt-in-register.php b/_sql/migrations/1425-add-double-opt-in-register.php index da5c40bef52..1681998e55a 100644 --- a/_sql/migrations/1425-add-double-opt-in-register.php +++ b/_sql/migrations/1425-add-double-opt-in-register.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1425 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1426-add-blog-comment-mailtemplate.php b/_sql/migrations/1426-add-blog-comment-mailtemplate.php index bfd76bc1637..de61beda79a 100644 --- a/_sql/migrations/1426-add-blog-comment-mailtemplate.php +++ b/_sql/migrations/1426-add-blog-comment-mailtemplate.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1426 extends Shopware\Components\Migrations\AbstractMigration @@ -51,7 +50,7 @@ public function up($modus) if ($modus === self::MODUS_UPDATE) { // Insert for every subshop whichs setting was 'on' (standard) $sql = "INSERT INTO `s_core_config_values` (`element_id`, `shop_id`, `value`) - SELECT + SELECT @optinid, `id`, 'b:1;' diff --git a/_sql/migrations/1427-change-minimum-order-surcharge.php b/_sql/migrations/1427-change-minimum-order-surcharge.php index c9e005ad945..a6d56f279ac 100644 --- a/_sql/migrations/1427-change-minimum-order-surcharge.php +++ b/_sql/migrations/1427-change-minimum-order-surcharge.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1427 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1428-soptinregister-english-on-update.php b/_sql/migrations/1428-soptinregister-english-on-update.php index 99e1026eafc..14344316f37 100644 --- a/_sql/migrations/1428-soptinregister-english-on-update.php +++ b/_sql/migrations/1428-soptinregister-english-on-update.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1428 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1429-accountless-optin-switch.php b/_sql/migrations/1429-accountless-optin-switch.php index fb95a49bba9..4e303cdfd52 100644 --- a/_sql/migrations/1429-accountless-optin-switch.php +++ b/_sql/migrations/1429-accountless-optin-switch.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1429 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/143-deactivate-router-to-lower-scope.php b/_sql/migrations/143-deactivate-router-to-lower-scope.php index 05b1e45c48e..960adf5ddba 100644 --- a/_sql/migrations/143-deactivate-router-to-lower-scope.php +++ b/_sql/migrations/143-deactivate-router-to-lower-scope.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration143 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1430-add-cookie-removal.php b/_sql/migrations/1430-add-cookie-removal.php index f6d8066bbc9..e15743b1832 100644 --- a/_sql/migrations/1430-add-cookie-removal.php +++ b/_sql/migrations/1430-add-cookie-removal.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1430 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1431-add-description-to-hideNoInStock-config-element.php b/_sql/migrations/1431-add-description-to-hideNoInStock-config-element.php index f08288839a7..cffe68a493b 100644 --- a/_sql/migrations/1431-add-description-to-hideNoInStock-config-element.php +++ b/_sql/migrations/1431-add-description-to-hideNoInStock-config-element.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1431 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1432-improve-plugin-manager.php b/_sql/migrations/1432-improve-plugin-manager.php index 058bc7204ee..28a805d7156 100644 --- a/_sql/migrations/1432-improve-plugin-manager.php +++ b/_sql/migrations/1432-improve-plugin-manager.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1432 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1433-add-analytics-last-id.php b/_sql/migrations/1433-add-analytics-last-id.php index e5f42ad8da8..e3c8e1f0596 100644 --- a/_sql/migrations/1433-add-analytics-last-id.php +++ b/_sql/migrations/1433-add-analytics-last-id.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1433 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1434-add-href-default-selection.php b/_sql/migrations/1434-add-href-default-selection.php index 314e341d380..018ce54a7ad 100644 --- a/_sql/migrations/1434-add-href-default-selection.php +++ b/_sql/migrations/1434-add-href-default-selection.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1434 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1435-update-esd-helptext.php b/_sql/migrations/1435-update-esd-helptext.php index 923ec8b2001..484d93c9fe0 100644 --- a/_sql/migrations/1435-update-esd-helptext.php +++ b/_sql/migrations/1435-update-esd-helptext.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1435 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1436-document-type-mail-templates.php b/_sql/migrations/1436-document-type-mail-templates.php index 44bf3379e31..bd5605077a5 100644 --- a/_sql/migrations/1436-document-type-mail-templates.php +++ b/_sql/migrations/1436-document-type-mail-templates.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1436 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1437-add-bi-last-update-date-column.php b/_sql/migrations/1437-add-bi-last-update-date-column.php index 541798b9c56..9b82e223c80 100644 --- a/_sql/migrations/1437-add-bi-last-update-date-column.php +++ b/_sql/migrations/1437-add-bi-last-update-date-column.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1437 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1438-add-bi-widgets.php b/_sql/migrations/1438-add-bi-widgets.php index 255d3e72e98..ae1a9498dd3 100644 --- a/_sql/migrations/1438-add-bi-widgets.php +++ b/_sql/migrations/1438-add-bi-widgets.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1438 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1439-change-back-document-id-to-tmp.php b/_sql/migrations/1439-change-back-document-id-to-tmp.php index dd4844d8969..204276b410c 100644 --- a/_sql/migrations/1439-change-back-document-id-to-tmp.php +++ b/_sql/migrations/1439-change-back-document-id-to-tmp.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1439 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/144-add-require-phone-field-config.php b/_sql/migrations/144-add-require-phone-field-config.php index fb3e09ecc7c..6888c073136 100644 --- a/_sql/migrations/144-add-require-phone-field-config.php +++ b/_sql/migrations/144-add-require-phone-field-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration144 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1440-change-document-id-to-lowercase.php b/_sql/migrations/1440-change-document-id-to-lowercase.php index 4be8057dceb..7387551ea38 100644 --- a/_sql/migrations/1440-change-document-id-to-lowercase.php +++ b/_sql/migrations/1440-change-document-id-to-lowercase.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1440 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1441-update-subshop-vote-description.php b/_sql/migrations/1441-update-subshop-vote-description.php index d6e54b1b8d4..8dbd5128582 100644 --- a/_sql/migrations/1441-update-subshop-vote-description.php +++ b/_sql/migrations/1441-update-subshop-vote-description.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1441 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1442-add-meta-description-config.php b/_sql/migrations/1442-add-meta-description-config.php index 9ffcbfba2ec..40f55e48f65 100644 --- a/_sql/migrations/1442-add-meta-description-config.php +++ b/_sql/migrations/1442-add-meta-description-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1442 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1443-add-shipping-country-flag.php b/_sql/migrations/1443-add-shipping-country-flag.php index 339a616358a..893551d4b2e 100644 --- a/_sql/migrations/1443-add-shipping-country-flag.php +++ b/_sql/migrations/1443-add-shipping-country-flag.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1443 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1444-userfriendly-mail-options.php b/_sql/migrations/1444-userfriendly-mail-options.php index 66c735f8724..57029e84a98 100644 --- a/_sql/migrations/1444-userfriendly-mail-options.php +++ b/_sql/migrations/1444-userfriendly-mail-options.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1444 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1445-add-delete-document-right.php b/_sql/migrations/1445-add-delete-document-right.php index 40de95faf9f..22893ae768f 100644 --- a/_sql/migrations/1445-add-delete-document-right.php +++ b/_sql/migrations/1445-add-delete-document-right.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1445 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1446-adjust-tracking-code-column-type.php b/_sql/migrations/1446-adjust-tracking-code-column-type.php index 5b761b8f7f7..dfd8a6caa14 100644 --- a/_sql/migrations/1446-adjust-tracking-code-column-type.php +++ b/_sql/migrations/1446-adjust-tracking-code-column-type.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/1447-add-notification-attributes.php b/_sql/migrations/1447-add-notification-attributes.php index 3a479db3c92..5227a4ea3a7 100644 --- a/_sql/migrations/1447-add-notification-attributes.php +++ b/_sql/migrations/1447-add-notification-attributes.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/1448-set-default-country-allow-shipping-true.php b/_sql/migrations/1448-set-default-country-allow-shipping-true.php index 0d0dbd5a906..0ee0eb6a9f5 100644 --- a/_sql/migrations/1448-set-default-country-allow-shipping-true.php +++ b/_sql/migrations/1448-set-default-country-allow-shipping-true.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1448 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1449-add-shop-attributes-table.php b/_sql/migrations/1449-add-shop-attributes-table.php index 0bd12eadc96..c8d265a6475 100644 --- a/_sql/migrations/1449-add-shop-attributes-table.php +++ b/_sql/migrations/1449-add-shop-attributes-table.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1449 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/145-fix-default-incorrect-translation.php b/_sql/migrations/145-fix-default-incorrect-translation.php index 294db1441b1..05163936cff 100644 --- a/_sql/migrations/145-fix-default-incorrect-translation.php +++ b/_sql/migrations/145-fix-default-incorrect-translation.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration145 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1450-add-missing-countries.php b/_sql/migrations/1450-add-missing-countries.php index 9272610e419..397ab218363 100644 --- a/_sql/migrations/1450-add-missing-countries.php +++ b/_sql/migrations/1450-add-missing-countries.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1450 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1451-change-wiki-link.php b/_sql/migrations/1451-change-wiki-link.php index dd73711d6a2..90d0f720489 100644 --- a/_sql/migrations/1451-change-wiki-link.php +++ b/_sql/migrations/1451-change-wiki-link.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1451 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1452-change-laststock-filter.php b/_sql/migrations/1452-change-laststock-filter.php index 37020f9c94b..c739111158a 100644 --- a/_sql/migrations/1452-change-laststock-filter.php +++ b/_sql/migrations/1452-change-laststock-filter.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1452 extends \Shopware\Components\Migrations\AbstractMigration @@ -27,7 +26,7 @@ class Migrations_Migration1452 extends \Shopware\Components\Migrations\AbstractM public function up($modus) { $sql = <<<'SQL' -UPDATE s_multi_edit_filter +UPDATE s_multi_edit_filter SET filter_string = "DETAIL.LASTSTOCK ISTRUE and DETAIL.INSTOCK <= \"0\" AND ISMAIN" WHERE filter_string = " ARTICLE.LASTSTOCK ISTRUE and DETAIL.INSTOCK <= 0"; SQL; @@ -37,7 +36,7 @@ public function up($modus) WHERE `name` = "Abverkauf
        nicht auf Lager"; SQL; $sql3 = <<<'SQL' -UPDATE s_multi_edit_filter +UPDATE s_multi_edit_filter SET description = "Abverkauf-Hauptartikel ohne Lagerbestand" WHERE description = "Abverkauf-Artikel ohne Lagerbestand"; SQL; diff --git a/_sql/migrations/1453-fix-extended-editor.php b/_sql/migrations/1453-fix-extended-editor.php index 534072cb6c6..bf918b3876e 100644 --- a/_sql/migrations/1453-fix-extended-editor.php +++ b/_sql/migrations/1453-fix-extended-editor.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1453 extends \Shopware\Components\Migrations\AbstractMigration @@ -27,7 +26,7 @@ class Migrations_Migration1453 extends \Shopware\Components\Migrations\AbstractM public function up($modus) { $sql = <<<'SQL' - UPDATE s_core_auth + UPDATE s_core_auth SET lockeduntil = "2010-01-01 00:00:00" WHERE lockeduntil = "0000-00-00 00:00:00"; SQL; diff --git a/_sql/migrations/1454-add-category-shop-association.php b/_sql/migrations/1454-add-category-shop-association.php index 0b1c4635cf4..7fba973c112 100644 --- a/_sql/migrations/1454-add-category-shop-association.php +++ b/_sql/migrations/1454-add-category-shop-association.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1454 extends Shopware\Components\Migrations\AbstractMigration @@ -60,9 +59,9 @@ private function createBlogConfigForm() $this->addSql($sql); $sql = <<<'EOD' - INSERT IGNORE s_core_config_forms - (`parent_id`, `name`, `label`, `description`, `position`, `plugin_id`) - VALUE + INSERT IGNORE s_core_config_forms + (`parent_id`, `name`, `label`, `description`, `position`, `plugin_id`) + VALUE (@storeFrontId, 'Blog', 'Blog', NULL, 0, NULL); EOD; $this->addSql($sql); @@ -74,7 +73,7 @@ private function createBlogConfigForm() $sql = <<<'EOD' INSERT IGNORE s_core_config_form_translations - (`form_id`, `locale_id`, `label`, `description`) + (`form_id`, `locale_id`, `label`, `description`) VALUE (@blogId, '2', 'Blog', null) EOD; diff --git a/_sql/migrations/1455-add-customer-group-key-exemption-option.php b/_sql/migrations/1455-add-customer-group-key-exemption-option.php index 67c9ba85b11..5b740df5635 100644 --- a/_sql/migrations/1455-add-customer-group-key-exemption-option.php +++ b/_sql/migrations/1455-add-customer-group-key-exemption-option.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1455 extends \Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1456-change-docid-column-type.php b/_sql/migrations/1456-change-docid-column-type.php index 134f83ab9fe..b6f7e0d3b0d 100644 --- a/_sql/migrations/1456-change-docid-column-type.php +++ b/_sql/migrations/1456-change-docid-column-type.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1456 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1457-add-minsearch-index-length.php b/_sql/migrations/1457-add-minsearch-index-length.php index a68b3244cac..5a85a19df34 100644 --- a/_sql/migrations/1457-add-minsearch-index-length.php +++ b/_sql/migrations/1457-add-minsearch-index-length.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/1458-add-essential-features-config.php b/_sql/migrations/1458-add-essential-features-config.php index d1f1005baca..afdedf8753f 100644 --- a/_sql/migrations/1458-add-essential-features-config.php +++ b/_sql/migrations/1458-add-essential-features-config.php @@ -1,26 +1,24 @@ Inhalt: - + {$sBasketItem.purchaseunit|floatval} {$sBasketItem.additional_details.sUnit.description} {/if} - + {if $sBasketItem.purchaseunit && $sBasketItem.additional_details.referenceunit && $sBasketItem.purchaseunit != $sBasketItem.additional_details.referenceunit} ({$sBasketItem.additional_details.referenceprice|currency} diff --git a/_sql/migrations/1459-change-shipping-costs-configs.php b/_sql/migrations/1459-change-shipping-costs-configs.php index 7214c5f2b7b..2ca2491e684 100644 --- a/_sql/migrations/1459-change-shipping-costs-configs.php +++ b/_sql/migrations/1459-change-shipping-costs-configs.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1459 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/146-http-cache-events.php b/_sql/migrations/146-http-cache-events.php index 104ee68af91..7a77badc9b1 100644 --- a/_sql/migrations/146-http-cache-events.php +++ b/_sql/migrations/146-http-cache-events.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration146 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1460-add-shipping-costs-configs-for-off-canvas.php b/_sql/migrations/1460-add-shipping-costs-configs-for-off-canvas.php index 876aaae1881..3846b2a762e 100644 --- a/_sql/migrations/1460-add-shipping-costs-configs-for-off-canvas.php +++ b/_sql/migrations/1460-add-shipping-costs-configs-for-off-canvas.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1460 extends Shopware\Components\Migrations\AbstractMigration @@ -61,10 +60,10 @@ public function up($modus) $sql = <<<'SQL' SET @parent = (SELECT id FROM s_core_config_forms WHERE name = 'Frontend79' LIMIT 1); - + INSERT IGNORE INTO `s_core_config_elements` (`id`, `form_id`, `name`, `value`, `label`, `description`, `type`, `required`, `position`, `scope`, `options`) VALUES (NULL, @parent, 'showShippingCostsOffCanvas', 'i:1;', 'Versandkostenberechnung im Mini-/OffCanvas-Warenkorb anzeigen', 'Diese Option aktiviert die Versandkostenberechnung für den Mini- bzw. OffCanvas-Warenkorb.', 'select', 0, 6, 1, '%s'); - + SET @elementId = (SELECT id FROM `s_core_config_elements` WHERE `name` = 'showShippingCostsOffCanvas' LIMIT 1); INSERT IGNORE INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`, `description`) VALUES (@elementId, '2', 'Show shipping costs calculation in mini/offcanvas shopping cart', 'If enabled, a shipping cost calculator will be displayed in the mini/offcanvas cart page. This is only available for customers who haven\'t logged in'); @@ -74,7 +73,7 @@ public function up($modus) if ($modus === self::MODUS_UPDATE) { $sql = "INSERT INTO `s_core_config_values` (`element_id`, `shop_id`, `value`) - SELECT + SELECT @elementId, `id`, 'i:0;' diff --git a/_sql/migrations/1461-change-no-customer-account-configs.php b/_sql/migrations/1461-change-no-customer-account-configs.php index 51bf9186972..cb1294d2bf8 100644 --- a/_sql/migrations/1461-change-no-customer-account-configs.php +++ b/_sql/migrations/1461-change-no-customer-account-configs.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1461 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1462-add-i-am-select-field-options.php b/_sql/migrations/1462-add-i-am-select-field-options.php index dc20b567f00..bb95cc718fb 100644 --- a/_sql/migrations/1462-add-i-am-select-field-options.php +++ b/_sql/migrations/1462-add-i-am-select-field-options.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1462 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1463-invalidate-http-cache-on-entity-removal-subscriber.php b/_sql/migrations/1463-invalidate-http-cache-on-entity-removal-subscriber.php index f8283ce0374..09ce6502606 100644 --- a/_sql/migrations/1463-invalidate-http-cache-on-entity-removal-subscriber.php +++ b/_sql/migrations/1463-invalidate-http-cache-on-entity-removal-subscriber.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1463 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1464-fix-translation.php b/_sql/migrations/1464-fix-translation.php index b99e9efc49e..fc5db46b47b 100644 --- a/_sql/migrations/1464-fix-translation.php +++ b/_sql/migrations/1464-fix-translation.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1464 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/147-translations.php b/_sql/migrations/147-translations.php index 21aea5746cd..ae92ca4669d 100644 --- a/_sql/migrations/147-translations.php +++ b/_sql/migrations/147-translations.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration147 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/148-payment-method-refactor.php b/_sql/migrations/148-payment-method-refactor.php index e1ac1cb4534..bc79bf7bc8a 100644 --- a/_sql/migrations/148-payment-method-refactor.php +++ b/_sql/migrations/148-payment-method-refactor.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration148 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/149-add-sepa-database-items.php b/_sql/migrations/149-add-sepa-database-items.php index c1cb433521f..4a371411b00 100644 --- a/_sql/migrations/149-add-sepa-database-items.php +++ b/_sql/migrations/149-add-sepa-database-items.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration149 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/150-add-checkout-payment-info-change-config.php b/_sql/migrations/150-add-checkout-payment-info-change-config.php index cf93eb412dd..d7c21f75228 100644 --- a/_sql/migrations/150-add-checkout-payment-info-change-config.php +++ b/_sql/migrations/150-add-checkout-payment-info-change-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration150 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/151-add-missing-emotion-field-types.php b/_sql/migrations/151-add-missing-emotion-field-types.php index 4cfea89895c..c9cb4cb6404 100644 --- a/_sql/migrations/151-add-missing-emotion-field-types.php +++ b/_sql/migrations/151-add-missing-emotion-field-types.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration151 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1600-remove-articleid-from-article-attributes-schema.php b/_sql/migrations/1600-remove-articleid-from-article-attributes-schema.php index 515ef727d35..dff70f4d1a1 100644 --- a/_sql/migrations/1600-remove-articleid-from-article-attributes-schema.php +++ b/_sql/migrations/1600-remove-articleid-from-article-attributes-schema.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1600 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1601-add-http2-push-setting.php b/_sql/migrations/1601-add-http2-push-setting.php index f270c95c0cd..5fa0d07abd9 100644 --- a/_sql/migrations/1601-add-http2-push-setting.php +++ b/_sql/migrations/1601-add-http2-push-setting.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1601 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1602-add-plugin-manager-privilege.php b/_sql/migrations/1602-add-plugin-manager-privilege.php index 2d76e07b8a3..5c895809fb1 100644 --- a/_sql/migrations/1602-add-plugin-manager-privilege.php +++ b/_sql/migrations/1602-add-plugin-manager-privilege.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1602 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1604-add-html-minify-option.php b/_sql/migrations/1604-add-html-minify-option.php index 4e392eae953..630850000d9 100644 --- a/_sql/migrations/1604-add-html-minify-option.php +++ b/_sql/migrations/1604-add-html-minify-option.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1604 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1605-add-plugin-migration-table.php b/_sql/migrations/1605-add-plugin-migration-table.php index 86f1e5c6b59..37d3a23afb5 100644 --- a/_sql/migrations/1605-add-plugin-migration-table.php +++ b/_sql/migrations/1605-add-plugin-migration-table.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1605 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1606-extend-error-mail-recipients-setting.php b/_sql/migrations/1606-extend-error-mail-recipients-setting.php index 1ef99c2be2a..12c280b37b8 100644 --- a/_sql/migrations/1606-extend-error-mail-recipients-setting.php +++ b/_sql/migrations/1606-extend-error-mail-recipients-setting.php @@ -1,26 +1,24 @@ Falls inaktiv, wird der Warenkorb beim Logout nicht geleert und bleibt für einen späteren Login erhalten.', 'boolean', 0, 0, 0, null); - + SET @elementId = (SELECT id FROM `s_core_config_elements` WHERE `name` = 'clearBasketAfterLogout' LIMIT 1); INSERT INTO s_core_config_element_translations (element_id, locale_id, label, description) VALUES (@elementId, 2, 'Clear basket after logout', 'If active, the shopping cart will be cleared after a logout.
        If inactive, the shopping cart will not be cleared after a logout and will be retained for a later login.'); SQL; diff --git a/_sql/migrations/1614-add-emotion-in-listing-config.php b/_sql/migrations/1614-add-emotion-in-listing-config.php index a0135197142..defcea39cd7 100644 --- a/_sql/migrations/1614-add-emotion-in-listing-config.php +++ b/_sql/migrations/1614-add-emotion-in-listing-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/1615-add-cart-migration-option.php b/_sql/migrations/1615-add-cart-migration-option.php index 009e8ef43b1..b644a946be1 100644 --- a/_sql/migrations/1615-add-cart-migration-option.php +++ b/_sql/migrations/1615-add-cart-migration-option.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1615 extends Shopware\Components\Migrations\AbstractMigration @@ -28,9 +27,9 @@ public function up($modus) { $sql = <<
        Achtung: Sind Artikel in einzelnen Sprachvarianten nicht verfügbar, werden diese aus Warenkörben entfernt und können innerhalb der Sitzung nicht mehr wiederhergestellt werden.', 'boolean', 0, 0, 0, null); - + SET @elementId = (SELECT id FROM `s_core_config_elements` WHERE `name` = 'shareSessionBetweenLanguageShops' LIMIT 1); INSERT INTO s_core_config_element_translations (element_id, locale_id, label, description) VALUES (@elementId, 2, 'Share browser session between language shops', 'When active, the browser session is shared between language shops. Thus the customer does not lose the shopping basket when switching'); SQL; @@ -39,7 +38,7 @@ public function up($modus) if ($modus === self::MODUS_UPDATE) { $sql = "INSERT INTO `s_core_config_values` (`element_id`, `shop_id`, `value`) - SELECT + SELECT @elementId, `id`, 'b:0;' diff --git a/_sql/migrations/1618-add-custom-sort.php b/_sql/migrations/1618-add-custom-sort.php index 23ff0bff5eb..50d1297ccbf 100644 --- a/_sql/migrations/1618-add-custom-sort.php +++ b/_sql/migrations/1618-add-custom-sort.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1618 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1620-add-mail-log-menu-entry.php b/_sql/migrations/1620-add-mail-log-menu-entry.php index 057d934f60f..ef275c65c50 100644 --- a/_sql/migrations/1620-add-mail-log-menu-entry.php +++ b/_sql/migrations/1620-add-mail-log-menu-entry.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1620 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1621-add-mail-log-config.php b/_sql/migrations/1621-add-mail-log-config.php index 1e77d12d75e..bbfd3a1b98a 100644 --- a/_sql/migrations/1621-add-mail-log-config.php +++ b/_sql/migrations/1621-add-mail-log-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1621 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1622-add-maillog-acl-role.php b/_sql/migrations/1622-add-maillog-acl-role.php index e58ff0fc9d4..bf871a986f3 100644 --- a/_sql/migrations/1622-add-maillog-acl-role.php +++ b/_sql/migrations/1622-add-maillog-acl-role.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1622 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1623-add-content-type-to-menu.php b/_sql/migrations/1623-add-content-type-to-menu.php index e88bf36c4d6..41a8aa83562 100644 --- a/_sql/migrations/1623-add-content-type-to-menu.php +++ b/_sql/migrations/1623-add-content-type-to-menu.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1623 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1624-add-content-type-to-emotion.php b/_sql/migrations/1624-add-content-type-to-emotion.php index 78381239d27..cf5712e32a0 100644 --- a/_sql/migrations/1624-add-content-type-to-emotion.php +++ b/_sql/migrations/1624-add-content-type-to-emotion.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1624 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1625-add-sort-by-articlenumber.php b/_sql/migrations/1625-add-sort-by-articlenumber.php index 0e010b9f39e..c04bdb31eb9 100644 --- a/_sql/migrations/1625-add-sort-by-articlenumber.php +++ b/_sql/migrations/1625-add-sort-by-articlenumber.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1625 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1626-add password_change_date.php b/_sql/migrations/1626-add password_change_date.php index 523ec4bf82b..9de0bfee4dd 100644 --- a/_sql/migrations/1626-add password_change_date.php +++ b/_sql/migrations/1626-add password_change_date.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1626 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1627-add-foreign-key-for-s_order_details.php b/_sql/migrations/1627-add-foreign-key-for-s_order_details.php index 3b085331e33..b6fb3fc822e 100644 --- a/_sql/migrations/1627-add-foreign-key-for-s_order_details.php +++ b/_sql/migrations/1627-add-foreign-key-for-s_order_details.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1627 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1628-add-birthday-single-field-option.php b/_sql/migrations/1628-add-birthday-single-field-option.php index d9f40141da1..ce0f302cdbe 100644 --- a/_sql/migrations/1628-add-birthday-single-field-option.php +++ b/_sql/migrations/1628-add-birthday-single-field-option.php @@ -3,30 +3,29 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1628 extends Shopware\Components\Migrations\AbstractMigration { public function up($modus) { - $this->addSql('UPDATE `s_core_config_elements` + $this->addSql('UPDATE `s_core_config_elements` SET `position` = `id` WHERE `form_id` = ( SELECT `id` FROM `s_core_config_forms` WHERE `name` = \'Frontend33\' LIMIT 1 @@ -41,7 +40,7 @@ public function up($modus) $this->addSql('SET @configId = LAST_INSERT_ID();'); $this->addSql('SET @positionId = (SELECT id FROM `s_core_config_elements` WHERE name = \'requirebirthdayfield\' LIMIT 1);'); - $this->addSql('UPDATE `s_core_config_elements` + $this->addSql('UPDATE `s_core_config_elements` SET position = @positionId WHERE `id` = @configId '); diff --git a/_sql/migrations/1629-translate-dispatch-methods.php b/_sql/migrations/1629-translate-dispatch-methods.php index f54daf22690..c4b9afb3744 100644 --- a/_sql/migrations/1629-translate-dispatch-methods.php +++ b/_sql/migrations/1629-translate-dispatch-methods.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/1630-set-empty-options-null.php b/_sql/migrations/1630-set-empty-options-null.php index d7eb548a144..bca55c9f34c 100644 --- a/_sql/migrations/1630-set-empty-options-null.php +++ b/_sql/migrations/1630-set-empty-options-null.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1630 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1631-add-shop-id-column-to-blogs.php b/_sql/migrations/1631-add-shop-id-column-to-blogs.php index 15d36465504..9f5d2e5f45f 100644 --- a/_sql/migrations/1631-add-shop-id-column-to-blogs.php +++ b/_sql/migrations/1631-add-shop-id-column-to-blogs.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/1632-add-acl-privilege-requirements.php b/_sql/migrations/1632-add-acl-privilege-requirements.php index abed9f1554c..dd911601be0 100644 --- a/_sql/migrations/1632-add-acl-privilege-requirements.php +++ b/_sql/migrations/1632-add-acl-privilege-requirements.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/1633-offcanvas-shipping-cost-display.php b/_sql/migrations/1633-offcanvas-shipping-cost-display.php index 14a068b5684..3811a704769 100644 --- a/_sql/migrations/1633-offcanvas-shipping-cost-display.php +++ b/_sql/migrations/1633-offcanvas-shipping-cost-display.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1633 extends Shopware\Components\Migrations\AbstractMigration @@ -27,8 +26,8 @@ class Migrations_Migration1633 extends Shopware\Components\Migrations\AbstractMi public function up($modus) { $sql = <<<'SQL' -UPDATE `s_core_config_elements` -SET `description` = 'Diese Option aktiviert die Versandkostenberechnung für den Mini- bzw. OffCanvas-Warenkorb. Dies ist nur für Kunden verfügbar, die nicht angemeldet sind.' +UPDATE `s_core_config_elements` +SET `description` = 'Diese Option aktiviert die Versandkostenberechnung für den Mini- bzw. OffCanvas-Warenkorb. Dies ist nur für Kunden verfügbar, die nicht angemeldet sind.' WHERE `name` = 'showShippingCostsOffCanvas'; SET @elementId = (SELECT id FROM `s_core_config_elements` WHERE `name` = 'showShippingCostsOffCanvas' LIMIT 1); diff --git a/_sql/migrations/1634-add-shipping-surcharge-number.php b/_sql/migrations/1634-add-shipping-surcharge-number.php index 121a0850e8f..17f338ace15 100644 --- a/_sql/migrations/1634-add-shipping-surcharge-number.php +++ b/_sql/migrations/1634-add-shipping-surcharge-number.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1634 extends Shopware\Components\Migrations\AbstractMigration @@ -28,9 +27,9 @@ public function up($modus) { $sql = <<addSql($sql); } diff --git a/_sql/migrations/1648-add-new-cookie-button-config.php b/_sql/migrations/1648-add-new-cookie-button-config.php index 366f75f7f33..55af728c9c2 100644 --- a/_sql/migrations/1648-add-new-cookie-button-config.php +++ b/_sql/migrations/1648-add-new-cookie-button-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1648 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1649-add-cookie-consent-manager-site.php b/_sql/migrations/1649-add-cookie-consent-manager-site.php index 722e5911e14..a91a8c7327b 100644 --- a/_sql/migrations/1649-add-cookie-consent-manager-site.php +++ b/_sql/migrations/1649-add-cookie-consent-manager-site.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/1650-technical-support-menu.php b/_sql/migrations/1650-technical-support-menu.php index 3a1812d364b..e0e37c7a12d 100644 --- a/_sql/migrations/1650-technical-support-menu.php +++ b/_sql/migrations/1650-technical-support-menu.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1650 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1651-feedback-menu-fix.php b/_sql/migrations/1651-feedback-menu-fix.php index f88fe15e856..8faea94053b 100644 --- a/_sql/migrations/1651-feedback-menu-fix.php +++ b/_sql/migrations/1651-feedback-menu-fix.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1651 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1652-enforce-unique-attributes.php b/_sql/migrations/1652-enforce-unique-attributes.php index 6859cfce6c3..a309c5efb6d 100644 --- a/_sql/migrations/1652-enforce-unique-attributes.php +++ b/_sql/migrations/1652-enforce-unique-attributes.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/1653-add-argon2-hashing.php b/_sql/migrations/1653-add-argon2-hashing.php index fd2bcbbb3b8..0b06ec8ef41 100644 --- a/_sql/migrations/1653-add-argon2-hashing.php +++ b/_sql/migrations/1653-add-argon2-hashing.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/1654-add-hreflang-just-seo-option.php b/_sql/migrations/1654-add-hreflang-just-seo-option.php index e60d4f8453c..3f3c7560d2b 100644 --- a/_sql/migrations/1654-add-hreflang-just-seo-option.php +++ b/_sql/migrations/1654-add-hreflang-just-seo-option.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/1655-disable-html-minification-on-install.php b/_sql/migrations/1655-disable-html-minification-on-install.php index 7d37463cbfa..c2f66e73df3 100644 --- a/_sql/migrations/1655-disable-html-minification-on-install.php +++ b/_sql/migrations/1655-disable-html-minification-on-install.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1655 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1656-add-config-show-shipping-countries-checkout.php b/_sql/migrations/1656-add-config-show-shipping-countries-checkout.php index 8a80286719f..3d6bbd4918d 100644 --- a/_sql/migrations/1656-add-config-show-shipping-countries-checkout.php +++ b/_sql/migrations/1656-add-config-show-shipping-countries-checkout.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration1656 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/1700-add-sitemap-tables.php b/_sql/migrations/1700-add-sitemap-tables.php index 9ae3629c295..47aabe05c89 100644 --- a/_sql/migrations/1700-add-sitemap-tables.php +++ b/_sql/migrations/1700-add-sitemap-tables.php @@ -1,28 +1,26 @@ 'sACCEPTNOTIFICATION', 'objectdata' => 'a:2:{s:7:"subject";s:39:"Please confirm your e-mail notification";s:7:"content";s:240:"Hello, + ['name' => 'sACCEPTNOTIFICATION', 'objectdata' => 'a:2:{s:7:"subject";s:39:"Please confirm your e-mail notification";s:7:"content";s:240:"Hello, -Thank you for signing up for the automatical e-Mail notification for the article {$sArticleName}. +Thank you for signing up for the automatical e-Mail notification for the article {$sArticleName}. Please confirm the notification by clicking the following link: -{$sConfirmLink} +{$sConfirmLink} Best regards Your Team of {config name=shopName}";}'], - ['name' => 'sARTICLEAVAILABLE', 'objectdata' => 'a:2:{s:7:"subject";s:31:"Your article is available again";s:7:"content";s:148:"Hello, + ['name' => 'sARTICLEAVAILABLE', 'objectdata' => 'a:2:{s:7:"subject";s:31:"Your article is available again";s:7:"content";s:148:"Hello, -Your article with the order number {$sOrdernumber} is available again. +Your article with the order number {$sOrdernumber} is available again. -{$sArticleLink} +{$sArticleLink} Best regards Your Team of {config name=shopName}";}'], ['name' => 'sARTICLECOMMENT', 'objectdata' => 'a:2:{s:7:"subject";s:16:"Evaluate article";s:7:"content";s:948:"

        Hello {if $sUser.salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.billing_firstname} {$sUser.billing_lastname},

        -You have recently purchased articles from {config name=shopName}. We would be pleased if you could evaluate these items. Doing so, you can help us improve our services, and you have the opportunity to tell other customers your opinion. -By the way: You do not necessarily have to comment on the articles you have bought. You can select the ones you like best. We would welcome any feedback that you have. +You have recently purchased articles from {config name=shopName}. We would be pleased if you could evaluate these items. Doing so, you can help us improve our services, and you have the opportunity to tell other customers your opinion. +By the way: You do not necessarily have to comment on the articles you have bought. You can select the ones you like best. We would welcome any feedback that you have. Here you can find the links to the evaluations of your purchased articles.

        @@ -349,9 +348,9 @@ private function getDefaultTranslationValues()

        ";}'], ['name' => 'sARTICLESTOCK', 'objectdata' => 'a:2:{s:7:"subject";s:83:"Stock level of {$sData.count} article{if $sData.count>1}s{/if} under minimum stock ";s:7:"content";s:260:"Hello, The following articles have undershot the minimum stock: -Order number Name of article Stock/Minimum stock +Order number Name of article Stock/Minimum stock {foreach from=$sJob.articles item=sArticle key=key} -{$sArticle.ordernumber} {$sArticle.name} {$sArticle.instock}/{$sArticle.stockmin} +{$sArticle.ordernumber} {$sArticle.name} {$sArticle.instock}/{$sArticle.stockmin} {/foreach} ";}'], ['name' => 'sBIRTHDAY', 'objectdata' => 'a:2:{s:7:"subject";s:40:"Happy Birthday from {$sConfig.sSHOPNAME}";s:7:"content";s:174:"Hello {if $sUser.salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.firstname} {$sUser.lastname}, @@ -359,33 +358,33 @@ private function getDefaultTranslationValues() Best regards Your team of {$sConfig.sSHOPNAME}";}'], ['name' => 'sCANCELEDQUESTION', 'objectdata' => 'a:2:{s:7:"subject";s:69:"Your aborted order process - Send us your feedback and get a voucher!";s:7:"content";s:378:"Dear customer, - + You have recently aborted an order process on Demoshop.de - we are always working to make shopping with our shop as pleasant as possible. Therefore we would like to know why your order has failed. - -Please tell us the reason why you have aborted your order. We will reward your additional effort by sending you a 5,00 €-voucher. - + +Please tell us the reason why you have aborted your order. We will reward your additional effort by sending you a 5,00 €-voucher. + Thank you for your feedback";}'], ['name' => 'sCANCELEDVOUCHER', 'objectdata' => 'a:2:{s:7:"subject";s:50:"Your aborted order process - Voucher code enclosed";s:7:"content";s:351:"Dear customer, - + You have recently aborted an order process on Demoshop.de - today, we would like to give you a 5,00 Euro-voucher - and therefore make it easier for you to decide for an order with Demoshop.de. - + Your voucher is valid for two months and can be redeemed by entering the code "{$sVouchercode}". We would be pleased to accept your order!";}'], ['name' => 'sCUSTOMERGROUPHACCEPTED', 'objectdata' => 'a:2:{s:7:"subject";s:39:"Your merchant account has been unlocked";s:7:"content";s:186:"Hello, Your merchant account {config name=shopName} has been unlocked. - -From now on, we will charge you the net purchase price. - + +From now on, we will charge you the net purchase price. + Best regards - + Your team of {config name=shopName}";}'], ['name' => 'sCUSTOMERGROUPHREJECTED', 'objectdata' => 'a:2:{s:7:"subject";s:41:"Your trader account has not been accepted";s:7:"content";s:307:"Dear customer, -Thank you for your interest in our trade prices. Unfortunately, we do not have a trading license yet so that we cannot accept you as a trader. +Thank you for your interest in our trade prices. Unfortunately, we do not have a trading license yet so that we cannot accept you as a trader. -In case of further questions please do not hesitate to contact us via telephone, fax or email. +In case of further questions please do not hesitate to contact us via telephone, fax or email. Best regards @@ -403,39 +402,39 @@ private function getDefaultTranslationValues() {config name=shopName} ";}'], - ['name' => 'sOPTINNEWSLETTER', 'objectdata' => 'a:2:{s:7:"subject";s:43:"Please confirm your newsletter subscription";s:7:"content";s:208:"Hello, + ['name' => 'sOPTINNEWSLETTER', 'objectdata' => 'a:2:{s:7:"subject";s:43:"Please confirm your newsletter subscription";s:7:"content";s:208:"Hello, -Thank you for signing up for our regularly published newsletter. +Thank you for signing up for our regularly published newsletter. -Please confirm your subscription by clicking the following link: {$sConfirmLink} +Please confirm your subscription by clicking the following link: {$sConfirmLink} Best regards Your Team of {config name=shopName}";}'], - ['name' => 'sOPTINVOTE', 'objectdata' => 'a:2:{s:7:"subject";s:38:"Please confirm your article evaluation";s:7:"content";s:164:"Hello, + ['name' => 'sOPTINVOTE', 'objectdata' => 'a:2:{s:7:"subject";s:38:"Please confirm your article evaluation";s:7:"content";s:164:"Hello, -Thank you for evaluating the article{$sArticle.articleName}. +Thank you for evaluating the article{$sArticle.articleName}. -Please confirm the evaluation by clicking the following link: {$sConfirmLink} +Please confirm the evaluation by clicking the following link: {$sConfirmLink} Best regards";}'], ['name' => 'sORDER', 'objectdata' => 'a:3:{s:7:"subject";s:28:"Your order with the demoshop";s:7:"content";s:1739:"Hello {$billingaddress.firstname} {$billingaddress.lastname}, - + Thank you for your order at {config name=shopName} (Number: {$sOrderNumber}) on {$sOrderDay} at {$sOrderTime}. Information on your order: - + Pos. Art.No. Quantities Price Total {foreach item=details key=position from=$sOrderDetails} {$position+1|fill:4} {$details.ordernumber|fill:20} {$details.quantity|fill:6} {$details.price|padding:8} EUR {$details.amount|padding:8} EUR {$details.articlename|wordwrap:49|indent:5} {/foreach} - + Shipping costs: {$sShippingCosts} Total net: {$sAmountNet} {if !$sNet} Total gross: {$sAmount} {/if} - + Selected payment type: {$additional.payment.description} {$additional.payment.additionaldescription} {if $additional.payment.name == "debit"} @@ -445,17 +444,17 @@ private function getDefaultTranslationValues() We will withdraw the money from your bank account within the next days. {/if} {if $additional.payment.name == "prepayment"} - + Our bank connection: Account: ### BIN: ### {/if} - + {if $sComment} Your comment: {$sComment} {/if} - + Billing address: {$billingaddress.company} {$billingaddress.firstname} {$billingaddress.lastname} @@ -463,22 +462,22 @@ private function getDefaultTranslationValues() {$billingaddress.zipcode} {$billingaddress.city} {$billingaddress.phone} {$additional.country.countryname} - + Shipping address: {$shippingaddress.company} {$shippingaddress.firstname} {$shippingaddress.lastname} {$shippingaddress.street} {$shippingaddress.zipcode} {$shippingaddress.city} {$additional.country.countryname} - + {if $billingaddress.ustid} Your VAT-ID: {$billingaddress.ustid} -In case of a successful order and if you are based in one of the EU countries, you will receive your goods exempt from turnover tax. +In case of a successful order and if you are based in one of the EU countries, you will receive your goods exempt from turnover tax. {/if} ";s:11:"contentHtml";s:3493:"
        - +

        Hello {$billingaddress.firstname} {$billingaddress.lastname},

        - + Thank you for your order with {config name=shopName} (Nummer: {$sOrderNumber}) on {$sOrderDay} at {$sOrderTime}.

        @@ -492,7 +491,7 @@ private function getDefaultTranslationValues() Price Total - + {foreach item=details key=position from=$sOrderDetails} {if $details.image.src.1}{$details.articlename}{else} {/if} @@ -506,9 +505,9 @@ private function getDefaultTranslationValues() {$details.articlename|wordwrap:80|indent:4} {/foreach} - + - +



        @@ -532,7 +531,7 @@ private function getDefaultTranslationValues() {if $additional.payment.name == "prepayment"} Our bank connection:
        {config name=bankAccount} - {/if} + {/if}

        Selected dispatch: {$sDispatch.name}
        {$sDispatch.description} @@ -541,7 +540,7 @@ private function getDefaultTranslationValues() {if $sComment} Your comment:
        {$sComment}
        - {/if} + {/if}

        Billing address:
        @@ -562,7 +561,7 @@ private function getDefaultTranslationValues()
        {if $billingaddress.ustid} Your VAT-ID: {$billingaddress.ustid}
        - In case of a successful order and if you are based in one of the EU countries, you will receive your goods exempt from turnover tax. + In case of a successful order and if you are based in one of the EU countries, you will receive your goods exempt from turnover tax. {/if}

        @@ -581,58 +580,58 @@ private function getDefaultTranslationValues() The status of your order with order number{$sOrder.ordernumber} of {$sOrder.ordertime|date_format:" %d-%m-%Y"} has changed. The new status is as follows {$sOrder.status_description}.";}'], ['name' => 'sORDERSTATEMAIL3', 'objectdata' => 'a:2:{s:7:"subject";s:13:"Status change";s:7:"content";s:923:"Dear {if $sUser.billing_salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"} Mrs{/if} {$sUser.billing_firstname} {$sUser.billing_lastname}, - -The status of your order {$sOrder.ordernumber} of {$sOrder.ordertime|date_format:" %d.%m.%Y"} + +The status of your order {$sOrder.ordernumber} of {$sOrder.ordertime|date_format:" %d.%m.%Y"} has changed. The new status is as follows: "{$sOrder.status_description}". - - + + Information on your order: -================================== +================================== {foreach item=details key=position from=$sOrderDetails} {$position+1|fill:3} {$details.articleordernumber|fill:10:" ":"..."} {$details.name|fill:30} {$details.quantity} x {$details.price|string_format:"%.2f"} {$sConfig.sCURRENCY} {/foreach} - + Shipping costs: {$sOrder.invoice_shipping} {$sConfig.sCURRENCY} Net total: {$sOrder.invoice_amount_net|string_format:"%.2f"} {$sConfig.sCURRENCY} Total amount incl. VAT: {$sOrder.invoice_amount|string_format:"%.2f"} {$sConfig.sCURRENCY} - + Best regards, Your team of {config name=shopName} ";}'], ['name' => 'sORDERSTATEMAIL4', 'objectdata' => 'a:2:{s:7:"subject";s:38:"Your order with {config name=shopName}";s:7:"content";s:551:"Hello {if $sUser.billing_salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.billing_firstname} {$sUser.billing_lastname}, - + The order status of your order {$sOrder.ordernumber} has changed! The order now has the following status: {$sOrder.status_description}. You can check the current status of your order on our website under "My account" - "My orders" anytime. But in case you have purchased without a registration or a customer account, you do not have this option. - + Best regards, Your team of {config name=shopName}";}'], - ['name' => 'sORDERSTATEMAIL5', 'objectdata' => 'a:2:{s:7:"subject";s:38:"Your order with {config name=shopName}";s:7:"content";s:389:"Dear{if $sUser.billing_salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} + ['name' => 'sORDERSTATEMAIL5', 'objectdata' => 'a:2:{s:7:"subject";s:38:"Your order with {config name=shopName}";s:7:"content";s:389:"Dear{if $sUser.billing_salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.billing_firstname} {$sUser.billing_lastname}, - -The status of your order with order number {$sOrder.ordernumber} of {$sOrder.ordertime|date_format:" %d.%m.%Y"} + +The status of your order with order number {$sOrder.ordernumber} of {$sOrder.ordertime|date_format:" %d.%m.%Y"} has changed. The new status is as follows: {$sOrder.status_description}. - + Best regards, Your team of {config name=shopName}";}'], ['name' => 'sORDERSTATEMAIL6', 'objectdata' => 'a:2:{s:7:"subject";s:38:"Your order with {config name=shopName}";s:7:"content";s:552:"Hello {if $sUser.billing_salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.billing_firstname} {$sUser.billing_lastname}, - + The order status of your order {$sOrder.ordernumber} has changed! Your order now has the following status: {$sOrder.status_description}. You can check the current status of your order on our website under "My account" - "My orders" anytime. But in case you have purchased without a registration or a customer account, you do not have this option. - + Best regards, Your team of {config name=shopName}";}'], ['name' => 'sORDERSTATEMAIL8', 'objectdata' => 'a:2:{s:7:"subject";s:38:"Your order with {config name=shopName}";s:7:"content";s:553:"Hello {if $sUser.billing_salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.billing_firstname} {$sUser.billing_lastname}, - + The status of your order {$sOrder.ordernumber} has changed! The current status of your order is as follows: {$sOrder.status_description}. You can check the current status of your order on our website under "My account" - "My orders" anytime. But in case you have purchased without a registration or a customer account, you do not have this option. - + Best regards, Your team of {config name=shopName}";}'], ['name' => 'sPASSWORD', 'objectdata' => 'a:2:{s:7:"subject";s:46:"Forgot password - Your access data for {sShop}";s:7:"content";s:127:"Hello, @@ -645,27 +644,27 @@ private function getDefaultTranslationValues() {config name=address}";}'], ['name' => 'sREGISTERCONFIRMATION', 'objectdata' => 'a:3:{s:7:"subject";s:37:"Your registration has been successful";s:7:"content";s:291:"Hello {salutation} {firstname} {lastname}, - + Thank you for your registration with our Shop. - + You will gain access via the email address {sMAIL} and the password you have chosen. - -You can have your password sent to you by email anytime. - + +You can have your password sent to you by email anytime. + Best regards - + Your team of {config name=shopName}";s:11:"contentHtml";s:354:"

        Hello {salutation} {firstname} {lastname},

        - + Thank you for your registration with our Shop.

        - + You will gain access via the email address {sMAIL} and the password you have chosen.

        - + You can have your password sent to you by email anytime.

        - + Best regards

        - + Your team of {config name=shopName}
        ";}'], ['name' => 'sTELLAFRIEND', 'objectdata' => 'a:2:{s:7:"subject";s:33:"{sName} recommends you {sArticle}";s:7:"content";s:189:"Hello, @@ -684,9 +683,9 @@ private function getDefaultTranslationValues() {user} has followed your recommendation and just ordered at {config name=shopName}. This is why we give you a X € voucher, which you can redeem with your next order. - + Your voucher code is as follows: XXX - + Best regards, {config name=shopName}";}'], ]; diff --git a/_sql/migrations/438-add-email-template-header-footer-fields.php b/_sql/migrations/438-add-email-template-header-footer-fields.php index 620cc3568c8..369efd4b8a6 100644 --- a/_sql/migrations/438-add-email-template-header-footer-fields.php +++ b/_sql/migrations/438-add-email-template-header-footer-fields.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration438 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/439-update-document-footer-styling.php b/_sql/migrations/439-update-document-footer-styling.php index 2199dca5e59..ce3846d3470 100644 --- a/_sql/migrations/439-update-document-footer-styling.php +++ b/_sql/migrations/439-update-document-footer-styling.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration439 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/440-fix-sorder-email-template.php b/_sql/migrations/440-fix-sorder-email-template.php index 10760a7546b..48f821e3a3a 100644 --- a/_sql/migrations/440-fix-sorder-email-template.php +++ b/_sql/migrations/440-fix-sorder-email-template.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration440 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/441-add-hide-downloads-in-account.php b/_sql/migrations/441-add-hide-downloads-in-account.php index d38acab3883..05d8468817d 100644 --- a/_sql/migrations/441-add-hide-downloads-in-account.php +++ b/_sql/migrations/441-add-hide-downloads-in-account.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration441 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/442-add-option-to-disable-styling-emotions.php b/_sql/migrations/442-add-option-to-disable-styling-emotions.php index c4b0477fd0e..a6d95dbcbde 100644 --- a/_sql/migrations/442-add-option-to-disable-styling-emotions.php +++ b/_sql/migrations/442-add-option-to-disable-styling-emotions.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration442 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/443-add-wizard-configuration-value.php b/_sql/migrations/443-add-wizard-configuration-value.php index ce1a1a08535..6f34b4397cb 100644 --- a/_sql/migrations/443-add-wizard-configuration-value.php +++ b/_sql/migrations/443-add-wizard-configuration-value.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration443 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/444-add-imprint-to-bottom-shop-group.php b/_sql/migrations/444-add-imprint-to-bottom-shop-group.php index ecbe060e6f1..232e38c2380 100644 --- a/_sql/migrations/444-add-imprint-to-bottom-shop-group.php +++ b/_sql/migrations/444-add-imprint-to-bottom-shop-group.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/445-import-vrrl-plugin-settings.php b/_sql/migrations/445-import-vrrl-plugin-settings.php index d28b06882f8..bd2a8a43299 100644 --- a/_sql/migrations/445-import-vrrl-plugin-settings.php +++ b/_sql/migrations/445-import-vrrl-plugin-settings.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration445 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/446-easy-registration-process.php b/_sql/migrations/446-easy-registration-process.php index ed5d0a52d49..59c0b4e396a 100644 --- a/_sql/migrations/446-easy-registration-process.php +++ b/_sql/migrations/446-easy-registration-process.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration446 extends Shopware\Components\Migrations\AbstractMigration @@ -31,7 +30,7 @@ public function up($modus) } $sql = <<<'EOD' - UPDATE `s_core_config_elements` SET value = 'b:0;' + UPDATE `s_core_config_elements` SET value = 'b:0;' WHERE name IN ('doublepasswordvalidation', 'requirePhoneField', 'showphonenumberfield', 'showbirthdayfield'); EOD; $this->addSql($sql); diff --git a/_sql/migrations/447-update-tag-cloud-defaults.php b/_sql/migrations/447-update-tag-cloud-defaults.php index 74ac7874a79..54a8b3a13e8 100644 --- a/_sql/migrations/447-update-tag-cloud-defaults.php +++ b/_sql/migrations/447-update-tag-cloud-defaults.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration447 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/448-update-first-run-wizard-snippet.php b/_sql/migrations/448-update-first-run-wizard-snippet.php index ec108b40006..9abb5dcddde 100644 --- a/_sql/migrations/448-update-first-run-wizard-snippet.php +++ b/_sql/migrations/448-update-first-run-wizard-snippet.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration448 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/449-add-pagination-seo.php b/_sql/migrations/449-add-pagination-seo.php index 328a3ed8a0a..e29a570769a 100644 --- a/_sql/migrations/449-add-pagination-seo.php +++ b/_sql/migrations/449-add-pagination-seo.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration449 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/450-add-high-dpi-album-settings.php b/_sql/migrations/450-add-high-dpi-album-settings.php index 3615fbd26f5..c7279e2f739 100644 --- a/_sql/migrations/450-add-high-dpi-album-settings.php +++ b/_sql/migrations/450-add-high-dpi-album-settings.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration450 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/451-fix-email-header-field.php b/_sql/migrations/451-fix-email-header-field.php index 635f0796623..cf24bd13fd4 100644 --- a/_sql/migrations/451-fix-email-header-field.php +++ b/_sql/migrations/451-fix-email-header-field.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration451 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/452-add-styling-classes-main-menu.php b/_sql/migrations/452-add-styling-classes-main-menu.php index 7ee1f51b34e..6c0545498c0 100644 --- a/_sql/migrations/452-add-styling-classes-main-menu.php +++ b/_sql/migrations/452-add-styling-classes-main-menu.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration452 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/453-update-table-encoding.php b/_sql/migrations/453-update-table-encoding.php index d6729dc3074..3cc9a778586 100644 --- a/_sql/migrations/453-update-table-encoding.php +++ b/_sql/migrations/453-update-table-encoding.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration453 extends Shopware\Components\Migrations\AbstractMigration @@ -27,7 +26,7 @@ class Migrations_Migration453 extends Shopware\Components\Migrations\AbstractMig public function up($modus) { $sql = ' - ALTER TABLE `s_core_auth_roles` + ALTER TABLE `s_core_auth_roles` CHANGE `name` `name` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, CHANGE `description` `description` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, CHANGE `source` `source` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL; @@ -35,7 +34,7 @@ public function up($modus) $this->addSql($sql); $sql = ' - ALTER TABLE `s_statistics_search` + ALTER TABLE `s_statistics_search` CHANGE `searchterm` `searchterm` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL; '; $this->addSql($sql); diff --git a/_sql/migrations/454-rename-theme-manager.php b/_sql/migrations/454-rename-theme-manager.php index 7794c4e7e16..f7dd5eae2e4 100644 --- a/_sql/migrations/454-rename-theme-manager.php +++ b/_sql/migrations/454-rename-theme-manager.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration454 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/455-cache-invalidate-variants.php b/_sql/migrations/455-cache-invalidate-variants.php index ce3edb6ac37..f68375aff4a 100644 --- a/_sql/migrations/455-cache-invalidate-variants.php +++ b/_sql/migrations/455-cache-invalidate-variants.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration455 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/456-emotion-worlds-cache-invalidation.php b/_sql/migrations/456-emotion-worlds-cache-invalidation.php index 566414785e9..64f42d87117 100644 --- a/_sql/migrations/456-emotion-worlds-cache-invalidation.php +++ b/_sql/migrations/456-emotion-worlds-cache-invalidation.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration456 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/457-add-thumbnail-config.php b/_sql/migrations/457-add-thumbnail-config.php index 66cd9a833b3..66940da0a35 100644 --- a/_sql/migrations/457-add-thumbnail-config.php +++ b/_sql/migrations/457-add-thumbnail-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration457 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/458-remove-selfhealing-plugin.php b/_sql/migrations/458-remove-selfhealing-plugin.php index 2cb972065c4..0cf5f4a28c4 100644 --- a/_sql/migrations/458-remove-selfhealing-plugin.php +++ b/_sql/migrations/458-remove-selfhealing-plugin.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration458 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/459-translate-form-fields.php b/_sql/migrations/459-translate-form-fields.php index fb45b4aac10..3de0fdbc0bd 100644 --- a/_sql/migrations/459-translate-form-fields.php +++ b/_sql/migrations/459-translate-form-fields.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration459 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/460-fix-email-header-field.php b/_sql/migrations/460-fix-email-header-field.php index 2f32e727dda..d4e21d6f902 100644 --- a/_sql/migrations/460-fix-email-header-field.php +++ b/_sql/migrations/460-fix-email-header-field.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration460 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/461-fix-sorder-email-thumbnails.php b/_sql/migrations/461-fix-sorder-email-thumbnails.php index 5095ce54e48..dc1531414e8 100644 --- a/_sql/migrations/461-fix-sorder-email-thumbnails.php +++ b/_sql/migrations/461-fix-sorder-email-thumbnails.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration461 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/462-add-emotion-position-column.php b/_sql/migrations/462-add-emotion-position-column.php index 931b13b6890..422e024fffb 100644 --- a/_sql/migrations/462-add-emotion-position-column.php +++ b/_sql/migrations/462-add-emotion-position-column.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration462 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/463-translate-emotion-html-video.php b/_sql/migrations/463-translate-emotion-html-video.php index 45fecf72ef5..a24d258ffd3 100644 --- a/_sql/migrations/463-translate-emotion-html-video.php +++ b/_sql/migrations/463-translate-emotion-html-video.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration463 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/464-add-feed-dirty-flag.php b/_sql/migrations/464-add-feed-dirty-flag.php index 6b2dc3235ca..0ec7fea1046 100644 --- a/_sql/migrations/464-add-feed-dirty-flag.php +++ b/_sql/migrations/464-add-feed-dirty-flag.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration464 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/465-token-secret.php b/_sql/migrations/465-token-secret.php index 17b511c388e..2cb4e1dea67 100644 --- a/_sql/migrations/465-token-secret.php +++ b/_sql/migrations/465-token-secret.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration465 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/466-supplier-seo-url.php b/_sql/migrations/466-supplier-seo-url.php index d37e9ae5e06..6292dde5c7f 100644 --- a/_sql/migrations/466-supplier-seo-url.php +++ b/_sql/migrations/466-supplier-seo-url.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration466 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/467-remove-listing-seo-url.php b/_sql/migrations/467-remove-listing-seo-url.php index 5849106768b..762d192957a 100644 --- a/_sql/migrations/467-remove-listing-seo-url.php +++ b/_sql/migrations/467-remove-listing-seo-url.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration467 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/468-update-feeds-thumbnails-size.php b/_sql/migrations/468-update-feeds-thumbnails-size.php index ff9b9cd0eba..6adcd94a3c2 100644 --- a/_sql/migrations/468-update-feeds-thumbnails-size.php +++ b/_sql/migrations/468-update-feeds-thumbnails-size.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration468 extends Shopware\Components\Migrations\AbstractMigration @@ -31,7 +30,7 @@ public function up($modus) } $sql = <<<'SQL' -UPDATE `s_export` +UPDATE `s_export` SET body = '{strip}\n{$sArticle.ordernumber|escape}{#S#}\n{$sArticle.name|strip_tags|strip|truncate:80:"...":true|escape|htmlentities}{#S#}\n{$sArticle.description_long|strip_tags|html_entity_decode|trim|regex_replace:"#[^\\wöäüÖÄÜß\\.%&-+ ]#i":""|strip|truncate:500:"...":true|htmlentities|escape}{#S#}\n{$sArticle.articleID|link:$sArticle.name|escape}{#S#}\n{$sArticle.image|image:1}{#S#}\n{$sArticle.ean|escape}{#S#}\n{if $sArticle.weight}{$sArticle.weight|escape:"number"}{" kg"}{/if}{#S#}\n{$sArticle.supplier|escape}{#S#}\n{$sArticle.suppliernumber|escape}{#S#}\nNeu{#S#}\n{$sArticle.articleID|category:" > "|escape}{#S#}\n{$sArticle.price|escape:"number"}{#S#}\nDE::DHL:{$sArticle|@shippingcost:"prepayment":"de"}{#S#}\n{#S#}\n{$sCurrency.currency}\n{/strip}{#L#}' WHERE `name` = 'Google Produktsuche' AND dirty = 0; diff --git a/_sql/migrations/469-add-404-article-page-config.php b/_sql/migrations/469-add-404-article-page-config.php index efa26a2b2ec..e467ae4679d 100644 --- a/_sql/migrations/469-add-404-article-page-config.php +++ b/_sql/migrations/469-add-404-article-page-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration469 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/470-update-price-variation-column-type.php b/_sql/migrations/470-update-price-variation-column-type.php index f74715f30bc..47a120da5e9 100644 --- a/_sql/migrations/470-update-price-variation-column-type.php +++ b/_sql/migrations/470-update-price-variation-column-type.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration470 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/471-fix-attr17.php b/_sql/migrations/471-fix-attr17.php index a5266f0ab6c..cecb1eb27a2 100644 --- a/_sql/migrations/471-fix-attr17.php +++ b/_sql/migrations/471-fix-attr17.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration471 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/472-add-landing-page-parent.php b/_sql/migrations/472-add-landing-page-parent.php index ff2ef61de30..d8d052b2e96 100644 --- a/_sql/migrations/472-add-landing-page-parent.php +++ b/_sql/migrations/472-add-landing-page-parent.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration472 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/473-add-zip-city-flip-option.php b/_sql/migrations/473-add-zip-city-flip-option.php index 6d05def5784..01ff358790b 100644 --- a/_sql/migrations/473-add-zip-city-flip-option.php +++ b/_sql/migrations/473-add-zip-city-flip-option.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration473 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/474-switch-zipcode-city-emails.php b/_sql/migrations/474-switch-zipcode-city-emails.php index bab888f4409..2e4aa21d1c6 100644 --- a/_sql/migrations/474-switch-zipcode-city-emails.php +++ b/_sql/migrations/474-switch-zipcode-city-emails.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration474 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/475-add-missing-emails.php b/_sql/migrations/475-add-missing-emails.php index 01d1cb632f2..2ee17cb00ce 100644 --- a/_sql/migrations/475-add-missing-emails.php +++ b/_sql/migrations/475-add-missing-emails.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration475 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/476-add-less-compatible-flag.php b/_sql/migrations/476-add-less-compatible-flag.php index cb7254075af..2c8cc52b0dd 100644 --- a/_sql/migrations/476-add-less-compatible-flag.php +++ b/_sql/migrations/476-add-less-compatible-flag.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration476 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/477-disable-tag-cloud-for-installation.php b/_sql/migrations/477-disable-tag-cloud-for-installation.php index 8764e70a720..df70c3cf969 100644 --- a/_sql/migrations/477-disable-tag-cloud-for-installation.php +++ b/_sql/migrations/477-disable-tag-cloud-for-installation.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration477 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/478-add-emotion-banner-title-attr.php b/_sql/migrations/478-add-emotion-banner-title-attr.php index 2fad84c0d0c..dcc69581c24 100644 --- a/_sql/migrations/478-add-emotion-banner-title-attr.php +++ b/_sql/migrations/478-add-emotion-banner-title-attr.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration478 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/479-implement-after-update-wizard.php b/_sql/migrations/479-implement-after-update-wizard.php index 0c61e6d7f54..4b3c04bba8a 100644 --- a/_sql/migrations/479-implement-after-update-wizard.php +++ b/_sql/migrations/479-implement-after-update-wizard.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration479 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/480-translate-multi-edit-config-form.php b/_sql/migrations/480-translate-multi-edit-config-form.php index 36b4277ba5d..82f6b3229ce 100644 --- a/_sql/migrations/480-translate-multi-edit-config-form.php +++ b/_sql/migrations/480-translate-multi-edit-config-form.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration480 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/481-remove-vat-validation-from-core.php b/_sql/migrations/481-remove-vat-validation-from-core.php index 2a74a35e135..b058b550491 100644 --- a/_sql/migrations/481-remove-vat-validation-from-core.php +++ b/_sql/migrations/481-remove-vat-validation-from-core.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration481 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/482-remove-horizontal-scrolling.php b/_sql/migrations/482-remove-horizontal-scrolling.php index a3e548c5154..a629d676911 100644 --- a/_sql/migrations/482-remove-horizontal-scrolling.php +++ b/_sql/migrations/482-remove-horizontal-scrolling.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration482 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/483-set-device-type-nullable.php b/_sql/migrations/483-set-device-type-nullable.php index fd55c1225b4..76f98a538db 100644 --- a/_sql/migrations/483-set-device-type-nullable.php +++ b/_sql/migrations/483-set-device-type-nullable.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration483 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/484-add-seo-title-to-categories.php b/_sql/migrations/484-add-seo-title-to-categories.php index 42e13f6214b..69de589de49 100644 --- a/_sql/migrations/484-add-seo-title-to-categories.php +++ b/_sql/migrations/484-add-seo-title-to-categories.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration484 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/485-add-new-sprites-media-manager-albums.php b/_sql/migrations/485-add-new-sprites-media-manager-albums.php index 56503f8b0d3..1ba08ed3de6 100644 --- a/_sql/migrations/485-add-new-sprites-media-manager-albums.php +++ b/_sql/migrations/485-add-new-sprites-media-manager-albums.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration485 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/486-generate-mobile-sitemap.php b/_sql/migrations/486-generate-mobile-sitemap.php index f444d87867d..c3b3145b81a 100644 --- a/_sql/migrations/486-generate-mobile-sitemap.php +++ b/_sql/migrations/486-generate-mobile-sitemap.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration486 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/487-fix-service-product-snippet.php b/_sql/migrations/487-fix-service-product-snippet.php index c7bfaeea858..01ead9783b3 100644 --- a/_sql/migrations/487-fix-service-product-snippet.php +++ b/_sql/migrations/487-fix-service-product-snippet.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration487 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/488-reset-search-index.php b/_sql/migrations/488-reset-search-index.php index 7d284274660..343e5cea3ff 100644 --- a/_sql/migrations/488-reset-search-index.php +++ b/_sql/migrations/488-reset-search-index.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration488 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/489-fix-backend-menu-icons.php b/_sql/migrations/489-fix-backend-menu-icons.php index 9fc08163dd8..646b88f22df 100644 --- a/_sql/migrations/489-fix-backend-menu-icons.php +++ b/_sql/migrations/489-fix-backend-menu-icons.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration489 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/490-fix-email-templates-images-height.php b/_sql/migrations/490-fix-email-templates-images-height.php index 12b20437606..cdf44b2dde4 100644 --- a/_sql/migrations/490-fix-email-templates-images-height.php +++ b/_sql/migrations/490-fix-email-templates-images-height.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration490 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/491-change-enabled-payment-methods.php b/_sql/migrations/491-change-enabled-payment-methods.php index 42a208b7660..053d6fba172 100644 --- a/_sql/migrations/491-change-enabled-payment-methods.php +++ b/_sql/migrations/491-change-enabled-payment-methods.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration491 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/492-remove-unnecessary-data-from-base-install.php b/_sql/migrations/492-remove-unnecessary-data-from-base-install.php index f7cc08f4b8f..be70c82d7e5 100644 --- a/_sql/migrations/492-remove-unnecessary-data-from-base-install.php +++ b/_sql/migrations/492-remove-unnecessary-data-from-base-install.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration492 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/493-remove-mail-translations.php b/_sql/migrations/493-remove-mail-translations.php index 2f68c47f3f8..ec794d59dc9 100644 --- a/_sql/migrations/493-remove-mail-translations.php +++ b/_sql/migrations/493-remove-mail-translations.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration493 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/494-add-cheapest-price-calculation-config.php b/_sql/migrations/494-add-cheapest-price-calculation-config.php index 06bb234a69d..a8bfb6226cb 100644 --- a/_sql/migrations/494-add-cheapest-price-calculation-config.php +++ b/_sql/migrations/494-add-cheapest-price-calculation-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration494 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/495-fix-shopping-worlds-grid.php b/_sql/migrations/495-fix-shopping-worlds-grid.php index adcc8e8aeae..ce078603211 100644 --- a/_sql/migrations/495-fix-shopping-worlds-grid.php +++ b/_sql/migrations/495-fix-shopping-worlds-grid.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration495 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/496-add-cheapest-price-selection-config.php b/_sql/migrations/496-add-cheapest-price-selection-config.php index d7ac92b0ec1..d79f9c64a7a 100644 --- a/_sql/migrations/496-add-cheapest-price-selection-config.php +++ b/_sql/migrations/496-add-cheapest-price-selection-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration496 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/497-fix-email-payment-method-description.php b/_sql/migrations/497-fix-email-payment-method-description.php index 76d6c44d22c..747daf74670 100644 --- a/_sql/migrations/497-fix-email-payment-method-description.php +++ b/_sql/migrations/497-fix-email-payment-method-description.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration497 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/498-fix-and-add-acl-privileges.php b/_sql/migrations/498-fix-and-add-acl-privileges.php index 3fbe449582d..ba07194c603 100644 --- a/_sql/migrations/498-fix-and-add-acl-privileges.php +++ b/_sql/migrations/498-fix-and-add-acl-privileges.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration498 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/499-add-swag-update-acl-privileges.php b/_sql/migrations/499-add-swag-update-acl-privileges.php index c3446c2dd1b..22c29c6a238 100644 --- a/_sql/migrations/499-add-swag-update-acl-privileges.php +++ b/_sql/migrations/499-add-swag-update-acl-privileges.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration499 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/500-destroy-bot-sessions.php b/_sql/migrations/500-destroy-bot-sessions.php index 31ce52b71a3..ec29de16419 100644 --- a/_sql/migrations/500-destroy-bot-sessions.php +++ b/_sql/migrations/500-destroy-bot-sessions.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration500 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/501-add-added-column-in-mailaddresses.php b/_sql/migrations/501-add-added-column-in-mailaddresses.php index d517d54b80e..0cb855fe84e 100644 --- a/_sql/migrations/501-add-added-column-in-mailaddresses.php +++ b/_sql/migrations/501-add-added-column-in-mailaddresses.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration501 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/502-remove-unused-voucher-table.php b/_sql/migrations/502-remove-unused-voucher-table.php index 80a68c0be4e..2c4e9114b73 100644 --- a/_sql/migrations/502-remove-unused-voucher-table.php +++ b/_sql/migrations/502-remove-unused-voucher-table.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration502 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/503-rename-multi-edit.php b/_sql/migrations/503-rename-multi-edit.php index 8abfcb42103..a20807bd61a 100644 --- a/_sql/migrations/503-rename-multi-edit.php +++ b/_sql/migrations/503-rename-multi-edit.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration503 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/504-add-customergroup-index.php b/_sql/migrations/504-add-customergroup-index.php index 634cc76c997..4eebe1ea26c 100644 --- a/_sql/migrations/504-add-customergroup-index.php +++ b/_sql/migrations/504-add-customergroup-index.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration504 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/505-add-voucher-indexes.php b/_sql/migrations/505-add-voucher-indexes.php index 3c80d84a119..e3f2f7d2d95 100644 --- a/_sql/migrations/505-add-voucher-indexes.php +++ b/_sql/migrations/505-add-voucher-indexes.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration505 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/506-password-reset.php b/_sql/migrations/506-password-reset.php index 680e12b02ab..e33d1cf8556 100644 --- a/_sql/migrations/506-password-reset.php +++ b/_sql/migrations/506-password-reset.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration506 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/600-add-support-max-generated-similar-products.php b/_sql/migrations/600-add-support-max-generated-similar-products.php index 1c95bfa1437..1984edb6eb6 100644 --- a/_sql/migrations/600-add-support-max-generated-similar-products.php +++ b/_sql/migrations/600-add-support-max-generated-similar-products.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration600 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/601-implement-elastic-search.php b/_sql/migrations/601-implement-elastic-search.php index c8ad2823b56..110a56f9c4a 100644 --- a/_sql/migrations/601-implement-elastic-search.php +++ b/_sql/migrations/601-implement-elastic-search.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration601 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/602-add-premium-plugins-menu-item.php b/_sql/migrations/602-add-premium-plugins-menu-item.php index e24db0a9a05..6015033c331 100644 --- a/_sql/migrations/602-add-premium-plugins-menu-item.php +++ b/_sql/migrations/602-add-premium-plugins-menu-item.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration602 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/603-add-product-streams.php b/_sql/migrations/603-add-product-streams.php index d12c89ca023..791b342d4de 100644 --- a/_sql/migrations/603-add-product-streams.php +++ b/_sql/migrations/603-add-product-streams.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration603 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/604-move-discount-surchage-names-into-snippets.php b/_sql/migrations/604-move-discount-surchage-names-into-snippets.php index f3fa7830c6f..f8efc665cf4 100644 --- a/_sql/migrations/604-move-discount-surchage-names-into-snippets.php +++ b/_sql/migrations/604-move-discount-surchage-names-into-snippets.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration604 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/605-add-and-search-config.php b/_sql/migrations/605-add-and-search-config.php index d763e182802..63694500167 100644 --- a/_sql/migrations/605-add-and-search-config.php +++ b/_sql/migrations/605-add-and-search-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration605 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/606-add-state-name-column.php b/_sql/migrations/606-add-state-name-column.php index a2eaf7d2fbb..e5d161598f8 100644 --- a/_sql/migrations/606-add-state-name-column.php +++ b/_sql/migrations/606-add-state-name-column.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration606 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/607-add-rss-feed-widget.php b/_sql/migrations/607-add-rss-feed-widget.php index c2e357dd59c..d2d395e5e0a 100644 --- a/_sql/migrations/607-add-rss-feed-widget.php +++ b/_sql/migrations/607-add-rss-feed-widget.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration607 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/608-fix-product-stream-icon.php b/_sql/migrations/608-fix-product-stream-icon.php index 942a912d78e..4c3e8ef3fee 100644 --- a/_sql/migrations/608-fix-product-stream-icon.php +++ b/_sql/migrations/608-fix-product-stream-icon.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration608 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/609-add-media-recycling.php b/_sql/migrations/609-add-media-recycling.php index 4c818acee21..0409f0cf6cf 100644 --- a/_sql/migrations/609-add-media-recycling.php +++ b/_sql/migrations/609-add-media-recycling.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration609 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/610-remove-deprecated-adodb.php b/_sql/migrations/610-remove-deprecated-adodb.php index 7a2e09c447e..5ae05ac219c 100644 --- a/_sql/migrations/610-remove-deprecated-adodb.php +++ b/_sql/migrations/610-remove-deprecated-adodb.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration610 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/611-remove-deprecated-api.php b/_sql/migrations/611-remove-deprecated-api.php index 97fecdbd018..1a5fee5c4a8 100644 --- a/_sql/migrations/611-remove-deprecated-api.php +++ b/_sql/migrations/611-remove-deprecated-api.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration611 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/612-remove-deprecated-multilanguage.php b/_sql/migrations/612-remove-deprecated-multilanguage.php index 43aed403961..bc03d49648d 100644 --- a/_sql/migrations/612-remove-deprecated-multilanguage.php +++ b/_sql/migrations/612-remove-deprecated-multilanguage.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration612 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/613-add-media-meta.php b/_sql/migrations/613-add-media-meta.php index bcd15ab8157..3987e113e3d 100644 --- a/_sql/migrations/613-add-media-meta.php +++ b/_sql/migrations/613-add-media-meta.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration613 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/614-fix-document-logo-path.php b/_sql/migrations/614-fix-document-logo-path.php index 383ace8d21e..cdeae5c21a7 100644 --- a/_sql/migrations/614-fix-document-logo-path.php +++ b/_sql/migrations/614-fix-document-logo-path.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration614 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/615-password-reset.php b/_sql/migrations/615-password-reset.php index 729a33cdab8..1d98814b187 100644 --- a/_sql/migrations/615-password-reset.php +++ b/_sql/migrations/615-password-reset.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration615 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/616-product-stream-emotion-field.php b/_sql/migrations/616-product-stream-emotion-field.php index da1ad207bbd..b168a8b3d8d 100644 --- a/_sql/migrations/616-product-stream-emotion-field.php +++ b/_sql/migrations/616-product-stream-emotion-field.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration616 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/617-add-html5-emotion-handler.php b/_sql/migrations/617-add-html5-emotion-handler.php index ca1c0c5a379..70c4ef5eec6 100644 --- a/_sql/migrations/617-add-html5-emotion-handler.php +++ b/_sql/migrations/617-add-html5-emotion-handler.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration617 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/618-add-trash-album-settings.php b/_sql/migrations/618-add-trash-album-settings.php index cf4e64042c3..cb6646884e4 100644 --- a/_sql/migrations/618-add-trash-album-settings.php +++ b/_sql/migrations/618-add-trash-album-settings.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration618 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/619-add-widgets-listing-cache-tag.php b/_sql/migrations/619-add-widgets-listing-cache-tag.php index 28042fb8d6a..21615dd4d38 100644 --- a/_sql/migrations/619-add-widgets-listing-cache-tag.php +++ b/_sql/migrations/619-add-widgets-listing-cache-tag.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration619 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/620-add-delivered-in-future-column.php b/_sql/migrations/620-add-delivered-in-future-column.php index 6f802c120b6..e428fdcd47f 100644 --- a/_sql/migrations/620-add-delivered-in-future-column.php +++ b/_sql/migrations/620-add-delivered-in-future-column.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration620 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/621-remove-filter-options.php b/_sql/migrations/621-remove-filter-options.php index e32f47c8e06..2d50c222afe 100644 --- a/_sql/migrations/621-remove-filter-options.php +++ b/_sql/migrations/621-remove-filter-options.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration621 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/622-add-emotion-seo-title.php b/_sql/migrations/622-add-emotion-seo-title.php index 8346a666422..3298507f307 100644 --- a/_sql/migrations/622-add-emotion-seo-title.php +++ b/_sql/migrations/622-add-emotion-seo-title.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration622 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/623-add-payment-config-item.php b/_sql/migrations/623-add-payment-config-item.php index f6c5acdc2d7..b96b7291a4a 100644 --- a/_sql/migrations/623-add-payment-config-item.php +++ b/_sql/migrations/623-add-payment-config-item.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration623 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/624-fix-null-tax-rules.php b/_sql/migrations/624-fix-null-tax-rules.php index 8dc21feb7f5..97e45b524ce 100644 --- a/_sql/migrations/624-fix-null-tax-rules.php +++ b/_sql/migrations/624-fix-null-tax-rules.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration624 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/625-rename-feedback.php b/_sql/migrations/625-rename-feedback.php index a7f65efc049..54599379e31 100644 --- a/_sql/migrations/625-rename-feedback.php +++ b/_sql/migrations/625-rename-feedback.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration625 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/626-fix-email-template-variables.php b/_sql/migrations/626-fix-email-template-variables.php index e008759d46d..ac99c5287ae 100644 --- a/_sql/migrations/626-fix-email-template-variables.php +++ b/_sql/migrations/626-fix-email-template-variables.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration626 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/627-fix-order-email-voucher-image.php b/_sql/migrations/627-fix-order-email-voucher-image.php index 2cebd27302f..dc0d4486118 100644 --- a/_sql/migrations/627-fix-order-email-voucher-image.php +++ b/_sql/migrations/627-fix-order-email-voucher-image.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration627 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/628-add-validation-index.php b/_sql/migrations/628-add-validation-index.php index e66b26bb328..a6671cd5863 100644 --- a/_sql/migrations/628-add-validation-index.php +++ b/_sql/migrations/628-add-validation-index.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration628 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/629-implement-ajax-timeout.php b/_sql/migrations/629-implement-ajax-timeout.php index b7984d8cef1..a8251729216 100644 --- a/_sql/migrations/629-implement-ajax-timeout.php +++ b/_sql/migrations/629-implement-ajax-timeout.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration629 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/630-remove-google-analytics.php b/_sql/migrations/630-remove-google-analytics.php index 90c0ad87a10..efaabfbcf6a 100644 --- a/_sql/migrations/630-remove-google-analytics.php +++ b/_sql/migrations/630-remove-google-analytics.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration630 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/631-remove-search-results-per-page.php b/_sql/migrations/631-remove-search-results-per-page.php index 96f22591649..0e5a6981978 100644 --- a/_sql/migrations/631-remove-search-results-per-page.php +++ b/_sql/migrations/631-remove-search-results-per-page.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration631 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/632-optimize-hide-no-instock-label.php b/_sql/migrations/632-optimize-hide-no-instock-label.php index 8739b66335b..b072954aad2 100644 --- a/_sql/migrations/632-optimize-hide-no-instock-label.php +++ b/_sql/migrations/632-optimize-hide-no-instock-label.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration632 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/633-add-index-for-image-mappings.php b/_sql/migrations/633-add-index-for-image-mappings.php index 6feb518d03a..2ea080dde44 100644 --- a/_sql/migrations/633-add-index-for-image-mappings.php +++ b/_sql/migrations/633-add-index-for-image-mappings.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration633 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/634-add-index-for-basket-ordernumber.php b/_sql/migrations/634-add-index-for-basket-ordernumber.php index 3cd394d3885..ddfac9ad9ad 100644 --- a/_sql/migrations/634-add-index-for-basket-ordernumber.php +++ b/_sql/migrations/634-add-index-for-basket-ordernumber.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration634 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/635-add-index-for-plugin-id.php b/_sql/migrations/635-add-index-for-plugin-id.php index 3fdd6b2b03b..53188c8077b 100644 --- a/_sql/migrations/635-add-index-for-plugin-id.php +++ b/_sql/migrations/635-add-index-for-plugin-id.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration635 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/636-streamline-german-email-wording.php b/_sql/migrations/636-streamline-german-email-wording.php index 7c022102c97..ea1809dcbc3 100644 --- a/_sql/migrations/636-streamline-german-email-wording.php +++ b/_sql/migrations/636-streamline-german-email-wording.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration636 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/637-deactivate-similar-products.php b/_sql/migrations/637-deactivate-similar-products.php index c5de3db17a4..51acdc796ac 100644 --- a/_sql/migrations/637-deactivate-similar-products.php +++ b/_sql/migrations/637-deactivate-similar-products.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration637 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/638-fix-serialized-data.php b/_sql/migrations/638-fix-serialized-data.php index b38ff829d9e..08f393594ee 100644 --- a/_sql/migrations/638-fix-serialized-data.php +++ b/_sql/migrations/638-fix-serialized-data.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration638 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/700-remove-filter-values.php b/_sql/migrations/700-remove-filter-values.php index cbdc99ff3e4..f3275537b22 100644 --- a/_sql/migrations/700-remove-filter-values.php +++ b/_sql/migrations/700-remove-filter-values.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration700 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/701-remove-emotion-backend-options.php b/_sql/migrations/701-remove-emotion-backend-options.php index 0db2309d318..4d56ecf3d24 100644 --- a/_sql/migrations/701-remove-emotion-backend-options.php +++ b/_sql/migrations/701-remove-emotion-backend-options.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration701 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/702-add-emotion-element-css-class.php b/_sql/migrations/702-add-emotion-element-css-class.php index 7117ddc7d8f..bc31c28ab91 100644 --- a/_sql/migrations/702-add-emotion-element-css-class.php +++ b/_sql/migrations/702-add-emotion-element-css-class.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration702 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/703-activate-html-code-widget-by-default.php b/_sql/migrations/703-activate-html-code-widget-by-default.php index 8ef74a5e97f..6ac9cf20297 100644 --- a/_sql/migrations/703-activate-html-code-widget-by-default.php +++ b/_sql/migrations/703-activate-html-code-widget-by-default.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration703 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/704-remove-referercheck.php b/_sql/migrations/704-remove-referercheck.php index ddd985aec17..4cc3ef0b97c 100644 --- a/_sql/migrations/704-remove-referercheck.php +++ b/_sql/migrations/704-remove-referercheck.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration704 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/705-rename-category-template-column.php b/_sql/migrations/705-rename-category-template-column.php index 70fe86d02c0..26add6ee547 100644 --- a/_sql/migrations/705-rename-category-template-column.php +++ b/_sql/migrations/705-rename-category-template-column.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration705 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/706-remove-debit-table.php b/_sql/migrations/706-remove-debit-table.php index e5200fe9b28..89da5c8f4ed 100644 --- a/_sql/migrations/706-remove-debit-table.php +++ b/_sql/migrations/706-remove-debit-table.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration706 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/707-add-new-emotion-link-target-field.php b/_sql/migrations/707-add-new-emotion-link-target-field.php index 9a0999e6ebc..86044391c30 100644 --- a/_sql/migrations/707-add-new-emotion-link-target-field.php +++ b/_sql/migrations/707-add-new-emotion-link-target-field.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration707 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/708-attribute-administration.php b/_sql/migrations/708-attribute-administration.php index b553256c256..cb5ab0a69e8 100644 --- a/_sql/migrations/708-attribute-administration.php +++ b/_sql/migrations/708-attribute-administration.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/709-add-user-addresses.php b/_sql/migrations/709-add-user-addresses.php index f3516485e2c..997d1a93792 100644 --- a/_sql/migrations/709-add-user-addresses.php +++ b/_sql/migrations/709-add-user-addresses.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration709 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/710-remove-fax-field.php b/_sql/migrations/710-remove-fax-field.php index d7108fae3fc..21b0e047571 100644 --- a/_sql/migrations/710-remove-fax-field.php +++ b/_sql/migrations/710-remove-fax-field.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration710 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/711-create-address-migrate-table.php b/_sql/migrations/711-create-address-migrate-table.php index d93a8b9604e..224c8292ffd 100644 --- a/_sql/migrations/711-create-address-migrate-table.php +++ b/_sql/migrations/711-create-address-migrate-table.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration711 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/712-migrate-user-billing.php b/_sql/migrations/712-migrate-user-billing.php index ccf9c4e5cf5..cfa0d645342 100644 --- a/_sql/migrations/712-migrate-user-billing.php +++ b/_sql/migrations/712-migrate-user-billing.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration712 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/713-migrate-user-shipping.php b/_sql/migrations/713-migrate-user-shipping.php index 34d8c8d7061..c5ef99e28fd 100644 --- a/_sql/migrations/713-migrate-user-shipping.php +++ b/_sql/migrations/713-migrate-user-shipping.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration713 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/714-migrate-order-billing.php b/_sql/migrations/714-migrate-order-billing.php index e8615d91ede..c9693d1c4b5 100644 --- a/_sql/migrations/714-migrate-order-billing.php +++ b/_sql/migrations/714-migrate-order-billing.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration714 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/715-migrate-order-shipping.php b/_sql/migrations/715-migrate-order-shipping.php index 84b3890eafb..4ceaab93b6b 100644 --- a/_sql/migrations/715-migrate-order-shipping.php +++ b/_sql/migrations/715-migrate-order-shipping.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration715 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/716-copy-addresses-to-addressbook.php b/_sql/migrations/716-copy-addresses-to-addressbook.php index a8fdac1e2b2..39af0fcbe4d 100644 --- a/_sql/migrations/716-copy-addresses-to-addressbook.php +++ b/_sql/migrations/716-copy-addresses-to-addressbook.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration716 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/717-set-default-billingaddresses.php b/_sql/migrations/717-set-default-billingaddresses.php index 19b9eaafe48..058aeb61af2 100644 --- a/_sql/migrations/717-set-default-billingaddresses.php +++ b/_sql/migrations/717-set-default-billingaddresses.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration717 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/718-set-default-shippingaddresses.php b/_sql/migrations/718-set-default-shippingaddresses.php index ae23b1766e2..0998999e258 100644 --- a/_sql/migrations/718-set-default-shippingaddresses.php +++ b/_sql/migrations/718-set-default-shippingaddresses.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration718 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/719-create-address-attribute-tables.php b/_sql/migrations/719-create-address-attribute-tables.php index 0e0795b54cb..1b7768bf97c 100644 --- a/_sql/migrations/719-create-address-attribute-tables.php +++ b/_sql/migrations/719-create-address-attribute-tables.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration719 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/720-migrate-order-billing-attributes.php b/_sql/migrations/720-migrate-order-billing-attributes.php index 3dfca0e2e21..712ae5242d2 100644 --- a/_sql/migrations/720-migrate-order-billing-attributes.php +++ b/_sql/migrations/720-migrate-order-billing-attributes.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration720 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/721-migrate-order-shipping-attributes.php b/_sql/migrations/721-migrate-order-shipping-attributes.php index 427bb515cb0..dc71bb00205 100644 --- a/_sql/migrations/721-migrate-order-shipping-attributes.php +++ b/_sql/migrations/721-migrate-order-shipping-attributes.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration721 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/722-migrate-user-shipping-attributes.php b/_sql/migrations/722-migrate-user-shipping-attributes.php index 66f928a5003..83a6e8555cb 100644 --- a/_sql/migrations/722-migrate-user-shipping-attributes.php +++ b/_sql/migrations/722-migrate-user-shipping-attributes.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration722 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/723-migrate-user-billing-attributes.php b/_sql/migrations/723-migrate-user-billing-attributes.php index 5762fc2c345..f6b4f470960 100644 --- a/_sql/migrations/723-migrate-user-billing-attributes.php +++ b/_sql/migrations/723-migrate-user-billing-attributes.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration723 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/724-cleanup-address-migration.php b/_sql/migrations/724-cleanup-address-migration.php index 11db3b46255..b73555f4d1c 100644 --- a/_sql/migrations/724-cleanup-address-migration.php +++ b/_sql/migrations/724-cleanup-address-migration.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration724 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/725-remove-license-plugin-from-initial-db.php b/_sql/migrations/725-remove-license-plugin-from-initial-db.php index 3834f0f9a62..46d7c234298 100644 --- a/_sql/migrations/725-remove-license-plugin-from-initial-db.php +++ b/_sql/migrations/725-remove-license-plugin-from-initial-db.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration725 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/726-remove-shipping-billing.php b/_sql/migrations/726-remove-shipping-billing.php index 563a1ef9038..a33aa33cdca 100644 --- a/_sql/migrations/726-remove-shipping-billing.php +++ b/_sql/migrations/726-remove-shipping-billing.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration726 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/727-core-license-config.php b/_sql/migrations/727-core-license-config.php index dd5b49c51f1..f1f753c584c 100644 --- a/_sql/migrations/727-core-license-config.php +++ b/_sql/migrations/727-core-license-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration727 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/728-create-s-user-columns.php b/_sql/migrations/728-create-s-user-columns.php index a16c55446b8..afac38a9e08 100644 --- a/_sql/migrations/728-create-s-user-columns.php +++ b/_sql/migrations/728-create-s-user-columns.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration728 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/729-migrate-additional-userdata.php b/_sql/migrations/729-migrate-additional-userdata.php index 3b775d1263b..9ac9235a1d2 100644 --- a/_sql/migrations/729-migrate-additional-userdata.php +++ b/_sql/migrations/729-migrate-additional-userdata.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration729 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/730-drop-birthday-column.php b/_sql/migrations/730-drop-birthday-column.php index 7738b0ab0ce..7070c33bf95 100644 --- a/_sql/migrations/730-drop-birthday-column.php +++ b/_sql/migrations/730-drop-birthday-column.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration730 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/731-remove-emotion-grids.php b/_sql/migrations/731-remove-emotion-grids.php index f83c37cc911..ec3e124f626 100644 --- a/_sql/migrations/731-remove-emotion-grids.php +++ b/_sql/migrations/731-remove-emotion-grids.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration731 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/732-remove-landingpage-teaser.php b/_sql/migrations/732-remove-landingpage-teaser.php index 0ef084e95cc..9a78f888a23 100644 --- a/_sql/migrations/732-remove-landingpage-teaser.php +++ b/_sql/migrations/732-remove-landingpage-teaser.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration732 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/733-add-translatable-field-with-data.php b/_sql/migrations/733-add-translatable-field-with-data.php index 52872d4554e..2c88a9f85cf 100644 --- a/_sql/migrations/733-add-translatable-field-with-data.php +++ b/_sql/migrations/733-add-translatable-field-with-data.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration733 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/734-new-emotion-shop-association.php b/_sql/migrations/734-new-emotion-shop-association.php index 8f48a3d29ee..78a5dff6cf3 100644 --- a/_sql/migrations/734-new-emotion-shop-association.php +++ b/_sql/migrations/734-new-emotion-shop-association.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration734 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/735-migrate-old-emotion-relation.php b/_sql/migrations/735-migrate-old-emotion-relation.php index b8bbfddd96b..baf66079a14 100644 --- a/_sql/migrations/735-migrate-old-emotion-relation.php +++ b/_sql/migrations/735-migrate-old-emotion-relation.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration735 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/736-add-article-widget-categorie-selection.php b/_sql/migrations/736-add-article-widget-categorie-selection.php index ea0fbb854a7..91c86bbb0d0 100644 --- a/_sql/migrations/736-add-article-widget-categorie-selection.php +++ b/_sql/migrations/736-add-article-widget-categorie-selection.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration736 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/737-add-emotion-element-viewport.php b/_sql/migrations/737-add-emotion-element-viewport.php index 00b563979b9..1dbffa289d5 100644 --- a/_sql/migrations/737-add-emotion-element-viewport.php +++ b/_sql/migrations/737-add-emotion-element-viewport.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration737 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/738-fixed-iframe-widget-xtype.php b/_sql/migrations/738-fixed-iframe-widget-xtype.php index 4081b093e66..166b9d12a77 100644 --- a/_sql/migrations/738-fixed-iframe-widget-xtype.php +++ b/_sql/migrations/738-fixed-iframe-widget-xtype.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration738 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/739-migrate-emotion-widget-settings.php b/_sql/migrations/739-migrate-emotion-widget-settings.php index 49a80aecf02..561e9a3f7ec 100644 --- a/_sql/migrations/739-migrate-emotion-widget-settings.php +++ b/_sql/migrations/739-migrate-emotion-widget-settings.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration739 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/740-new-border-setting-for-emotion-widgets.php b/_sql/migrations/740-new-border-setting-for-emotion-widgets.php index 366b2c29b42..857713e6806 100644 --- a/_sql/migrations/740-new-border-setting-for-emotion-widgets.php +++ b/_sql/migrations/740-new-border-setting-for-emotion-widgets.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration740 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/741-migrate-salutation-mails.php b/_sql/migrations/741-migrate-salutation-mails.php index e180dbdfc2a..38af079d89a 100644 --- a/_sql/migrations/741-migrate-salutation-mails.php +++ b/_sql/migrations/741-migrate-salutation-mails.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration741 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/742-add-title-user-billing.php b/_sql/migrations/742-add-title-user-billing.php index 9d0d2e900b4..3fc7d6ec5bf 100644 --- a/_sql/migrations/742-add-title-user-billing.php +++ b/_sql/migrations/742-add-title-user-billing.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration742 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/743-add-title-order-billing.php b/_sql/migrations/743-add-title-order-billing.php index c277df5f40d..12fb8659fbb 100644 --- a/_sql/migrations/743-add-title-order-billing.php +++ b/_sql/migrations/743-add-title-order-billing.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration743 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/744-add-title-order-shipping.php b/_sql/migrations/744-add-title-order-shipping.php index ddd05dbdcb2..d6aad3215ac 100644 --- a/_sql/migrations/744-add-title-order-shipping.php +++ b/_sql/migrations/744-add-title-order-shipping.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration744 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/745-add-title-user-shipping.php b/_sql/migrations/745-add-title-user-shipping.php index 34d9405e978..0c8481ea703 100644 --- a/_sql/migrations/745-add-title-user-shipping.php +++ b/_sql/migrations/745-add-title-user-shipping.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration745 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/746-migrate-shipping.php b/_sql/migrations/746-migrate-shipping.php index a8635fbaf42..5feec9b190d 100644 --- a/_sql/migrations/746-migrate-shipping.php +++ b/_sql/migrations/746-migrate-shipping.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration746 extends Shopware\Components\Migrations\AbstractMigration @@ -31,7 +30,7 @@ public function up($modus) (`userID`, `company`, `department`, `salutation`, `firstname`, `lastname`, `street`, `zipcode`, `city`, `countryID`, `stateID`, `additional_address_line1`, `additional_address_line2`, `title`) SELECT addresses.`user_id` as userID, addresses.`company`, addresses.`department`, addresses.`salutation`, addresses.`firstname`, addresses.`lastname`, addresses.`street`, addresses.`zipcode`, addresses.`city`, addresses.`country_id` as countryID, addresses.`state_id` as stateID, addresses.`additional_address_line1`, addresses.`additional_address_line2`, addresses.`title` -FROM +FROM s_user_addresses addresses INNER JOIN s_user user ON user.default_shipping_address_id = addresses.id SQL; diff --git a/_sql/migrations/747-ekw-mode-migration.php b/_sql/migrations/747-ekw-mode-migration.php index 340ce0c863e..19c417dd75c 100644 --- a/_sql/migrations/747-ekw-mode-migration.php +++ b/_sql/migrations/747-ekw-mode-migration.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration747 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/748-remove-unused-fields.php b/_sql/migrations/748-remove-unused-fields.php index d111b9be4fc..4c059f8d259 100644 --- a/_sql/migrations/748-remove-unused-fields.php +++ b/_sql/migrations/748-remove-unused-fields.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration748 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/749-make-ustid-nullable.php b/_sql/migrations/749-make-ustid-nullable.php index 034b67c9066..d7b2e575855 100644 --- a/_sql/migrations/749-make-ustid-nullable.php +++ b/_sql/migrations/749-make-ustid-nullable.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration749 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/750-migrate-article-details-base-price.php b/_sql/migrations/750-migrate-article-details-base-price.php index 6643f261468..d6d6c4ba37f 100644 --- a/_sql/migrations/750-migrate-article-details-base-price.php +++ b/_sql/migrations/750-migrate-article-details-base-price.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration750 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/751-drop-unused-menu-fields.php b/_sql/migrations/751-drop-unused-menu-fields.php index 9e6d60be7b7..bfbbd63e3df 100644 --- a/_sql/migrations/751-drop-unused-menu-fields.php +++ b/_sql/migrations/751-drop-unused-menu-fields.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration751 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/752-delete-payment-plugin.php b/_sql/migrations/752-delete-payment-plugin.php index 53e52c70d6e..4b301c36e70 100644 --- a/_sql/migrations/752-delete-payment-plugin.php +++ b/_sql/migrations/752-delete-payment-plugin.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration752 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/753-add-s-user-customer-number.php b/_sql/migrations/753-add-s-user-customer-number.php index e7fdbf9cf64..ebf3171ae7d 100644 --- a/_sql/migrations/753-add-s-user-customer-number.php +++ b/_sql/migrations/753-add-s-user-customer-number.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration753 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/754-update-order-billing-customer-number.php b/_sql/migrations/754-update-order-billing-customer-number.php index 0496f44367d..4582ac266ae 100644 --- a/_sql/migrations/754-update-order-billing-customer-number.php +++ b/_sql/migrations/754-update-order-billing-customer-number.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration754 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/755-migrate-customer-number.php b/_sql/migrations/755-migrate-customer-number.php index af1dfb00631..35db2b39deb 100644 --- a/_sql/migrations/755-migrate-customer-number.php +++ b/_sql/migrations/755-migrate-customer-number.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration755 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/756-drop-customer-number.php b/_sql/migrations/756-drop-customer-number.php index ee4704792d9..9a3e6f75247 100644 --- a/_sql/migrations/756-drop-customer-number.php +++ b/_sql/migrations/756-drop-customer-number.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration756 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/757-add-array-store-field.php b/_sql/migrations/757-add-array-store-field.php index 6d99013779d..0ad6df5a5e0 100644 --- a/_sql/migrations/757-add-array-store-field.php +++ b/_sql/migrations/757-add-array-store-field.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration757 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/758-remove-attributes-read-acl.php b/_sql/migrations/758-remove-attributes-read-acl.php index f30ef722e82..388c63889a1 100644 --- a/_sql/migrations/758-remove-attributes-read-acl.php +++ b/_sql/migrations/758-remove-attributes-read-acl.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration758 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/759-remove-noviewselect.php b/_sql/migrations/759-remove-noviewselect.php index 226bc3b5a65..c2634c5324a 100644 --- a/_sql/migrations/759-remove-noviewselect.php +++ b/_sql/migrations/759-remove-noviewselect.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration759 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/760-change-plugin-unique-key.php b/_sql/migrations/760-change-plugin-unique-key.php index 776776053dd..ff7ebc9177c 100644 --- a/_sql/migrations/760-change-plugin-unique-key.php +++ b/_sql/migrations/760-change-plugin-unique-key.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration760 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/761-change-performance-menu.php b/_sql/migrations/761-change-performance-menu.php index 5eddbcec423..83012b99a1a 100644 --- a/_sql/migrations/761-change-performance-menu.php +++ b/_sql/migrations/761-change-performance-menu.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration761 extends Shopware\Components\Migrations\AbstractMigration @@ -32,7 +31,7 @@ public function up($modus) $this->addSql($sql); $sql = <<<'EOD' -INSERT INTO `s_core_menu` (`id`, `parent`, `name`, `onclick`, `class`, `position`, `active`, `pluginID`, `controller`, `shortcut`, `action`) VALUES +INSERT INTO `s_core_menu` (`id`, `parent`, `name`, `onclick`, `class`, `position`, `active`, `pluginID`, `controller`, `shortcut`, `action`) VALUES (NULL, @parent, 'Performance', NULL, 'sprite-bin-full settings--performance', '2', '1', NULL, 'Performance', NULL, 'Index'); EOD; $this->addSql($sql); diff --git a/_sql/migrations/762-increase-img-character-size.php b/_sql/migrations/762-increase-img-character-size.php index 7aa2f61db63..2eb120471ed 100644 --- a/_sql/migrations/762-increase-img-character-size.php +++ b/_sql/migrations/762-increase-img-character-size.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration762 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/763-add-attributes-read-acl.php b/_sql/migrations/763-add-attributes-read-acl.php index 1b81a6a47e1..db38b13b2ce 100644 --- a/_sql/migrations/763-add-attributes-read-acl.php +++ b/_sql/migrations/763-add-attributes-read-acl.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration763 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/764-fixing-ordernumber-schema-addon-premiums.php b/_sql/migrations/764-fixing-ordernumber-schema-addon-premiums.php index c64c07ceb67..1d7340c92aa 100644 --- a/_sql/migrations/764-fixing-ordernumber-schema-addon-premiums.php +++ b/_sql/migrations/764-fixing-ordernumber-schema-addon-premiums.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration764 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/765-fixing-ordernumber-schema-article-configurator-templates.php b/_sql/migrations/765-fixing-ordernumber-schema-article-configurator-templates.php index f4425144824..3159d9539df 100644 --- a/_sql/migrations/765-fixing-ordernumber-schema-article-configurator-templates.php +++ b/_sql/migrations/765-fixing-ordernumber-schema-article-configurator-templates.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration765 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/766-fixing-ordernumber-schema-article-details.php b/_sql/migrations/766-fixing-ordernumber-schema-article-details.php index 7934be4ce20..b2a91da2ec0 100644 --- a/_sql/migrations/766-fixing-ordernumber-schema-article-details.php +++ b/_sql/migrations/766-fixing-ordernumber-schema-article-details.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration766 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/767-fixing-ordernumber-schema-campaigns-articles.php b/_sql/migrations/767-fixing-ordernumber-schema-campaigns-articles.php index 5f6db48a37a..b026f34f693 100644 --- a/_sql/migrations/767-fixing-ordernumber-schema-campaigns-articles.php +++ b/_sql/migrations/767-fixing-ordernumber-schema-campaigns-articles.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration767 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/768-fixing-ordernumber-schema-order.php b/_sql/migrations/768-fixing-ordernumber-schema-order.php index e1f033d5a08..cf59e078e54 100644 --- a/_sql/migrations/768-fixing-ordernumber-schema-order.php +++ b/_sql/migrations/768-fixing-ordernumber-schema-order.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration768 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/769-fixing-ordernumber-schema-order-basket.php b/_sql/migrations/769-fixing-ordernumber-schema-order-basket.php index 96ed6b2b0ff..80b69716f65 100644 --- a/_sql/migrations/769-fixing-ordernumber-schema-order-basket.php +++ b/_sql/migrations/769-fixing-ordernumber-schema-order-basket.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration769 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/770-fixing-ordernumber-schema-order-details.php b/_sql/migrations/770-fixing-ordernumber-schema-order-details.php index ebb4171bd83..9f65576a195 100644 --- a/_sql/migrations/770-fixing-ordernumber-schema-order-details.php +++ b/_sql/migrations/770-fixing-ordernumber-schema-order-details.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration770 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/771-fixing-ordernumber-schema-order-notes.php b/_sql/migrations/771-fixing-ordernumber-schema-order-notes.php index 1b3f985ae7d..5fc52b88e66 100644 --- a/_sql/migrations/771-fixing-ordernumber-schema-order-notes.php +++ b/_sql/migrations/771-fixing-ordernumber-schema-order-notes.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration771 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/772-allow-label-nullable.php b/_sql/migrations/772-allow-label-nullable.php index 80273e49a04..8f6fc1287fc 100644 --- a/_sql/migrations/772-allow-label-nullable.php +++ b/_sql/migrations/772-allow-label-nullable.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration772 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/773-add-library-component-fields.php b/_sql/migrations/773-add-library-component-fields.php index 50d0e001eea..b1b31c7e976 100644 --- a/_sql/migrations/773-add-library-component-fields.php +++ b/_sql/migrations/773-add-library-component-fields.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration773 extends Shopware\Components\Migrations\AbstractMigration @@ -34,7 +33,7 @@ public function up($modus) $this->addSql('SET @componentId = (SELECT `id` FROM `s_library_component` WHERE `name` = "Youtube-Video")'); $this->addSql('SET @maxNumberPosition = (SELECT MAX(position) FROM `s_library_component_field` WHERE `componentID`=@componentId) + 1;'); $sql = <<<'EOD' -INSERT IGNORE INTO `s_library_component_field` (`id`, `componentID`, `name`, `x_type`, `value_type`, `field_label`, `support_text`, `help_title`, `help_text`, `store`, `display_field`, `value_field`, `default_value`, `allow_blank`, `translatable`, `position`) +INSERT IGNORE INTO `s_library_component_field` (`id`, `componentID`, `name`, `x_type`, `value_type`, `field_label`, `support_text`, `help_title`, `help_text`, `store`, `display_field`, `value_field`, `default_value`, `allow_blank`, `translatable`, `position`) VALUES (null, @componentId, 'video_autoplay', 'checkbox', '', 'Video automatisch starten', '', '', '', '', '', '', 0, 0, 0, @maxNumberPosition), (null, @componentId, 'video_related', 'checkbox', '', 'Empfehlungen ausblenden', '', '', '', '', '', '', 0, 0, 0, @maxNumberPosition+1), diff --git a/_sql/migrations/774-add-extra-config-elements.php b/_sql/migrations/774-add-extra-config-elements.php index a6d45cf335e..b262d57aef0 100644 --- a/_sql/migrations/774-add-extra-config-elements.php +++ b/_sql/migrations/774-add-extra-config-elements.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration774 extends Shopware\Components\Migrations\AbstractMigration @@ -34,7 +33,7 @@ public function up($modus) $sql = <<getFilteredBotList($blacklistConfig[0]['value']); $statement = $this->connection->prepare(' UPDATE s_core_config_elements - SET value = :value + SET value = :value WHERE id = :id '); $statement->execute([ @@ -69,7 +68,7 @@ private function fixCustomerBlacklists() $botList = $this->getFilteredBotList($config['value']); $statement = $this->connection->prepare(' UPDATE s_core_config_values - SET value = :value + SET value = :value WHERE id = :id '); $statement->execute([ diff --git a/_sql/migrations/780-fix-debit-payment.php b/_sql/migrations/780-fix-debit-payment.php index 20f5b87add0..ad73e0f6e9c 100644 --- a/_sql/migrations/780-fix-debit-payment.php +++ b/_sql/migrations/780-fix-debit-payment.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration780 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/781-update-forum-link.php b/_sql/migrations/781-update-forum-link.php index 9c6a2a6269d..398078c700b 100644 --- a/_sql/migrations/781-update-forum-link.php +++ b/_sql/migrations/781-update-forum-link.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration781 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/782-add-partner-idcode-index.php b/_sql/migrations/782-add-partner-idcode-index.php index 0f53e363c05..4f0753e559e 100644 --- a/_sql/migrations/782-add-partner-idcode-index.php +++ b/_sql/migrations/782-add-partner-idcode-index.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration782 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/783-increase-media-path-columns.php b/_sql/migrations/783-increase-media-path-columns.php index 80ba1bee7f2..e9ef423e8f0 100644 --- a/_sql/migrations/783-increase-media-path-columns.php +++ b/_sql/migrations/783-increase-media-path-columns.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration783 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/784-add-paging-to-notfoundfield.php b/_sql/migrations/784-add-paging-to-notfoundfield.php index 688645cd6fe..41502e92997 100644 --- a/_sql/migrations/784-add-paging-to-notfoundfield.php +++ b/_sql/migrations/784-add-paging-to-notfoundfield.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration784 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/785-add-connect-default-menu.php b/_sql/migrations/785-add-connect-default-menu.php index 391ab6af619..960242535ff 100644 --- a/_sql/migrations/785-add-connect-default-menu.php +++ b/_sql/migrations/785-add-connect-default-menu.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration785 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/786-extend-api-cache-invalidation.php b/_sql/migrations/786-extend-api-cache-invalidation.php index 8748e5577f5..deed29c392d 100644 --- a/_sql/migrations/786-extend-api-cache-invalidation.php +++ b/_sql/migrations/786-extend-api-cache-invalidation.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration786 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/787-add-missing-translation-basicsettings-login-and-registration.php b/_sql/migrations/787-add-missing-translation-basicsettings-login-and-registration.php index 9eb5be57e5b..6b529172694 100644 --- a/_sql/migrations/787-add-missing-translation-basicsettings-login-and-registration.php +++ b/_sql/migrations/787-add-missing-translation-basicsettings-login-and-registration.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration787 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/788-change-Seo-Router-description.php b/_sql/migrations/788-change-Seo-Router-description.php index c2d1feb1ba7..8863a85a6db 100644 --- a/_sql/migrations/788-change-Seo-Router-description.php +++ b/_sql/migrations/788-change-Seo-Router-description.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration788 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/789-add-crontab-disableonerror.php b/_sql/migrations/789-add-crontab-disableonerror.php index 6ce6c65c8b6..340dd365304 100644 --- a/_sql/migrations/789-add-crontab-disableonerror.php +++ b/_sql/migrations/789-add-crontab-disableonerror.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration789 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/790-clarify-basic-settings-label.php b/_sql/migrations/790-clarify-basic-settings-label.php index facd3af956c..50cde8fd392 100644 --- a/_sql/migrations/790-clarify-basic-settings-label.php +++ b/_sql/migrations/790-clarify-basic-settings-label.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration790 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/791-increase-password-hash-size.php b/_sql/migrations/791-increase-password-hash-size.php index 29602995723..7b95d954c9a 100644 --- a/_sql/migrations/791-increase-password-hash-size.php +++ b/_sql/migrations/791-increase-password-hash-size.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration791 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/792-add-send-registration-email-confirmation-config.php b/_sql/migrations/792-add-send-registration-email-confirmation-config.php index 8005a90a29a..a415464bafe 100644 --- a/_sql/migrations/792-add-send-registration-email-confirmation-config.php +++ b/_sql/migrations/792-add-send-registration-email-confirmation-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration792 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/793-add-attribute-table-for-search.php b/_sql/migrations/793-add-attribute-table-for-search.php index 6290647b0a1..455b1d461de 100644 --- a/_sql/migrations/793-add-attribute-table-for-search.php +++ b/_sql/migrations/793-add-attribute-table-for-search.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration793 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/794-fix-shop-page-limiting.php b/_sql/migrations/794-fix-shop-page-limiting.php index 8b84478ce3b..02a7a3d6af2 100644 --- a/_sql/migrations/794-fix-shop-page-limiting.php +++ b/_sql/migrations/794-fix-shop-page-limiting.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration794 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/795-remove-salutation-snippets.php b/_sql/migrations/795-remove-salutation-snippets.php index 8ad78e0b891..0cc02facfac 100644 --- a/_sql/migrations/795-remove-salutation-snippets.php +++ b/_sql/migrations/795-remove-salutation-snippets.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/796-add-uniqueid-config-element.php b/_sql/migrations/796-add-uniqueid-config-element.php index 69756b75e1c..c24805da1f6 100644 --- a/_sql/migrations/796-add-uniqueid-config-element.php +++ b/_sql/migrations/796-add-uniqueid-config-element.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration796 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/797-remove-salutation-snippets.php b/_sql/migrations/797-remove-salutation-snippets.php index 4dec0dd0bf6..8f865f86c2c 100644 --- a/_sql/migrations/797-remove-salutation-snippets.php +++ b/_sql/migrations/797-remove-salutation-snippets.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/798-add-sytem-log-acl.php b/_sql/migrations/798-add-sytem-log-acl.php index aed2e905024..7be9804dbbc 100644 --- a/_sql/migrations/798-add-sytem-log-acl.php +++ b/_sql/migrations/798-add-sytem-log-acl.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration798 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/799-attribute-translation-fix-1-of-10.php b/_sql/migrations/799-attribute-translation-fix-1-of-10.php index 6a78b53e459..aa7c0c8f2d1 100644 --- a/_sql/migrations/799-attribute-translation-fix-1-of-10.php +++ b/_sql/migrations/799-attribute-translation-fix-1-of-10.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration799 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/800-attribute-translation-fix-2-of-10.php b/_sql/migrations/800-attribute-translation-fix-2-of-10.php index f8a070c44ae..ea8e19d6b31 100644 --- a/_sql/migrations/800-attribute-translation-fix-2-of-10.php +++ b/_sql/migrations/800-attribute-translation-fix-2-of-10.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration800 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/801-attribute-translation-fix-3-of-10.php b/_sql/migrations/801-attribute-translation-fix-3-of-10.php index 72fd3090ff9..1cb2ad5101c 100644 --- a/_sql/migrations/801-attribute-translation-fix-3-of-10.php +++ b/_sql/migrations/801-attribute-translation-fix-3-of-10.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration801 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/802-attribute-translation-fix-4-of-10.php b/_sql/migrations/802-attribute-translation-fix-4-of-10.php index a6cee3e808e..e55e6b7a9b2 100644 --- a/_sql/migrations/802-attribute-translation-fix-4-of-10.php +++ b/_sql/migrations/802-attribute-translation-fix-4-of-10.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration802 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/803-attribute-translation-fix-5-of-10.php b/_sql/migrations/803-attribute-translation-fix-5-of-10.php index 998456de852..a203efe5544 100644 --- a/_sql/migrations/803-attribute-translation-fix-5-of-10.php +++ b/_sql/migrations/803-attribute-translation-fix-5-of-10.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration803 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/804-attribute-translation-fix-6-of-10.php b/_sql/migrations/804-attribute-translation-fix-6-of-10.php index c338cc85f24..cd7e385c834 100644 --- a/_sql/migrations/804-attribute-translation-fix-6-of-10.php +++ b/_sql/migrations/804-attribute-translation-fix-6-of-10.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration804 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/805-attribute-translation-fix-7-of-10.php b/_sql/migrations/805-attribute-translation-fix-7-of-10.php index 0698d361984..b7a4f893dba 100644 --- a/_sql/migrations/805-attribute-translation-fix-7-of-10.php +++ b/_sql/migrations/805-attribute-translation-fix-7-of-10.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration805 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/806-attribute-translation-fix-8-of-10.php b/_sql/migrations/806-attribute-translation-fix-8-of-10.php index b961ef3872e..dcd170321f0 100644 --- a/_sql/migrations/806-attribute-translation-fix-8-of-10.php +++ b/_sql/migrations/806-attribute-translation-fix-8-of-10.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration806 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/807-attribute-translation-fix-9-of-10.php b/_sql/migrations/807-attribute-translation-fix-9-of-10.php index 4e74d68907c..879c2706fde 100644 --- a/_sql/migrations/807-attribute-translation-fix-9-of-10.php +++ b/_sql/migrations/807-attribute-translation-fix-9-of-10.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration807 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/808-attribute-translation-fix-10-of-10.php b/_sql/migrations/808-attribute-translation-fix-10-of-10.php index 653690fcfe2..c538de1094f 100644 --- a/_sql/migrations/808-attribute-translation-fix-10-of-10.php +++ b/_sql/migrations/808-attribute-translation-fix-10-of-10.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration808 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/809-change-session-tables.php b/_sql/migrations/809-change-session-tables.php index b9c4325e151..5299de6aea9 100644 --- a/_sql/migrations/809-change-session-tables.php +++ b/_sql/migrations/809-change-session-tables.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration809 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/810-change-description-of-article-cover-setting.php b/_sql/migrations/810-change-description-of-article-cover-setting.php index 9478f77b750..dce24eb6f88 100644 --- a/_sql/migrations/810-change-description-of-article-cover-setting.php +++ b/_sql/migrations/810-change-description-of-article-cover-setting.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration810 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/811-add-attributes-partner.php b/_sql/migrations/811-add-attributes-partner.php index a8724f42f52..d01632a6d06 100644 --- a/_sql/migrations/811-add-attributes-partner.php +++ b/_sql/migrations/811-add-attributes-partner.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration811 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/812-add-max-limit-config.php b/_sql/migrations/812-add-max-limit-config.php index 81fa2524a26..94ca6515686 100644 --- a/_sql/migrations/812-add-max-limit-config.php +++ b/_sql/migrations/812-add-max-limit-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration812 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/813-session-expiry.php b/_sql/migrations/813-session-expiry.php index f6884176ef8..4e5825a4cbe 100644 --- a/_sql/migrations/813-session-expiry.php +++ b/_sql/migrations/813-session-expiry.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration813 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/814-create-configurator-options-attribute-table.php b/_sql/migrations/814-create-configurator-options-attribute-table.php index 1b82ae697cf..8ace059ba5b 100644 --- a/_sql/migrations/814-create-configurator-options-attribute-table.php +++ b/_sql/migrations/814-create-configurator-options-attribute-table.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration814 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/815-add-strip-tags-configuration-option.php b/_sql/migrations/815-add-strip-tags-configuration-option.php index f5198223325..9a4388cee34 100644 --- a/_sql/migrations/815-add-strip-tags-configuration-option.php +++ b/_sql/migrations/815-add-strip-tags-configuration-option.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration815 extends Shopware\Components\Migrations\AbstractMigration @@ -52,7 +51,7 @@ public function up($modus) $this->addSql($sql); $sql = <<<'SQL' -INSERT IGNORE INTO `s_core_config_element_translations` SET +INSERT IGNORE INTO `s_core_config_element_translations` SET `element_id` = @stripTagsId, `locale_id` = 2, `label` = 'Use strip_tags globally', diff --git a/_sql/migrations/816-short-cut-menu-plugin-manager.php b/_sql/migrations/816-short-cut-menu-plugin-manager.php index 3e05ddad742..7cfd9a72bf4 100644 --- a/_sql/migrations/816-short-cut-menu-plugin-manager.php +++ b/_sql/migrations/816-short-cut-menu-plugin-manager.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration816 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/817-add-plugin-translations.php b/_sql/migrations/817-add-plugin-translations.php index 43057474ac9..a4181ee7513 100644 --- a/_sql/migrations/817-add-plugin-translations.php +++ b/_sql/migrations/817-add-plugin-translations.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration817 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/818-make-some-fields-in-order-table-nullable.php b/_sql/migrations/818-make-some-fields-in-order-table-nullable.php index 2f94b9e6bd6..86663ecc16e 100644 --- a/_sql/migrations/818-make-some-fields-in-order-table-nullable.php +++ b/_sql/migrations/818-make-some-fields-in-order-table-nullable.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration818 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/819-shortcut-help-menu.php b/_sql/migrations/819-shortcut-help-menu.php index 6af1ae72fc6..58320f65748 100644 --- a/_sql/migrations/819-shortcut-help-menu.php +++ b/_sql/migrations/819-shortcut-help-menu.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration819 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/820-plugin-safe-mode.php b/_sql/migrations/820-plugin-safe-mode.php index 1db4ed2eeb5..968fadca799 100644 --- a/_sql/migrations/820-plugin-safe-mode.php +++ b/_sql/migrations/820-plugin-safe-mode.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration820 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/900-add-last-articles-config-elements.php b/_sql/migrations/900-add-last-articles-config-elements.php index 35763b0b76b..e00c6243143 100644 --- a/_sql/migrations/900-add-last-articles-config-elements.php +++ b/_sql/migrations/900-add-last-articles-config-elements.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration900 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/901-add-vote-shop-id.php b/_sql/migrations/901-add-vote-shop-id.php index 274cab0c5ed..1758262fa96 100644 --- a/_sql/migrations/901-add-vote-shop-id.php +++ b/_sql/migrations/901-add-vote-shop-id.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration901 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/902-remove-import-export-legacy-module.php b/_sql/migrations/902-remove-import-export-legacy-module.php index 17322853c4c..8f6e5046428 100644 --- a/_sql/migrations/902-remove-import-export-legacy-module.php +++ b/_sql/migrations/902-remove-import-export-legacy-module.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration902 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/903-add-menu-import-export-advanced.php b/_sql/migrations/903-add-menu-import-export-advanced.php index a7620ecb23f..41033492aff 100644 --- a/_sql/migrations/903-add-menu-import-export-advanced.php +++ b/_sql/migrations/903-add-menu-import-export-advanced.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration903 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/904-add-captcha-selection.php b/_sql/migrations/904-add-captcha-selection.php index 2df48cb20fb..77e59f1590c 100644 --- a/_sql/migrations/904-add-captcha-selection.php +++ b/_sql/migrations/904-add-captcha-selection.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration904 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/905-add-backend-listing-index.php b/_sql/migrations/905-add-backend-listing-index.php index dcb67ef65dc..89d958e7fa3 100644 --- a/_sql/migrations/905-add-backend-listing-index.php +++ b/_sql/migrations/905-add-backend-listing-index.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration905 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/906-remove-countryshipping-registration-config-option.php b/_sql/migrations/906-remove-countryshipping-registration-config-option.php index 46852c744aa..70fedf0ec87 100644 --- a/_sql/migrations/906-remove-countryshipping-registration-config-option.php +++ b/_sql/migrations/906-remove-countryshipping-registration-config-option.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration906 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/907-add-signed-basket.php b/_sql/migrations/907-add-signed-basket.php index 0ebdd9573ff..fdd6b14f51c 100644 --- a/_sql/migrations/907-add-signed-basket.php +++ b/_sql/migrations/907-add-signed-basket.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/908-change-varchar-attributes.php b/_sql/migrations/908-change-varchar-attributes.php index 5426a37f4b4..afaf8f53c8c 100644 --- a/_sql/migrations/908-change-varchar-attributes.php +++ b/_sql/migrations/908-change-varchar-attributes.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/909-add-buy-button-config.php b/_sql/migrations/909-add-buy-button-config.php index 0a7905bd032..8a18c721428 100644 --- a/_sql/migrations/909-add-buy-button-config.php +++ b/_sql/migrations/909-add-buy-button-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/910-add-cookie-permissions.php b/_sql/migrations/910-add-cookie-permissions.php index 99eb2d55392..bf3852cda68 100644 --- a/_sql/migrations/910-add-cookie-permissions.php +++ b/_sql/migrations/910-add-cookie-permissions.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/911-add-facet-behavior-switch.php b/_sql/migrations/911-add-facet-behavior-switch.php index 6ee45e94d09..a54fa0f1d43 100644 --- a/_sql/migrations/911-add-facet-behavior-switch.php +++ b/_sql/migrations/911-add-facet-behavior-switch.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/912-add-mail-template.php b/_sql/migrations/912-add-mail-template.php index 9f65cf47ad0..bc506407139 100644 --- a/_sql/migrations/912-add-mail-template.php +++ b/_sql/migrations/912-add-mail-template.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/913-force-category-selection-for-category-teaser.php b/_sql/migrations/913-force-category-selection-for-category-teaser.php index 5c1442f8551..3f08bb5c497 100644 --- a/_sql/migrations/913-force-category-selection-for-category-teaser.php +++ b/_sql/migrations/913-force-category-selection-for-category-teaser.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/914-add-preview-id-for-emotions.php b/_sql/migrations/914-add-preview-id-for-emotions.php index 9ef4e9fa875..2e908f61873 100644 --- a/_sql/migrations/914-add-preview-id-for-emotions.php +++ b/_sql/migrations/914-add-preview-id-for-emotions.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/916-add-capcha-to-register-page.php b/_sql/migrations/916-add-capcha-to-register-page.php index c5eebfbff1c..74a3f84c631 100644 --- a/_sql/migrations/916-add-capcha-to-register-page.php +++ b/_sql/migrations/916-add-capcha-to-register-page.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/917-add-sorting-module.php b/_sql/migrations/917-add-sorting-module.php index bda3558ae88..4e1e0c6484f 100644 --- a/_sql/migrations/917-add-sorting-module.php +++ b/_sql/migrations/917-add-sorting-module.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Bundle\SearchBundle\Sorting\PopularitySorting; diff --git a/_sql/migrations/918-add-facet-module.php b/_sql/migrations/918-add-facet-module.php index dff3d54a7c9..b7c06000a4b 100644 --- a/_sql/migrations/918-add-facet-module.php +++ b/_sql/migrations/918-add-facet-module.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/919-change-article-emotion-elements.php b/_sql/migrations/919-change-article-emotion-elements.php index b6ecc001a34..42c3864f5a7 100644 --- a/_sql/migrations/919-change-article-emotion-elements.php +++ b/_sql/migrations/919-change-article-emotion-elements.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/920-add-description-to-linear-meter.php b/_sql/migrations/920-add-description-to-linear-meter.php index 1924abff51b..450094f7c04 100644 --- a/_sql/migrations/920-add-description-to-linear-meter.php +++ b/_sql/migrations/920-add-description-to-linear-meter.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration920 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/921-remove-shipping-free-flag.php b/_sql/migrations/921-remove-shipping-free-flag.php index 4e38e8d5f5b..7ead71ec964 100644 --- a/_sql/migrations/921-remove-shipping-free-flag.php +++ b/_sql/migrations/921-remove-shipping-free-flag.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/922-change-instock.php b/_sql/migrations/922-change-instock.php index 34dee1ab64c..9e7c0912b45 100644 --- a/_sql/migrations/922-change-instock.php +++ b/_sql/migrations/922-change-instock.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration922 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/923-add-customer-streams.php b/_sql/migrations/923-add-customer-streams.php index b5d36bacae6..ed6fb1a8608 100644 --- a/_sql/migrations/923-add-customer-streams.php +++ b/_sql/migrations/923-add-customer-streams.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/924-add-cache-control.php b/_sql/migrations/924-add-cache-control.php index 9bba9481c28..c2bbf6afa22 100644 --- a/_sql/migrations/924-add-cache-control.php +++ b/_sql/migrations/924-add-cache-control.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration924 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/925-add-user-config.php b/_sql/migrations/925-add-user-config.php index 41a45505cba..c96da13b36f 100644 --- a/_sql/migrations/925-add-user-config.php +++ b/_sql/migrations/925-add-user-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/926-add-emotion-presets.php b/_sql/migrations/926-add-emotion-presets.php index 3c6a5eed167..82c6cf3e10f 100644 --- a/_sql/migrations/926-add-emotion-presets.php +++ b/_sql/migrations/926-add-emotion-presets.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration926 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/928-add-captcha-to-newsletter-page.php b/_sql/migrations/928-add-captcha-to-newsletter-page.php index cbf7ce9fd5b..cea253289b7 100644 --- a/_sql/migrations/928-add-captcha-to-newsletter-page.php +++ b/_sql/migrations/928-add-captcha-to-newsletter-page.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/929-add-stream-rules.php b/_sql/migrations/929-add-stream-rules.php index d10f997451d..4629cd5fa4d 100644 --- a/_sql/migrations/929-add-stream-rules.php +++ b/_sql/migrations/929-add-stream-rules.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/930-fix-variant-weight.php b/_sql/migrations/930-fix-variant-weight.php index e2df3db3077..8eafb545aca 100644 --- a/_sql/migrations/930-fix-variant-weight.php +++ b/_sql/migrations/930-fix-variant-weight.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/931-add-slt-config.php b/_sql/migrations/931-add-slt-config.php index 039879fb1e4..d46e131c279 100644 --- a/_sql/migrations/931-add-slt-config.php +++ b/_sql/migrations/931-add-slt-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/932-add-http-cache-route.php b/_sql/migrations/932-add-http-cache-route.php index 877e9352f4c..3050a91ddcd 100644 --- a/_sql/migrations/932-add-http-cache-route.php +++ b/_sql/migrations/932-add-http-cache-route.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/933-add-customer-stream-menu.php b/_sql/migrations/933-add-customer-stream-menu.php index 36e26924eb2..67be3823fbc 100644 --- a/_sql/migrations/933-add-customer-stream-menu.php +++ b/_sql/migrations/933-add-customer-stream-menu.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/934-add-stream-attributes.php b/_sql/migrations/934-add-stream-attributes.php index 8aa061e25a1..c6464106e33 100644 --- a/_sql/migrations/934-add-stream-attributes.php +++ b/_sql/migrations/934-add-stream-attributes.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/935-add-listing-layout-config.php b/_sql/migrations/935-add-listing-layout-config.php index 2722efc3f07..b00143d1e63 100644 --- a/_sql/migrations/935-add-listing-layout-config.php +++ b/_sql/migrations/935-add-listing-layout-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/936-remove-stream-index.php b/_sql/migrations/936-remove-stream-index.php index d7009b9d996..d1059f9354f 100644 --- a/_sql/migrations/936-remove-stream-index.php +++ b/_sql/migrations/936-remove-stream-index.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/937-add-type-field.php b/_sql/migrations/937-add-type-field.php index f7d91d3bb0f..bba123edcaf 100644 --- a/_sql/migrations/937-add-type-field.php +++ b/_sql/migrations/937-add-type-field.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/938-add-preset-emotion-translations.php b/_sql/migrations/938-add-preset-emotion-translations.php index a85998102ac..f6e33b0bc6b 100644 --- a/_sql/migrations/938-add-preset-emotion-translations.php +++ b/_sql/migrations/938-add-preset-emotion-translations.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/939-add-translations-for-facets.php b/_sql/migrations/939-add-translations-for-facets.php index a921318f69d..881a184959d 100644 --- a/_sql/migrations/939-add-translations-for-facets.php +++ b/_sql/migrations/939-add-translations-for-facets.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/940-fix-import-export-menu-entry.php b/_sql/migrations/940-fix-import-export-menu-entry.php index 5286477890f..e01d1d1f01b 100644 --- a/_sql/migrations/940-fix-import-export-menu-entry.php +++ b/_sql/migrations/940-fix-import-export-menu-entry.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration940 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/941-replace-default-document-logo.php b/_sql/migrations/941-replace-default-document-logo.php index 17d82debf01..eacc5bc8a8e 100644 --- a/_sql/migrations/941-replace-default-document-logo.php +++ b/_sql/migrations/941-replace-default-document-logo.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration941 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/942-add-shipping-acl.php b/_sql/migrations/942-add-shipping-acl.php index 5be9130594b..ed7f7af846f 100644 --- a/_sql/migrations/942-add-shipping-acl.php +++ b/_sql/migrations/942-add-shipping-acl.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration942 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/943-add-new-colum-search-fields.php b/_sql/migrations/943-add-new-colum-search-fields.php index 2218fcbc9b7..e90d7b64323 100644 --- a/_sql/migrations/943-add-new-colum-search-fields.php +++ b/_sql/migrations/943-add-new-colum-search-fields.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/944-update-german-translations.php b/_sql/migrations/944-update-german-translations.php index c80d9963b84..dd5fecdf46f 100644 --- a/_sql/migrations/944-update-german-translations.php +++ b/_sql/migrations/944-update-german-translations.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/945-add-category-column-external-target.php b/_sql/migrations/945-add-category-column-external-target.php index 4588cb95c51..c766ab48456 100644 --- a/_sql/migrations/945-add-category-column-external-target.php +++ b/_sql/migrations/945-add-category-column-external-target.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/946-change-customer-stream-type.php b/_sql/migrations/946-change-customer-stream-type.php index 5c3b2dbb020..c24034565dd 100644 --- a/_sql/migrations/946-change-customer-stream-type.php +++ b/_sql/migrations/946-change-customer-stream-type.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration946 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/947-change-ordercode-field-length-in_s_marketing_vouchers.php b/_sql/migrations/947-change-ordercode-field-length-in_s_marketing_vouchers.php index 327a151a132..800cc981f96 100644 --- a/_sql/migrations/947-change-ordercode-field-length-in_s_marketing_vouchers.php +++ b/_sql/migrations/947-change-ordercode-field-length-in_s_marketing_vouchers.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration947 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/948-update-customer-stream-conditions.php b/_sql/migrations/948-update-customer-stream-conditions.php index 1f2c5c8f6e7..6a028380ae3 100644 --- a/_sql/migrations/948-update-customer-stream-conditions.php +++ b/_sql/migrations/948-update-customer-stream-conditions.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration948 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/949-add-deprecation-hint-to-maxpages-form.php b/_sql/migrations/949-add-deprecation-hint-to-maxpages-form.php index 23106353dce..9f44483c05c 100644 --- a/_sql/migrations/949-add-deprecation-hint-to-maxpages-form.php +++ b/_sql/migrations/949-add-deprecation-hint-to-maxpages-form.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration949 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/951-add-shipping-phone.php b/_sql/migrations/951-add-shipping-phone.php index 64e6a0c4ef8..64080ea514c 100644 --- a/_sql/migrations/951-add-shipping-phone.php +++ b/_sql/migrations/951-add-shipping-phone.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration951 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/952-implement-backend-menu-configuration.php b/_sql/migrations/952-implement-backend-menu-configuration.php index 44d33967ff5..f2579cb85be 100644 --- a/_sql/migrations/952-implement-backend-menu-configuration.php +++ b/_sql/migrations/952-implement-backend-menu-configuration.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration952 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/953-implement-growl-message-configuration.php b/_sql/migrations/953-implement-growl-message-configuration.php index 5a63511b154..021a9e34a7c 100644 --- a/_sql/migrations/953-implement-growl-message-configuration.php +++ b/_sql/migrations/953-implement-growl-message-configuration.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration953 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/954-edit-company-register-config.php b/_sql/migrations/954-edit-company-register-config.php index 7cea960d59c..de90e38aa81 100644 --- a/_sql/migrations/954-edit-company-register-config.php +++ b/_sql/migrations/954-edit-company-register-config.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration954 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/955-rename-payment-order-state.php b/_sql/migrations/955-rename-payment-order-state.php index 35bfbb694e2..a4efba8d6e6 100644 --- a/_sql/migrations/955-rename-payment-order-state.php +++ b/_sql/migrations/955-rename-payment-order-state.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration955 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/956-seperate-logmail-address.php b/_sql/migrations/956-seperate-logmail-address.php index d683a7b4d34..06666c17fef 100644 --- a/_sql/migrations/956-seperate-logmail-address.php +++ b/_sql/migrations/956-seperate-logmail-address.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration956 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/957-site-active-status.php b/_sql/migrations/957-site-active-status.php index b0b677556e1..62f4569f3d7 100644 --- a/_sql/migrations/957-site-active-status.php +++ b/_sql/migrations/957-site-active-status.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration957 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/958-add-http-cache-events-for-site.php b/_sql/migrations/958-add-http-cache-events-for-site.php index 8d6e6427bf9..bb79bd4d8e4 100644 --- a/_sql/migrations/958-add-http-cache-events-for-site.php +++ b/_sql/migrations/958-add-http-cache-events-for-site.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration958 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/959-fix-emotion-default-value.php b/_sql/migrations/959-fix-emotion-default-value.php index 96df41cb770..d05b2c87f83 100644 --- a/_sql/migrations/959-fix-emotion-default-value.php +++ b/_sql/migrations/959-fix-emotion-default-value.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration959 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/960-add-article-shippingtime-translation.php b/_sql/migrations/960-add-article-shippingtime-translation.php index 871528f18dc..c874057aede 100644 --- a/_sql/migrations/960-add-article-shippingtime-translation.php +++ b/_sql/migrations/960-add-article-shippingtime-translation.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/961-update-email-templates.php b/_sql/migrations/961-update-email-templates.php index c0307ee7d1c..e4300fd007c 100644 --- a/_sql/migrations/961-update-email-templates.php +++ b/_sql/migrations/961-update-email-templates.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration961 extends Shopware\Components\Migrations\AbstractMigration @@ -79,7 +78,7 @@ private function updateEmailTemplates() // German $sql = <<<'EOD' UPDATE `s_core_config_mails` SET `frommail` = '{config name=mail}',`fromname` = '{config name=shopName}',`subject` = 'Ihre Anmeldung bei {config name=shopName}',`content` = '{include file="string:{config name=emailheaderplain}"} - + Hallo {$salutation|salutation} {$lastname}, vielen Dank für Ihre Anmeldung in unserem Shop. @@ -103,7 +102,7 @@ private function updateEmailTemplates() $sql .= <<<'EOD' UPDATE `s_core_config_mails` SET `frommail` = '{config name=mail}',`fromname` = '{config name=shopName}',`subject` = 'Ihre Bestellung im {config name=shopName}', `content` = '{include file="string:{config name=emailheaderplain}"} - + Hallo {$billingaddress.salutation|salutation} {$billingaddress.lastname}, vielen Dank für Ihre Bestellung im {config name=shopName} (Nummer: {$sOrderNumber}) am {$sOrderDay} um {$sOrderTime}. @@ -174,7 +173,7 @@ private function updateEmailTemplates() Für Rückfragen stehen wir Ihnen jederzeit gerne zur Verfügung. {include file="string:{config name=emailfooterplain}"}', - + `contentHTML` = '
        {include file="string:{config name=emailheaderhtml}"}

        @@ -208,7 +207,7 @@ private function updateEmailTemplates() {/foreach} - +



        @@ -281,7 +280,7 @@ private function updateEmailTemplates() `ishtml` = 1, `attachment` = '', `mailtype` = 2, - `context` = 'a:22:{s:13:"sOrderDetails";a:2:{i:0;a:54:{s:2:"id";s:3:"670";s:9:"sessionID";s:26:"hkkhfl82i1jejfvd2f0ucr6om4";s:6:"userID";s:1:"0";s:11:"articlename";s:11:"ELASTIC CAP";s:9:"articleID";s:3:"152";s:11:"ordernumber";s:7:"SW10153";s:12:"shippingfree";s:1:"0";s:8:"quantity";s:1:"1";s:5:"price";s:5:"29,95";s:8:"netprice";s:15:"25.168067226891";s:8:"tax_rate";s:2:"19";s:5:"datum";s:19:"2017-08-07 14:09:12";s:5:"modus";s:1:"0";s:10:"esdarticle";s:1:"0";s:9:"partnerID";s:0:"";s:12:"lastviewport";s:8:"register";s:9:"useragent";s:76:"Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:54.0) Gecko/20100101 Firefox/54.0";s:6:"config";s:0:"";s:14:"currencyFactor";s:1:"1";s:8:"packunit";s:0:"";s:12:"mainDetailId";s:3:"707";s:15:"articleDetailId";s:3:"708";s:11:"minpurchase";s:1:"1";s:5:"taxID";s:1:"1";s:7:"instock";s:2:"12";s:14:"suppliernumber";s:0:"";s:11:"maxpurchase";s:3:"100";s:13:"purchasesteps";i:1;s:12:"purchaseunit";N;s:9:"laststock";s:1:"0";s:12:"shippingtime";s:0:"";s:11:"releasedate";N;s:12:"sReleaseDate";N;s:3:"ean";s:0:"";s:8:"stockmin";s:1:"0";s:8:"ob_attr1";s:0:"";s:8:"ob_attr2";N;s:8:"ob_attr3";N;s:8:"ob_attr4";N;s:8:"ob_attr5";N;s:8:"ob_attr6";N;s:12:"shippinginfo";b:1;s:3:"esd";s:1:"0";s:18:"additional_details";a:94:{s:9:"articleID";i:152;s:16:"articleDetailsID";i:708;s:11:"ordernumber";s:9:"SW10152.1";s:9:"highlight";b:0;s:11:"description";s:0:"";s:16:"description_long";s:2404:"

        Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo.

        Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue.

        Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt.

        Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla.

        Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui. Aenean ut eros et nisl sagittis vestibulum. Nullam nulla eros, ultricies sit amet, nonummy id, imperdiet feugiat, pede. Sed lectus. Donec mollis hendrerit risus. Phasellus nec sem in justo pellentesque facilisis. Etiam imperdiet imperdiet orci. Nunc nec neque. Phasellus leo dolor, tempus non, auctor et, hendrerit quis, nisi.

        ";s:3:"esd";b:0;s:11:"articleName";s:23:"WINDSTOPPER MÜTZE WARM";s:5:"taxID";i:1;s:3:"tax";i:19;s:7:"instock";i:12;s:11:"isAvailable";b:1;s:6:"weight";i:0;s:12:"shippingtime";N;s:16:"pricegroupActive";b:0;s:12:"pricegroupID";N;s:6:"length";i:0;s:6:"height";i:0;s:5:"width";i:0;s:9:"laststock";b:0;s:14:"additionaltext";s:0:"";s:5:"datum";s:10:"2015-02-05";s:5:"sales";i:0;s:13:"filtergroupID";i:8;s:17:"priceStartingFrom";N;s:18:"pseudopricePercent";N;s:15:"sVariantArticle";N;s:13:"sConfigurator";b:1;s:9:"metaTitle";s:0:"";s:12:"shippingfree";b:0;s:14:"suppliernumber";s:0:"";s:12:"notification";b:0;s:3:"ean";s:0:"";s:8:"keywords";s:0:"";s:12:"sReleasedate";s:0:"";s:8:"template";s:0:"";s:10:"attributes";a:2:{s:4:"core";a:23:{s:2:"id";s:3:"720";s:9:"articleID";s:3:"152";s:16:"articledetailsID";s:3:"708";s:5:"attr1";s:0:"";s:5:"attr2";s:0:"";s:5:"attr3";s:0:"";s:5:"attr4";s:0:"";s:5:"attr5";s:0:"";s:5:"attr6";s:0:"";s:5:"attr7";s:0:"";s:5:"attr8";s:0:"";s:5:"attr9";s:0:"";s:6:"attr10";s:0:"";s:6:"attr11";s:0:"";s:6:"attr12";s:0:"";s:6:"attr13";s:0:"";s:6:"attr14";s:0:"";s:6:"attr15";s:0:"";s:6:"attr16";s:0:"";s:6:"attr17";N;s:6:"attr18";s:0:"";s:6:"attr19";s:0:"";s:6:"attr20";s:0:"";}s:9:"marketing";a:4:{s:5:"isNew";b:0;s:11:"isTopSeller";b:0;s:10:"comingSoon";b:0;s:7:"storage";a:0:{}}}s:17:"allowBuyInListing";b:0;s:5:"attr1";s:0:"";s:5:"attr2";s:0:"";s:5:"attr3";s:0:"";s:5:"attr4";s:0:"";s:5:"attr5";s:0:"";s:5:"attr6";s:0:"";s:5:"attr7";s:0:"";s:5:"attr8";s:0:"";s:5:"attr9";s:0:"";s:6:"attr10";s:0:"";s:6:"attr11";s:0:"";s:6:"attr12";s:0:"";s:6:"attr13";s:0:"";s:6:"attr14";s:0:"";s:6:"attr15";s:0:"";s:6:"attr16";s:0:"";s:6:"attr17";N;s:6:"attr18";s:0:"";s:6:"attr19";s:0:"";s:6:"attr20";s:0:"";s:12:"supplierName";s:8:"LÖFFLER";s:11:"supplierImg";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:10:"supplierID";i:10;s:19:"supplierDescription";s:1267:"

        LÖFFLER ist anders. Denn anders als die meisten Mitbewerber hat sich LÖFFLER schon Anfang der 1990er Jahre entschieden, auch weiterhin in Österreich zu produzieren. Natürlich nach höchsten ethischen und ökologischen Standards, wie sie nur in Österreich bzw. in der Europäischen Union gelten. Mit gut ausgebildeten, kompetenten und motivierten Mitarbeiterinnen und Mitarbeitern.

        Viele Sportswear-Konzerne haben im Streben nach höchsten Gewinnmargen ihre Fertigung längst in Billiglohnländer verlagert. Miserable Arbeitsbedingungen, Hungerlöhne und Kinderarbeit sind dort immer wieder an der Tagesordnung. Höchst fragwürdig sind auch die Umweltzerstörung durch rücksichtslose Produktionsmethoden und die hohe Schadstoffbelastung der auf diese Weise hergestellten Textilien.

        70 Prozent aller Stoffe, die LÖFFLER verarbeitet, kommen aus der eigenen Strickerei in Ried im Innkreis. Das ist einzigartig - und eine wichtige Grundlage für die herausragende Qualität, die Fair Sportswear von LÖFFLER auszeichnet.

        Weitere Informationen zu dem Hersteller finden Sie hier.

        ";s:19:"supplier_attributes";a:0:{}s:10:"newArticle";b:0;s:9:"sUpcoming";b:0;s:9:"topseller";b:0;s:7:"valFrom";i:1;s:5:"valTo";N;s:4:"from";i:1;s:2:"to";N;s:5:"price";s:5:"29,95";s:11:"pseudoprice";s:1:"0";s:14:"referenceprice";N;s:15:"has_pseudoprice";b:0;s:13:"price_numeric";d:29.949999999999999;s:19:"pseudoprice_numeric";i:0;s:16:"price_attributes";a:0:{}s:10:"pricegroup";s:2:"EK";s:11:"minpurchase";i:1;s:11:"maxpurchase";s:3:"100";s:13:"purchasesteps";i:1;s:12:"purchaseunit";N;s:13:"referenceunit";N;s:8:"packunit";s:0:"";s:6:"unitID";N;s:5:"sUnit";a:2:{s:4:"unit";N;s:11:"description";N;}s:15:"unit_attributes";a:0:{}s:5:"image";a:12:{s:2:"id";i:366;s:8:"position";N;s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:11:"description";s:0:"";s:9:"extension";s:3:"jpg";s:4:"main";b:0;s:8:"parentId";N;s:5:"width";i:1492;s:6:"height";i:1500;s:10:"thumbnails";a:3:{i:0;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:3:"200";s:9:"maxHeight";s:3:"200";s:10:"attributes";a:0:{}}i:1;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:3:"600";s:9:"maxHeight";s:3:"600";s:10:"attributes";a:0:{}}i:2;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:4:"1280";s:9:"maxHeight";s:4:"1280";s:10:"attributes";a:0:{}}}s:10:"attributes";a:0:{}s:9:"attribute";a:0:{}}s:6:"prices";a:1:{i:0;a:22:{s:7:"valFrom";i:1;s:5:"valTo";N;s:4:"from";i:1;s:2:"to";N;s:5:"price";s:5:"29,95";s:11:"pseudoprice";s:1:"0";s:14:"referenceprice";s:1:"0";s:18:"pseudopricePercent";N;s:15:"has_pseudoprice";b:0;s:13:"price_numeric";d:29.949999999999999;s:19:"pseudoprice_numeric";i:0;s:16:"price_attributes";a:0:{}s:10:"pricegroup";s:2:"EK";s:11:"minpurchase";i:1;s:11:"maxpurchase";s:3:"100";s:13:"purchasesteps";i:1;s:12:"purchaseunit";N;s:13:"referenceunit";N;s:8:"packunit";s:0:"";s:6:"unitID";N;s:5:"sUnit";a:2:{s:4:"unit";N;s:11:"description";N;}s:15:"unit_attributes";a:0:{}}}s:10:"linkBasket";s:42:"shopware.php?sViewport=basket&sAdd=SW10153";s:11:"linkDetails";s:42:"shopware.php?sViewport=detail&sArticle=152";s:11:"linkVariant";s:57:"shopware.php?sViewport=detail&sArticle=152&number=SW10153";s:11:"sProperties";a:3:{i:1;a:11:{s:2:"id";i:1;s:8:"optionID";i:1;s:4:"name";s:10:"Artikeltyp";s:7:"groupID";i:8;s:9:"groupName";s:7:"Fashion";s:5:"value";s:16:"Bildkonfigurator";s:6:"values";a:1:{i:4;s:16:"Bildkonfigurator";}s:12:"isFilterable";b:1;s:7:"options";a:1:{i:0;a:3:{s:2:"id";i:4;s:4:"name";s:16:"Bildkonfigurator";s:10:"attributes";a:0:{}}}s:5:"media";a:0:{}s:10:"attributes";a:0:{}}i:3;a:11:{s:2:"id";i:3;s:8:"optionID";i:3;s:4:"name";s:8:"Material";s:7:"groupID";i:8;s:9:"groupName";s:7:"Fashion";s:5:"value";s:20:"Polyester, Baumwolle";s:6:"values";a:2:{i:108;s:9:"Polyester";i:163;s:9:"Baumwolle";}s:12:"isFilterable";b:1;s:7:"options";a:2:{i:0;a:3:{s:2:"id";i:108;s:4:"name";s:9:"Polyester";s:10:"attributes";a:0:{}}i:1;a:3:{s:2:"id";i:163;s:4:"name";s:9:"Baumwolle";s:10:"attributes";a:0:{}}}s:5:"media";a:0:{}s:10:"attributes";a:0:{}}i:18;a:11:{s:2:"id";i:18;s:8:"optionID";i:18;s:4:"name";s:5:"Farbe";s:7:"groupID";i:8;s:9:"groupName";s:7:"Fashion";s:5:"value";s:12:"Rot, Schwarz";s:6:"values";a:2:{i:166;s:3:"Rot";i:155;s:7:"Schwarz";}s:12:"isFilterable";b:1;s:7:"options";a:2:{i:0;a:3:{s:2:"id";i:166;s:4:"name";s:3:"Rot";s:10:"attributes";a:0:{}}i:1;a:3:{s:2:"id";i:155;s:4:"name";s:7:"Schwarz";s:10:"attributes";a:0:{}}}s:5:"media";a:2:{i:166;a:13:{s:7:"valueId";i:166;s:2:"id";i:355;s:8:"position";N;s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:11:"description";s:3:"rot";s:9:"extension";s:3:"jpg";s:4:"main";N;s:8:"parentId";N;s:5:"width";i:40;s:6:"height";i:40;s:10:"thumbnails";a:0:{}s:10:"attributes";a:0:{}s:9:"attribute";a:0:{}}i:155;a:13:{s:7:"valueId";i:155;s:2:"id";i:357;s:8:"position";N;s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:11:"description";s:7:"schwarz";s:9:"extension";s:3:"jpg";s:4:"main";N;s:8:"parentId";N;s:5:"width";i:40;s:6:"height";i:40;s:10:"thumbnails";a:0:{}s:10:"attributes";a:0:{}s:9:"attribute";a:0:{}}}s:10:"attributes";a:0:{}}}s:10:"properties";s:106:"Artikeltyp: Bildkonfigurator, Material: Polyester, Baumwolle, Farbe: Rot, Schwarz";}s:6:"amount";s:5:"29,95";s:9:"amountnet";s:5:"25,17";s:12:"priceNumeric";s:5:"29.95";s:5:"image";a:15:{s:2:"id";i:366;s:8:"position";N;s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:11:"description";s:0:"";s:9:"extension";s:3:"jpg";s:4:"main";b:0;s:8:"parentId";N;s:5:"width";i:1492;s:6:"height";i:1500;s:10:"thumbnails";a:3:{i:0;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:3:"200";s:9:"maxHeight";s:3:"200";s:10:"attributes";a:0:{}}i:1;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:3:"600";s:9:"maxHeight";s:3:"600";s:10:"attributes";a:0:{}}i:2;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:4:"1280";s:9:"maxHeight";s:4:"1280";s:10:"attributes";a:0:{}}}s:10:"attributes";a:0:{}s:9:"attribute";a:0:{}s:3:"src";a:4:{s:8:"original";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:0;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:1;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:2;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";}s:5:"srchd";a:4:{s:8:"original";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:0;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:1;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:2;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";}s:3:"res";a:1:{s:8:"original";a:2:{s:5:"width";i:1500;s:6:"height";i:1492;}}}s:11:"linkDetails";s:42:"shopware.php?sViewport=detail&sArticle=152";s:10:"linkDelete";s:41:"shopware.php?sViewport=basket&sDelete=670";s:8:"linkNote";s:40:"shopware.php?sViewport=note&sAdd=SW10153";s:3:"tax";s:4:"4,78";s:13:"orderDetailId";s:3:"208";s:10:"attributes";a:6:{s:10:"attribute1";s:0:"";s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}i:1;a:52:{s:2:"id";s:3:"673";s:9:"sessionID";s:26:"hkkhfl82i1jejfvd2f0ucr6om4";s:6:"userID";s:1:"0";s:11:"articlename";s:15:"Warenkorbrabatt";s:9:"articleID";s:1:"0";s:11:"ordernumber";s:16:"SHIPPINGDISCOUNT";s:12:"shippingfree";s:1:"0";s:8:"quantity";s:1:"1";s:5:"price";s:5:"-2,00";s:8:"netprice";s:5:"-1.68";s:8:"tax_rate";s:2:"19";s:5:"datum";s:19:"2017-08-07 14:09:20";s:5:"modus";s:1:"4";s:10:"esdarticle";s:1:"0";s:9:"partnerID";s:0:"";s:12:"lastviewport";s:0:"";s:9:"useragent";s:0:"";s:6:"config";s:0:"";s:14:"currencyFactor";s:1:"1";s:8:"packunit";N;s:12:"mainDetailId";N;s:15:"articleDetailId";N;s:11:"minpurchase";i:1;s:5:"taxID";N;s:7:"instock";N;s:14:"suppliernumber";N;s:11:"maxpurchase";s:3:"100";s:13:"purchasesteps";i:1;s:12:"purchaseunit";N;s:9:"laststock";N;s:12:"shippingtime";N;s:11:"releasedate";N;s:12:"sReleaseDate";N;s:3:"ean";N;s:8:"stockmin";N;s:8:"ob_attr1";N;s:8:"ob_attr2";N;s:8:"ob_attr3";N;s:8:"ob_attr4";N;s:8:"ob_attr5";N;s:8:"ob_attr6";N;s:12:"shippinginfo";b:0;s:3:"esd";s:1:"0";s:6:"amount";s:5:"-2,00";s:9:"amountnet";s:5:"-1,68";s:12:"priceNumeric";s:2:"-2";s:11:"linkDetails";s:40:"shopware.php?sViewport=detail&sArticle=0";s:10:"linkDelete";s:41:"shopware.php?sViewport=basket&sDelete=673";s:8:"linkNote";s:49:"shopware.php?sViewport=note&sAdd=SHIPPINGDISCOUNT";s:3:"tax";s:5:"-0,32";s:13:"orderDetailId";s:3:"209";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}}s:14:"billingaddress";a:26:{s:2:"id";s:1:"5";s:7:"company";s:0:"";s:10:"department";s:0:"";s:10:"salutation";s:2:"mr";s:9:"firstname";s:3:"Max";s:5:"title";s:0:"";s:8:"lastname";s:10:"Mustermann";s:6:"street";s:15:"Musterstraße 1";s:7:"zipcode";s:5:"12345";s:4:"city";s:11:"Musterstadt";s:5:"phone";s:0:"";s:5:"vatId";s:0:"";s:22:"additionalAddressLine1";s:0:"";s:22:"additionalAddressLine2";s:0:"";s:9:"countryId";s:1:"2";s:7:"stateId";s:0:"";s:8:"customer";N;s:7:"country";N;s:5:"state";s:0:"";s:6:"userID";s:1:"3";s:9:"countryID";s:1:"2";s:7:"stateID";s:0:"";s:5:"ustid";s:0:"";s:24:"additional_address_line1";s:0:"";s:24:"additional_address_line2";s:0:"";s:10:"attributes";N;}s:15:"shippingaddress";a:26:{s:2:"id";s:1:"5";s:7:"company";s:0:"";s:10:"department";s:0:"";s:10:"salutation";s:2:"mr";s:9:"firstname";s:3:"Max";s:5:"title";s:0:"";s:8:"lastname";s:10:"Mustermann";s:6:"street";s:15:"Musterstraße 1";s:7:"zipcode";s:5:"12345";s:4:"city";s:11:"Musterstadt";s:5:"phone";s:0:"";s:5:"vatId";s:0:"";s:22:"additionalAddressLine1";s:0:"";s:22:"additionalAddressLine2";s:0:"";s:9:"countryId";s:1:"2";s:7:"stateId";s:0:"";s:8:"customer";N;s:7:"country";N;s:5:"state";s:0:"";s:6:"userID";s:1:"3";s:9:"countryID";s:1:"2";s:7:"stateID";s:0:"";s:5:"ustid";s:0:"";s:24:"additional_address_line1";s:0:"";s:24:"additional_address_line2";s:0:"";s:10:"attributes";N;}s:10:"additional";a:8:{s:7:"country";a:15:{s:2:"id";s:1:"2";s:11:"countryname";s:11:"Deutschland";s:10:"countryiso";s:2:"DE";s:6:"areaID";s:1:"1";s:9:"countryen";s:7:"GERMANY";s:8:"position";s:1:"1";s:6:"notice";s:0:"";s:7:"taxfree";s:1:"0";s:13:"taxfree_ustid";s:1:"0";s:21:"taxfree_ustid_checked";s:1:"0";s:6:"active";s:1:"1";s:4:"iso3";s:3:"DEU";s:29:"display_state_in_registration";s:1:"0";s:27:"force_state_in_registration";s:1:"0";s:11:"countryarea";s:11:"deutschland";}s:5:"state";a:0:{}s:4:"user";a:33:{s:2:"id";s:1:"3";s:6:"userID";s:1:"3";s:8:"password";s:60:"$2y$10$AzjwzOob83DJ2LG6yxXcBeghK9ciBB1zsK3UeBZADZCl10pTQN62W";s:7:"encoder";s:6:"bcrypt";s:5:"email";s:14:"xy@example.org";s:6:"active";s:1:"1";s:11:"accountmode";s:1:"0";s:15:"confirmationkey";s:0:"";s:9:"paymentID";s:1:"5";s:10:"firstlogin";s:10:"2017-08-07";s:9:"lastlogin";s:19:"2017-08-07 14:09:20";s:9:"sessionID";s:26:"hkkhfl82i1jejfvd2f0ucr6om4";s:10:"newsletter";i:0;s:10:"validation";s:0:"";s:9:"affiliate";s:1:"0";s:13:"customergroup";s:2:"EK";s:13:"paymentpreset";s:1:"0";s:8:"language";s:1:"1";s:9:"subshopID";s:1:"1";s:7:"referer";s:0:"";s:12:"pricegroupID";N;s:15:"internalcomment";s:0:"";s:12:"failedlogins";s:1:"0";s:11:"lockeduntil";N;s:26:"default_billing_address_id";s:1:"5";s:27:"default_shipping_address_id";s:1:"5";s:5:"title";N;s:10:"salutation";s:2:"mr";s:9:"firstname";s:3:"Max";s:8:"lastname";s:10:"Mustermann";s:8:"birthday";N;s:14:"customernumber";s:5:"20005";s:11:"login_token";s:38:"1239c089-6b2f-4461-9134-c02026970bff.1";}s:15:"countryShipping";a:15:{s:2:"id";s:1:"2";s:11:"countryname";s:11:"Deutschland";s:10:"countryiso";s:2:"DE";s:6:"areaID";s:1:"1";s:9:"countryen";s:7:"GERMANY";s:8:"position";s:1:"1";s:6:"notice";s:0:"";s:7:"taxfree";s:1:"0";s:13:"taxfree_ustid";s:1:"0";s:21:"taxfree_ustid_checked";s:1:"0";s:6:"active";s:1:"1";s:4:"iso3";s:3:"DEU";s:29:"display_state_in_registration";s:1:"0";s:27:"force_state_in_registration";s:1:"0";s:11:"countryarea";s:11:"deutschland";}s:13:"stateShipping";a:0:{}s:7:"payment";a:21:{s:2:"id";s:1:"5";s:4:"name";s:10:"prepayment";s:11:"description";s:8:"Vorkasse";s:8:"template";s:14:"prepayment.tpl";s:5:"class";s:14:"prepayment.php";s:5:"table";s:0:"";s:4:"hide";s:1:"0";s:21:"additionaldescription";s:108:"Sie zahlen einfach vorab und erhalten die Ware bequem und günstig bei Zahlungseingang nach Hause geliefert.";s:13:"debit_percent";s:1:"0";s:9:"surcharge";s:1:"0";s:15:"surchargestring";s:0:"";s:8:"position";s:1:"1";s:6:"active";s:1:"1";s:9:"esdactive";s:1:"0";s:11:"embediframe";s:0:"";s:12:"hideprospect";s:1:"0";s:6:"action";N;s:8:"pluginID";N;s:6:"source";N;s:15:"mobile_inactive";s:1:"0";s:10:"validation";a:0:{}}s:10:"charge_vat";b:1;s:8:"show_net";b:1;}s:9:"sTaxRates";a:1:{s:5:"19.00";d:5.0800000000000001;}s:14:"sShippingCosts";s:8:"3,90 EUR";s:7:"sAmount";s:9:"31,85 EUR";s:14:"sAmountNumeric";d:31.850000000000001;s:10:"sAmountNet";s:9:"26,77 EUR";s:17:"sAmountNetNumeric";d:26.77;s:12:"sOrderNumber";i:20003;s:9:"sOrderDay";s:10:"07.08.2017";s:10:"sOrderTime";s:5:"14:09";s:8:"sComment";s:0:"";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}s:9:"sCurrency";s:3:"EUR";s:9:"sLanguage";i:1;s:8:"sSubShop";i:1;s:4:"sEsd";N;s:4:"sNet";b:0;s:13:"sPaymentTable";a:0:{}s:9:"sDispatch";a:10:{s:2:"id";s:1:"9";s:4:"name";s:16:"Standard Versand";s:11:"description";s:0:"";s:11:"calculation";s:1:"1";s:11:"status_link";s:0:"";s:21:"surcharge_calculation";s:1:"3";s:17:"bind_shippingfree";s:1:"0";s:12:"shippingfree";N;s:15:"tax_calculation";s:1:"0";s:21:"tax_calculation_value";N;}}' + `context` = 'a:22:{s:13:"sOrderDetails";a:2:{i:0;a:54:{s:2:"id";s:3:"670";s:9:"sessionID";s:26:"hkkhfl82i1jejfvd2f0ucr6om4";s:6:"userID";s:1:"0";s:11:"articlename";s:11:"ELASTIC CAP";s:9:"articleID";s:3:"152";s:11:"ordernumber";s:7:"SW10153";s:12:"shippingfree";s:1:"0";s:8:"quantity";s:1:"1";s:5:"price";s:5:"29,95";s:8:"netprice";s:15:"25.168067226891";s:8:"tax_rate";s:2:"19";s:5:"datum";s:19:"2017-08-07 14:09:12";s:5:"modus";s:1:"0";s:10:"esdarticle";s:1:"0";s:9:"partnerID";s:0:"";s:12:"lastviewport";s:8:"register";s:9:"useragent";s:76:"Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:54.0) Gecko/20100101 Firefox/54.0";s:6:"config";s:0:"";s:14:"currencyFactor";s:1:"1";s:8:"packunit";s:0:"";s:12:"mainDetailId";s:3:"707";s:15:"articleDetailId";s:3:"708";s:11:"minpurchase";s:1:"1";s:5:"taxID";s:1:"1";s:7:"instock";s:2:"12";s:14:"suppliernumber";s:0:"";s:11:"maxpurchase";s:3:"100";s:13:"purchasesteps";i:1;s:12:"purchaseunit";N;s:9:"laststock";s:1:"0";s:12:"shippingtime";s:0:"";s:11:"releasedate";N;s:12:"sReleaseDate";N;s:3:"ean";s:0:"";s:8:"stockmin";s:1:"0";s:8:"ob_attr1";s:0:"";s:8:"ob_attr2";N;s:8:"ob_attr3";N;s:8:"ob_attr4";N;s:8:"ob_attr5";N;s:8:"ob_attr6";N;s:12:"shippinginfo";b:1;s:3:"esd";s:1:"0";s:18:"additional_details";a:94:{s:9:"articleID";i:152;s:16:"articleDetailsID";i:708;s:11:"ordernumber";s:9:"SW10152.1";s:9:"highlight";b:0;s:11:"description";s:0:"";s:16:"description_long";s:2404:"

        Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo.

        Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue.

        Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt.

        Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla.

        Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui. Aenean ut eros et nisl sagittis vestibulum. Nullam nulla eros, ultricies sit amet, nonummy id, imperdiet feugiat, pede. Sed lectus. Donec mollis hendrerit risus. Phasellus nec sem in justo pellentesque facilisis. Etiam imperdiet imperdiet orci. Nunc nec neque. Phasellus leo dolor, tempus non, auctor et, hendrerit quis, nisi.

        ";s:3:"esd";b:0;s:11:"articleName";s:23:"WINDSTOPPER MÜTZE WARM";s:5:"taxID";i:1;s:3:"tax";i:19;s:7:"instock";i:12;s:11:"isAvailable";b:1;s:6:"weight";i:0;s:12:"shippingtime";N;s:16:"pricegroupActive";b:0;s:12:"pricegroupID";N;s:6:"length";i:0;s:6:"height";i:0;s:5:"width";i:0;s:9:"laststock";b:0;s:14:"additionaltext";s:0:"";s:5:"datum";s:10:"2015-02-05";s:5:"sales";i:0;s:13:"filtergroupID";i:8;s:17:"priceStartingFrom";N;s:18:"pseudopricePercent";N;s:15:"sVariantArticle";N;s:13:"sConfigurator";b:1;s:9:"metaTitle";s:0:"";s:12:"shippingfree";b:0;s:14:"suppliernumber";s:0:"";s:12:"notification";b:0;s:3:"ean";s:0:"";s:8:"keywords";s:0:"";s:12:"sReleasedate";s:0:"";s:8:"template";s:0:"";s:10:"attributes";a:2:{s:4:"core";a:23:{s:2:"id";s:3:"720";s:9:"articleID";s:3:"152";s:16:"articledetailsID";s:3:"708";s:5:"attr1";s:0:"";s:5:"attr2";s:0:"";s:5:"attr3";s:0:"";s:5:"attr4";s:0:"";s:5:"attr5";s:0:"";s:5:"attr6";s:0:"";s:5:"attr7";s:0:"";s:5:"attr8";s:0:"";s:5:"attr9";s:0:"";s:6:"attr10";s:0:"";s:6:"attr11";s:0:"";s:6:"attr12";s:0:"";s:6:"attr13";s:0:"";s:6:"attr14";s:0:"";s:6:"attr15";s:0:"";s:6:"attr16";s:0:"";s:6:"attr17";N;s:6:"attr18";s:0:"";s:6:"attr19";s:0:"";s:6:"attr20";s:0:"";}s:9:"marketing";a:4:{s:5:"isNew";b:0;s:11:"isTopSeller";b:0;s:10:"comingSoon";b:0;s:7:"storage";a:0:{}}}s:17:"allowBuyInListing";b:0;s:5:"attr1";s:0:"";s:5:"attr2";s:0:"";s:5:"attr3";s:0:"";s:5:"attr4";s:0:"";s:5:"attr5";s:0:"";s:5:"attr6";s:0:"";s:5:"attr7";s:0:"";s:5:"attr8";s:0:"";s:5:"attr9";s:0:"";s:6:"attr10";s:0:"";s:6:"attr11";s:0:"";s:6:"attr12";s:0:"";s:6:"attr13";s:0:"";s:6:"attr14";s:0:"";s:6:"attr15";s:0:"";s:6:"attr16";s:0:"";s:6:"attr17";N;s:6:"attr18";s:0:"";s:6:"attr19";s:0:"";s:6:"attr20";s:0:"";s:12:"supplierName";s:8:"LÖFFLER";s:11:"supplierImg";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:10:"supplierID";i:10;s:19:"supplierDescription";s:1267:"

        LÖFFLER ist anders. Denn anders als die meisten Mitbewerber hat sich LÖFFLER schon Anfang der 1990er Jahre entschieden, auch weiterhin in Österreich zu produzieren. Natürlich nach höchsten ethischen und ökologischen Standards, wie sie nur in Österreich bzw. in der Europäischen Union gelten. Mit gut ausgebildeten, kompetenten und motivierten Mitarbeiterinnen und Mitarbeitern.

        Viele Sportswear-Konzerne haben im Streben nach höchsten Gewinnmargen ihre Fertigung längst in Billiglohnländer verlagert. Miserable Arbeitsbedingungen, Hungerlöhne und Kinderarbeit sind dort immer wieder an der Tagesordnung. Höchst fragwürdig sind auch die Umweltzerstörung durch rücksichtslose Produktionsmethoden und die hohe Schadstoffbelastung der auf diese Weise hergestellten Textilien.

        70 Prozent aller Stoffe, die LÖFFLER verarbeitet, kommen aus der eigenen Strickerei in Ried im Innkreis. Das ist einzigartig - und eine wichtige Grundlage für die herausragende Qualität, die Fair Sportswear von LÖFFLER auszeichnet.

        Weitere Informationen zu dem Hersteller finden Sie hier.

        ";s:19:"supplier_attributes";a:0:{}s:10:"newArticle";b:0;s:9:"sUpcoming";b:0;s:9:"topseller";b:0;s:7:"valFrom";i:1;s:5:"valTo";N;s:4:"from";i:1;s:2:"to";N;s:5:"price";s:5:"29,95";s:11:"pseudoprice";s:1:"0";s:14:"referenceprice";N;s:15:"has_pseudoprice";b:0;s:13:"price_numeric";d:29.949999999999999;s:19:"pseudoprice_numeric";i:0;s:16:"price_attributes";a:0:{}s:10:"pricegroup";s:2:"EK";s:11:"minpurchase";i:1;s:11:"maxpurchase";s:3:"100";s:13:"purchasesteps";i:1;s:12:"purchaseunit";N;s:13:"referenceunit";N;s:8:"packunit";s:0:"";s:6:"unitID";N;s:5:"sUnit";a:2:{s:4:"unit";N;s:11:"description";N;}s:15:"unit_attributes";a:0:{}s:5:"image";a:12:{s:2:"id";i:366;s:8:"position";N;s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:11:"description";s:0:"";s:9:"extension";s:3:"jpg";s:4:"main";b:0;s:8:"parentId";N;s:5:"width";i:1492;s:6:"height";i:1500;s:10:"thumbnails";a:3:{i:0;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:3:"200";s:9:"maxHeight";s:3:"200";s:10:"attributes";a:0:{}}i:1;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:3:"600";s:9:"maxHeight";s:3:"600";s:10:"attributes";a:0:{}}i:2;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:4:"1280";s:9:"maxHeight";s:4:"1280";s:10:"attributes";a:0:{}}}s:10:"attributes";a:0:{}s:9:"attribute";a:0:{}}s:6:"prices";a:1:{i:0;a:22:{s:7:"valFrom";i:1;s:5:"valTo";N;s:4:"from";i:1;s:2:"to";N;s:5:"price";s:5:"29,95";s:11:"pseudoprice";s:1:"0";s:14:"referenceprice";s:1:"0";s:18:"pseudopricePercent";N;s:15:"has_pseudoprice";b:0;s:13:"price_numeric";d:29.949999999999999;s:19:"pseudoprice_numeric";i:0;s:16:"price_attributes";a:0:{}s:10:"pricegroup";s:2:"EK";s:11:"minpurchase";i:1;s:11:"maxpurchase";s:3:"100";s:13:"purchasesteps";i:1;s:12:"purchaseunit";N;s:13:"referenceunit";N;s:8:"packunit";s:0:"";s:6:"unitID";N;s:5:"sUnit";a:2:{s:4:"unit";N;s:11:"description";N;}s:15:"unit_attributes";a:0:{}}}s:10:"linkBasket";s:42:"shopware.php?sViewport=basket&sAdd=SW10153";s:11:"linkDetails";s:42:"shopware.php?sViewport=detail&sArticle=152";s:11:"linkVariant";s:57:"shopware.php?sViewport=detail&sArticle=152&number=SW10153";s:11:"sProperties";a:3:{i:1;a:11:{s:2:"id";i:1;s:8:"optionID";i:1;s:4:"name";s:10:"Artikeltyp";s:7:"groupID";i:8;s:9:"groupName";s:7:"Fashion";s:5:"value";s:16:"Bildkonfigurator";s:6:"values";a:1:{i:4;s:16:"Bildkonfigurator";}s:12:"isFilterable";b:1;s:7:"options";a:1:{i:0;a:3:{s:2:"id";i:4;s:4:"name";s:16:"Bildkonfigurator";s:10:"attributes";a:0:{}}}s:5:"media";a:0:{}s:10:"attributes";a:0:{}}i:3;a:11:{s:2:"id";i:3;s:8:"optionID";i:3;s:4:"name";s:8:"Material";s:7:"groupID";i:8;s:9:"groupName";s:7:"Fashion";s:5:"value";s:20:"Polyester, Baumwolle";s:6:"values";a:2:{i:108;s:9:"Polyester";i:163;s:9:"Baumwolle";}s:12:"isFilterable";b:1;s:7:"options";a:2:{i:0;a:3:{s:2:"id";i:108;s:4:"name";s:9:"Polyester";s:10:"attributes";a:0:{}}i:1;a:3:{s:2:"id";i:163;s:4:"name";s:9:"Baumwolle";s:10:"attributes";a:0:{}}}s:5:"media";a:0:{}s:10:"attributes";a:0:{}}i:18;a:11:{s:2:"id";i:18;s:8:"optionID";i:18;s:4:"name";s:5:"Farbe";s:7:"groupID";i:8;s:9:"groupName";s:7:"Fashion";s:5:"value";s:12:"Rot, Schwarz";s:6:"values";a:2:{i:166;s:3:"Rot";i:155;s:7:"Schwarz";}s:12:"isFilterable";b:1;s:7:"options";a:2:{i:0;a:3:{s:2:"id";i:166;s:4:"name";s:3:"Rot";s:10:"attributes";a:0:{}}i:1;a:3:{s:2:"id";i:155;s:4:"name";s:7:"Schwarz";s:10:"attributes";a:0:{}}}s:5:"media";a:2:{i:166;a:13:{s:7:"valueId";i:166;s:2:"id";i:355;s:8:"position";N;s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:11:"description";s:3:"rot";s:9:"extension";s:3:"jpg";s:4:"main";N;s:8:"parentId";N;s:5:"width";i:40;s:6:"height";i:40;s:10:"thumbnails";a:0:{}s:10:"attributes";a:0:{}s:9:"attribute";a:0:{}}i:155;a:13:{s:7:"valueId";i:155;s:2:"id";i:357;s:8:"position";N;s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:11:"description";s:7:"schwarz";s:9:"extension";s:3:"jpg";s:4:"main";N;s:8:"parentId";N;s:5:"width";i:40;s:6:"height";i:40;s:10:"thumbnails";a:0:{}s:10:"attributes";a:0:{}s:9:"attribute";a:0:{}}}s:10:"attributes";a:0:{}}}s:10:"properties";s:106:"Artikeltyp: Bildkonfigurator, Material: Polyester, Baumwolle, Farbe: Rot, Schwarz";}s:6:"amount";s:5:"29,95";s:9:"amountnet";s:5:"25,17";s:12:"priceNumeric";s:5:"29.95";s:5:"image";a:15:{s:2:"id";i:366;s:8:"position";N;s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:11:"description";s:0:"";s:9:"extension";s:3:"jpg";s:4:"main";b:0;s:8:"parentId";N;s:5:"width";i:1492;s:6:"height";i:1500;s:10:"thumbnails";a:3:{i:0;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:3:"200";s:9:"maxHeight";s:3:"200";s:10:"attributes";a:0:{}}i:1;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:3:"600";s:9:"maxHeight";s:3:"600";s:10:"attributes";a:0:{}}i:2;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:4:"1280";s:9:"maxHeight";s:4:"1280";s:10:"attributes";a:0:{}}}s:10:"attributes";a:0:{}s:9:"attribute";a:0:{}s:3:"src";a:4:{s:8:"original";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:0;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:1;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:2;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";}s:5:"srchd";a:4:{s:8:"original";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:0;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:1;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:2;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";}s:3:"res";a:1:{s:8:"original";a:2:{s:5:"width";i:1500;s:6:"height";i:1492;}}}s:11:"linkDetails";s:42:"shopware.php?sViewport=detail&sArticle=152";s:10:"linkDelete";s:41:"shopware.php?sViewport=basket&sDelete=670";s:8:"linkNote";s:40:"shopware.php?sViewport=note&sAdd=SW10153";s:3:"tax";s:4:"4,78";s:13:"orderDetailId";s:3:"208";s:10:"attributes";a:6:{s:10:"attribute1";s:0:"";s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}i:1;a:52:{s:2:"id";s:3:"673";s:9:"sessionID";s:26:"hkkhfl82i1jejfvd2f0ucr6om4";s:6:"userID";s:1:"0";s:11:"articlename";s:15:"Warenkorbrabatt";s:9:"articleID";s:1:"0";s:11:"ordernumber";s:16:"SHIPPINGDISCOUNT";s:12:"shippingfree";s:1:"0";s:8:"quantity";s:1:"1";s:5:"price";s:5:"-2,00";s:8:"netprice";s:5:"-1.68";s:8:"tax_rate";s:2:"19";s:5:"datum";s:19:"2017-08-07 14:09:20";s:5:"modus";s:1:"4";s:10:"esdarticle";s:1:"0";s:9:"partnerID";s:0:"";s:12:"lastviewport";s:0:"";s:9:"useragent";s:0:"";s:6:"config";s:0:"";s:14:"currencyFactor";s:1:"1";s:8:"packunit";N;s:12:"mainDetailId";N;s:15:"articleDetailId";N;s:11:"minpurchase";i:1;s:5:"taxID";N;s:7:"instock";N;s:14:"suppliernumber";N;s:11:"maxpurchase";s:3:"100";s:13:"purchasesteps";i:1;s:12:"purchaseunit";N;s:9:"laststock";N;s:12:"shippingtime";N;s:11:"releasedate";N;s:12:"sReleaseDate";N;s:3:"ean";N;s:8:"stockmin";N;s:8:"ob_attr1";N;s:8:"ob_attr2";N;s:8:"ob_attr3";N;s:8:"ob_attr4";N;s:8:"ob_attr5";N;s:8:"ob_attr6";N;s:12:"shippinginfo";b:0;s:3:"esd";s:1:"0";s:6:"amount";s:5:"-2,00";s:9:"amountnet";s:5:"-1,68";s:12:"priceNumeric";s:2:"-2";s:11:"linkDetails";s:40:"shopware.php?sViewport=detail&sArticle=0";s:10:"linkDelete";s:41:"shopware.php?sViewport=basket&sDelete=673";s:8:"linkNote";s:49:"shopware.php?sViewport=note&sAdd=SHIPPINGDISCOUNT";s:3:"tax";s:5:"-0,32";s:13:"orderDetailId";s:3:"209";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}}s:14:"billingaddress";a:26:{s:2:"id";s:1:"5";s:7:"company";s:0:"";s:10:"department";s:0:"";s:10:"salutation";s:2:"mr";s:9:"firstname";s:3:"Max";s:5:"title";s:0:"";s:8:"lastname";s:10:"Mustermann";s:6:"street";s:15:"Musterstraße 1";s:7:"zipcode";s:5:"12345";s:4:"city";s:11:"Musterstadt";s:5:"phone";s:0:"";s:5:"vatId";s:0:"";s:22:"additionalAddressLine1";s:0:"";s:22:"additionalAddressLine2";s:0:"";s:9:"countryId";s:1:"2";s:7:"stateId";s:0:"";s:8:"customer";N;s:7:"country";N;s:5:"state";s:0:"";s:6:"userID";s:1:"3";s:9:"countryID";s:1:"2";s:7:"stateID";s:0:"";s:5:"ustid";s:0:"";s:24:"additional_address_line1";s:0:"";s:24:"additional_address_line2";s:0:"";s:10:"attributes";N;}s:15:"shippingaddress";a:26:{s:2:"id";s:1:"5";s:7:"company";s:0:"";s:10:"department";s:0:"";s:10:"salutation";s:2:"mr";s:9:"firstname";s:3:"Max";s:5:"title";s:0:"";s:8:"lastname";s:10:"Mustermann";s:6:"street";s:15:"Musterstraße 1";s:7:"zipcode";s:5:"12345";s:4:"city";s:11:"Musterstadt";s:5:"phone";s:0:"";s:5:"vatId";s:0:"";s:22:"additionalAddressLine1";s:0:"";s:22:"additionalAddressLine2";s:0:"";s:9:"countryId";s:1:"2";s:7:"stateId";s:0:"";s:8:"customer";N;s:7:"country";N;s:5:"state";s:0:"";s:6:"userID";s:1:"3";s:9:"countryID";s:1:"2";s:7:"stateID";s:0:"";s:5:"ustid";s:0:"";s:24:"additional_address_line1";s:0:"";s:24:"additional_address_line2";s:0:"";s:10:"attributes";N;}s:10:"additional";a:8:{s:7:"country";a:15:{s:2:"id";s:1:"2";s:11:"countryname";s:11:"Deutschland";s:10:"countryiso";s:2:"DE";s:6:"areaID";s:1:"1";s:9:"countryen";s:7:"GERMANY";s:8:"position";s:1:"1";s:6:"notice";s:0:"";s:7:"taxfree";s:1:"0";s:13:"taxfree_ustid";s:1:"0";s:21:"taxfree_ustid_checked";s:1:"0";s:6:"active";s:1:"1";s:4:"iso3";s:3:"DEU";s:29:"display_state_in_registration";s:1:"0";s:27:"force_state_in_registration";s:1:"0";s:11:"countryarea";s:11:"deutschland";}s:5:"state";a:0:{}s:4:"user";a:33:{s:2:"id";s:1:"3";s:6:"userID";s:1:"3";s:8:"password";s:60:"$2y$10$AzjwzOob83DJ2LG6yxXcBeghK9ciBB1zsK3UeBZADZCl10pTQN62W";s:7:"encoder";s:6:"bcrypt";s:5:"email";s:14:"xy@example.org";s:6:"active";s:1:"1";s:11:"accountmode";s:1:"0";s:15:"confirmationkey";s:0:"";s:9:"paymentID";s:1:"5";s:10:"firstlogin";s:10:"2017-08-07";s:9:"lastlogin";s:19:"2017-08-07 14:09:20";s:9:"sessionID";s:26:"hkkhfl82i1jejfvd2f0ucr6om4";s:10:"newsletter";i:0;s:10:"validation";s:0:"";s:9:"affiliate";s:1:"0";s:13:"customergroup";s:2:"EK";s:13:"paymentpreset";s:1:"0";s:8:"language";s:1:"1";s:9:"subshopID";s:1:"1";s:7:"referer";s:0:"";s:12:"pricegroupID";N;s:15:"internalcomment";s:0:"";s:12:"failedlogins";s:1:"0";s:11:"lockeduntil";N;s:26:"default_billing_address_id";s:1:"5";s:27:"default_shipping_address_id";s:1:"5";s:5:"title";N;s:10:"salutation";s:2:"mr";s:9:"firstname";s:3:"Max";s:8:"lastname";s:10:"Mustermann";s:8:"birthday";N;s:14:"customernumber";s:5:"20005";s:11:"login_token";s:38:"1239c089-6b2f-4461-9134-c02026970bff.1";}s:15:"countryShipping";a:15:{s:2:"id";s:1:"2";s:11:"countryname";s:11:"Deutschland";s:10:"countryiso";s:2:"DE";s:6:"areaID";s:1:"1";s:9:"countryen";s:7:"GERMANY";s:8:"position";s:1:"1";s:6:"notice";s:0:"";s:7:"taxfree";s:1:"0";s:13:"taxfree_ustid";s:1:"0";s:21:"taxfree_ustid_checked";s:1:"0";s:6:"active";s:1:"1";s:4:"iso3";s:3:"DEU";s:29:"display_state_in_registration";s:1:"0";s:27:"force_state_in_registration";s:1:"0";s:11:"countryarea";s:11:"deutschland";}s:13:"stateShipping";a:0:{}s:7:"payment";a:21:{s:2:"id";s:1:"5";s:4:"name";s:10:"prepayment";s:11:"description";s:8:"Vorkasse";s:8:"template";s:14:"prepayment.tpl";s:5:"class";s:14:"prepayment.php";s:5:"table";s:0:"";s:4:"hide";s:1:"0";s:21:"additionaldescription";s:108:"Sie zahlen einfach vorab und erhalten die Ware bequem und günstig bei Zahlungseingang nach Hause geliefert.";s:13:"debit_percent";s:1:"0";s:9:"surcharge";s:1:"0";s:15:"surchargestring";s:0:"";s:8:"position";s:1:"1";s:6:"active";s:1:"1";s:9:"esdactive";s:1:"0";s:11:"embediframe";s:0:"";s:12:"hideprospect";s:1:"0";s:6:"action";N;s:8:"pluginID";N;s:6:"source";N;s:15:"mobile_inactive";s:1:"0";s:10:"validation";a:0:{}}s:10:"charge_vat";b:1;s:8:"show_net";b:1;}s:9:"sTaxRates";a:1:{s:5:"19.00";d:5.0800000000000001;}s:14:"sShippingCosts";s:8:"3,90 EUR";s:7:"sAmount";s:9:"31,85 EUR";s:14:"sAmountNumeric";d:31.850000000000001;s:10:"sAmountNet";s:9:"26,77 EUR";s:17:"sAmountNetNumeric";d:26.77;s:12:"sOrderNumber";i:20003;s:9:"sOrderDay";s:10:"07.08.2017";s:10:"sOrderTime";s:5:"14:09";s:8:"sComment";s:0:"";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}s:9:"sCurrency";s:3:"EUR";s:9:"sLanguage";i:1;s:8:"sSubShop";i:1;s:4:"sEsd";N;s:4:"sNet";b:0;s:13:"sPaymentTable";a:0:{}s:9:"sDispatch";a:10:{s:2:"id";s:1:"9";s:4:"name";s:16:"Standard Versand";s:11:"description";s:0:"";s:11:"calculation";s:1:"1";s:11:"status_link";s:0:"";s:21:"surcharge_calculation";s:1:"3";s:17:"bind_shippingfree";s:1:"0";s:12:"shippingfree";N;s:15:"tax_calculation";s:1:"0";s:21:"tax_calculation_value";N;}}' WHERE `s_core_config_mails`.`name` = 'sORDER' AND `s_core_config_mails`.`dirty` = 0 AND `content` LIKE '%Informationen zu Ihrer Bestellung%'; EOD; @@ -310,7 +309,7 @@ private function updateEmailTemplates() {if $sComment}

        {$sComment}


        {/if} - + {include file="string:{config name=emailfooterhtml}"}
        ',`ishtml` = 1,`attachment` = '',`mailtype` = 2,`context` = 'a:4:{s:5:"sName";s:11:"Peter Meyer";s:8:"sArticle";s:10:"Blumenvase";s:5:"sLink";s:31:"http://shopware.example/test123";s:8:"sComment";s:36:"Hey Peter - das musst du dir ansehen";}' WHERE `s_core_config_mails`.`name` = 'sTELLAFRIEND' AND `s_core_config_mails`.`dirty` = 0 AND `content` LIKE '%dass Sie sich anschauen sollten%'; @@ -418,7 +417,7 @@ private function updateEmailTemplates() UPDATE `s_core_config_mails` SET `frommail` = '{config name=mail}',`fromname` = '{config name=shopName}',`subject` = 'Ihre abgebrochene Bestellung - Jetzt Feedback geben und Gutschein kassieren',`content` = '{include file="string:{config name=emailheaderplain}"} Hallo, - + Sie haben vor kurzem Ihre Bestellung auf {$sShop} nicht bis zum Ende durchgeführt - wir sind stets bemüht unseren Kunden das Einkaufen in unserem Shop so angenehm wie möglich zu machen und würden deshalb gerne wissen, woran Ihr Einkauf bei uns gescheitert ist. Bitte lassen Sie uns doch den Grund für Ihren Bestellabbruch zukommen, Ihren Aufwand entschädigen wir Ihnen in jedem Fall mit einem 5,00 € Gutschein. Vielen Dank für Ihre Unterstützung. @@ -439,7 +438,7 @@ private function updateEmailTemplates() UPDATE `s_core_config_mails` SET `frommail` = '{config name=mail}',`fromname` = '{config name=shopName}',`subject` = 'Ihre abgebrochene Bestellung - Gutschein-Code anbei',`content` = '{include file="string:{config name=emailheaderplain}"} Hallo, - + Sie haben vor kurzem Ihre Bestellung bei {$sShop} nicht bis zum Ende durchgeführt - wir möchten Ihnen heute einen {if $sVoucherpercental == "1"}{$sVouchervalue} %{else}{$sVouchervalue|currency|unescape:"htmlall"}{/if} Gutschein zukommen lassen - und Ihnen hiermit die Bestell-Entscheidung bei {$sShop} erleichtern. Ihr Gutschein ist 2 Monate gültig und kann mit dem Code "{$sVouchercode}" eingelöst werden. Wir würden uns freuen, Ihre Bestellung entgegen nehmen zu dürfen. {include file="string:{config name=emailfooterplain}"}',`contentHTML` = '
        @@ -451,7 +450,7 @@ private function updateEmailTemplates() Sie haben vor kurzem Ihre Bestellung bei {$sShop} nicht bis zum Ende durchgeführt - wir möchten Ihnen heute einen {if $sVoucherpercental == "1"}{$sVouchervalue} %{else}{$sVouchervalue|currency}{/if} Gutschein zukommen lassen - und Ihnen hiermit die Bestell-Entscheidung bei {$sShop} erleichtern. Ihr Gutschein ist 2 Monate gültig und kann mit dem Code "{$sVouchercode}" eingelöst werden. Wir würden uns freuen, Ihre Bestellung entgegen nehmen zu dürfen.

        {include file="string:{config name=emailfooterhtml}"} -
        ',`ishtml` = 1,`attachment` = '',`mailtype` = 2,`context` = 'a:5:{s:12:"sVouchercode";s:8:"23A7BCA4";s:13:"sVouchervalue";i:15;s:15:"sVouchervalidto";N;s:17:"sVouchervalidfrom";N;s:17:"sVoucherpercental";i:0;}' +
        ',`ishtml` = 1,`attachment` = '',`mailtype` = 2,`context` = 'a:5:{s:12:"sVouchercode";s:8:"23A7BCA4";s:13:"sVouchervalue";i:15;s:15:"sVouchervalidto";N;s:17:"sVouchervalidfrom";N;s:17:"sVoucherpercental";i:0;}' WHERE `s_core_config_mails`.`name` = 'sCANCELEDVOUCHER' AND `s_core_config_mails`.`dirty` = 0 AND `content` LIKE '%Ihnen hiermit die Bestell-Entscheidung%'; EOD; @@ -773,7 +772,7 @@ private function updateEmailTemplates() Artikelname Bestand/Mindestbestand - + {foreach from=$sJob.articles item=sArticle key=key} {$sArticle.ordernumber} @@ -876,7 +875,7 @@ private function updateEmailTemplates() {$sOrdernumber}

        {include file="string:{config name=emailfooterhtml}"} -
        ',`ishtml` = 1,`attachment` = '',`mailtype` = 2,`context` = 'a:3:{s:12:"sArticleLink";s:70:"http://shopware.example/genusswelten/koestlichkeiten/272/spachtelmasse";s:12:"sOrdernumber";s:7:"SW10239";s:5:"sData";N;}' +
        ',`ishtml` = 1,`attachment` = '',`mailtype` = 2,`context` = 'a:3:{s:12:"sArticleLink";s:70:"http://shopware.example/genusswelten/koestlichkeiten/272/spachtelmasse";s:12:"sOrdernumber";s:7:"SW10239";s:5:"sData";N;}' WHERE `s_core_config_mails`.`name` = 'sARTICLEAVAILABLE' AND `s_core_config_mails`.`dirty` = 0 AND `content` LIKE '%Ihr Artikel mit der Bestellnummer%'; EOD; @@ -1102,7 +1101,7 @@ private function updateEmailTemplates() {/foreach} -

        +


        Versandkosten: {$sOrder.invoice_shipping|string_format:"%.2f"} {$sOrder.currency}
        Netto-Gesamt: {$sOrder.invoice_amount_net|string_format:"%.2f"} {$sOrder.currency}
        @@ -1186,7 +1185,7 @@ private function updateEmailTemplates() Den aktuellen Status Ihrer Bestellung können Sie auch jederzeit auf unserer Webseite im Bereich "Mein Konto" - "Meine Bestellungen" abrufen. Sollten Sie allerdings den Kauf ohne Registrierung, also ohne Anlage eines Kundenkontos, gewählt haben, steht Ihnen diese Möglichkeit nicht zur Verfügung.

        {include file="string:{config name=emailfooterhtml}"} -
        ',`ishtml` = 1,`attachment` = '',`mailtype` = 3,`context` = 'a:4:{s:6:"sOrder";a:40:{s:7:"orderID";s:2:"59";s:11:"ordernumber";s:5:"20003";s:12:"order_number";s:5:"20003";s:6:"userID";s:1:"3";s:10:"customerID";s:1:"3";s:14:"invoice_amount";s:5:"31.85";s:18:"invoice_amount_net";s:5:"26.77";s:16:"invoice_shipping";s:3:"3.9";s:20:"invoice_shipping_net";s:4:"3.28";s:9:"ordertime";s:19:"2017-08-07 14:09:26";s:6:"status";s:1:"6";s:8:"statusID";s:1:"6";s:7:"cleared";s:2:"17";s:9:"clearedID";s:2:"17";s:9:"paymentID";s:1:"5";s:13:"transactionID";s:0:"";s:7:"comment";s:0:"";s:15:"customercomment";s:0:"";s:3:"net";s:1:"0";s:5:"netto";s:1:"0";s:9:"partnerID";s:0:"";s:11:"temporaryID";s:0:"";s:7:"referer";s:0:"";s:11:"cleareddate";N;s:12:"cleared_date";N;s:12:"trackingcode";s:0:"";s:8:"language";s:1:"1";s:8:"currency";s:3:"EUR";s:14:"currencyFactor";s:1:"1";s:9:"subshopID";s:1:"1";s:10:"dispatchID";s:1:"9";s:10:"currencyID";s:1:"1";s:12:"cleared_name";s:4:"open";s:19:"cleared_description";s:5:"Offen";s:11:"status_name";s:19:"partially_delivered";s:18:"status_description";s:22:"Teilweise ausgeliefert";s:19:"payment_description";s:8:"Vorkasse";s:20:"dispatch_description";s:16:"Standard Versand";s:20:"currency_description";s:4:"Euro";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}s:13:"sOrderDetails";a:2:{i:0;a:20:{s:14:"orderdetailsID";s:3:"208";s:7:"orderID";s:2:"59";s:11:"ordernumber";s:5:"20003";s:9:"articleID";s:3:"152";s:18:"articleordernumber";s:9:"SW10152.1";s:5:"price";s:5:"29.95";s:8:"quantity";s:1:"1";s:7:"invoice";s:5:"29.95";s:4:"name";s:31:"WINDSTOPPER MÜTZE WARM Schwarz";s:6:"status";s:1:"0";s:7:"shipped";s:1:"0";s:12:"shippedgroup";s:1:"0";s:11:"releasedate";s:10:"0000-00-00";s:5:"modus";s:1:"0";s:10:"esdarticle";s:1:"0";s:5:"taxID";s:1:"1";s:3:"tax";s:5:"19.00";s:8:"tax_rate";s:2:"19";s:3:"esd";s:1:"0";s:10:"attributes";a:6:{s:10:"attribute1";s:0:"";s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}i:1;a:20:{s:14:"orderdetailsID";s:3:"209";s:7:"orderID";s:2:"59";s:11:"ordernumber";s:5:"20003";s:9:"articleID";s:1:"0";s:18:"articleordernumber";s:16:"SHIPPINGDISCOUNT";s:5:"price";s:2:"-2";s:8:"quantity";s:1:"1";s:7:"invoice";s:2:"-2";s:4:"name";s:15:"Warenkorbrabatt";s:6:"status";s:1:"0";s:7:"shipped";s:1:"0";s:12:"shippedgroup";s:1:"0";s:11:"releasedate";s:10:"0000-00-00";s:5:"modus";s:1:"4";s:10:"esdarticle";s:1:"0";s:5:"taxID";s:1:"0";s:3:"tax";N;s:8:"tax_rate";s:2:"19";s:3:"esd";s:1:"0";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}}s:5:"sUser";a:82:{s:15:"billing_company";s:0:"";s:18:"billing_department";s:0:"";s:18:"billing_salutation";s:2:"mr";s:14:"customernumber";s:5:"20005";s:17:"billing_firstname";s:3:"Max";s:16:"billing_lastname";s:10:"Mustermann";s:14:"billing_street";s:15:"Musterstraße 1";s:32:"billing_additional_address_line1";s:0:"";s:32:"billing_additional_address_line2";s:0:"";s:15:"billing_zipcode";s:5:"12345";s:12:"billing_city";s:11:"Musterstadt";s:5:"phone";s:0:"";s:13:"billing_phone";s:0:"";s:17:"billing_countryID";s:1:"2";s:15:"billing_stateID";N;s:15:"billing_country";s:11:"Deutschland";s:18:"billing_countryiso";s:2:"DE";s:19:"billing_countryarea";s:11:"deutschland";s:17:"billing_countryen";s:7:"GERMANY";s:5:"ustid";s:0:"";s:13:"billing_text1";N;s:13:"billing_text2";N;s:13:"billing_text3";N;s:13:"billing_text4";N;s:13:"billing_text5";N;s:13:"billing_text6";N;s:7:"orderID";s:2:"59";s:16:"shipping_company";s:0:"";s:19:"shipping_department";s:0:"";s:19:"shipping_salutation";s:2:"mr";s:18:"shipping_firstname";s:3:"Max";s:17:"shipping_lastname";s:10:"Mustermann";s:15:"shipping_street";s:15:"Musterstraße 1";s:33:"shipping_additional_address_line1";s:0:"";s:33:"shipping_additional_address_line2";s:0:"";s:16:"shipping_zipcode";s:5:"12345";s:13:"shipping_city";s:11:"Musterstadt";s:16:"shipping_stateID";N;s:18:"shipping_countryID";s:1:"2";s:16:"shipping_country";s:11:"Deutschland";s:19:"shipping_countryiso";s:2:"DE";s:20:"shipping_countryarea";s:11:"deutschland";s:18:"shipping_countryen";s:7:"GERMANY";s:14:"shipping_text1";N;s:14:"shipping_text2";N;s:14:"shipping_text3";N;s:14:"shipping_text4";N;s:14:"shipping_text5";N;s:14:"shipping_text6";N;s:2:"id";s:1:"3";s:8:"password";s:60:"$2y$10$AzjwzOob83DJ2LG6yxXcBeghK9ciBB1zsK3UeBZADZCl10pTQN62W";s:7:"encoder";s:6:"bcrypt";s:5:"email";s:14:"xy@example.org";s:6:"active";s:1:"1";s:11:"accountmode";s:1:"0";s:15:"confirmationkey";s:0:"";s:9:"paymentID";s:1:"5";s:10:"firstlogin";s:10:"2017-08-07";s:9:"lastlogin";s:19:"2017-08-07 14:09:26";s:9:"sessionID";s:26:"hkkhfl82i1jejfvd2f0ucr6om4";s:10:"newsletter";s:1:"0";s:10:"validation";s:0:"";s:9:"affiliate";s:1:"0";s:13:"customergroup";s:2:"EK";s:13:"paymentpreset";s:1:"0";s:8:"language";s:1:"1";s:9:"subshopID";s:1:"1";s:7:"referer";s:0:"";s:12:"pricegroupID";N;s:15:"internalcomment";s:0:"";s:12:"failedlogins";s:1:"0";s:11:"lockeduntil";N;s:26:"default_billing_address_id";s:1:"5";s:27:"default_shipping_address_id";s:1:"5";s:5:"title";N;s:10:"salutation";s:2:"mr";s:9:"firstname";s:3:"Max";s:8:"lastname";s:10:"Mustermann";s:8:"birthday";N;s:11:"login_token";s:38:"1239c089-6b2f-4461-9134-c02026970bff.1";s:11:"preisgruppe";s:1:"1";s:11:"billing_net";s:1:"1";}s:9:"sDispatch";a:2:{s:4:"name";s:16:"Standard Versand";s:11:"description";s:0:"";}}' +',`ishtml` = 1,`attachment` = '',`mailtype` = 3,`context` = 'a:4:{s:6:"sOrder";a:40:{s:7:"orderID";s:2:"59";s:11:"ordernumber";s:5:"20003";s:12:"order_number";s:5:"20003";s:6:"userID";s:1:"3";s:10:"customerID";s:1:"3";s:14:"invoice_amount";s:5:"31.85";s:18:"invoice_amount_net";s:5:"26.77";s:16:"invoice_shipping";s:3:"3.9";s:20:"invoice_shipping_net";s:4:"3.28";s:9:"ordertime";s:19:"2017-08-07 14:09:26";s:6:"status";s:1:"6";s:8:"statusID";s:1:"6";s:7:"cleared";s:2:"17";s:9:"clearedID";s:2:"17";s:9:"paymentID";s:1:"5";s:13:"transactionID";s:0:"";s:7:"comment";s:0:"";s:15:"customercomment";s:0:"";s:3:"net";s:1:"0";s:5:"netto";s:1:"0";s:9:"partnerID";s:0:"";s:11:"temporaryID";s:0:"";s:7:"referer";s:0:"";s:11:"cleareddate";N;s:12:"cleared_date";N;s:12:"trackingcode";s:0:"";s:8:"language";s:1:"1";s:8:"currency";s:3:"EUR";s:14:"currencyFactor";s:1:"1";s:9:"subshopID";s:1:"1";s:10:"dispatchID";s:1:"9";s:10:"currencyID";s:1:"1";s:12:"cleared_name";s:4:"open";s:19:"cleared_description";s:5:"Offen";s:11:"status_name";s:19:"partially_delivered";s:18:"status_description";s:22:"Teilweise ausgeliefert";s:19:"payment_description";s:8:"Vorkasse";s:20:"dispatch_description";s:16:"Standard Versand";s:20:"currency_description";s:4:"Euro";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}s:13:"sOrderDetails";a:2:{i:0;a:20:{s:14:"orderdetailsID";s:3:"208";s:7:"orderID";s:2:"59";s:11:"ordernumber";s:5:"20003";s:9:"articleID";s:3:"152";s:18:"articleordernumber";s:9:"SW10152.1";s:5:"price";s:5:"29.95";s:8:"quantity";s:1:"1";s:7:"invoice";s:5:"29.95";s:4:"name";s:31:"WINDSTOPPER MÜTZE WARM Schwarz";s:6:"status";s:1:"0";s:7:"shipped";s:1:"0";s:12:"shippedgroup";s:1:"0";s:11:"releasedate";s:10:"0000-00-00";s:5:"modus";s:1:"0";s:10:"esdarticle";s:1:"0";s:5:"taxID";s:1:"1";s:3:"tax";s:5:"19.00";s:8:"tax_rate";s:2:"19";s:3:"esd";s:1:"0";s:10:"attributes";a:6:{s:10:"attribute1";s:0:"";s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}i:1;a:20:{s:14:"orderdetailsID";s:3:"209";s:7:"orderID";s:2:"59";s:11:"ordernumber";s:5:"20003";s:9:"articleID";s:1:"0";s:18:"articleordernumber";s:16:"SHIPPINGDISCOUNT";s:5:"price";s:2:"-2";s:8:"quantity";s:1:"1";s:7:"invoice";s:2:"-2";s:4:"name";s:15:"Warenkorbrabatt";s:6:"status";s:1:"0";s:7:"shipped";s:1:"0";s:12:"shippedgroup";s:1:"0";s:11:"releasedate";s:10:"0000-00-00";s:5:"modus";s:1:"4";s:10:"esdarticle";s:1:"0";s:5:"taxID";s:1:"0";s:3:"tax";N;s:8:"tax_rate";s:2:"19";s:3:"esd";s:1:"0";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}}s:5:"sUser";a:82:{s:15:"billing_company";s:0:"";s:18:"billing_department";s:0:"";s:18:"billing_salutation";s:2:"mr";s:14:"customernumber";s:5:"20005";s:17:"billing_firstname";s:3:"Max";s:16:"billing_lastname";s:10:"Mustermann";s:14:"billing_street";s:15:"Musterstraße 1";s:32:"billing_additional_address_line1";s:0:"";s:32:"billing_additional_address_line2";s:0:"";s:15:"billing_zipcode";s:5:"12345";s:12:"billing_city";s:11:"Musterstadt";s:5:"phone";s:0:"";s:13:"billing_phone";s:0:"";s:17:"billing_countryID";s:1:"2";s:15:"billing_stateID";N;s:15:"billing_country";s:11:"Deutschland";s:18:"billing_countryiso";s:2:"DE";s:19:"billing_countryarea";s:11:"deutschland";s:17:"billing_countryen";s:7:"GERMANY";s:5:"ustid";s:0:"";s:13:"billing_text1";N;s:13:"billing_text2";N;s:13:"billing_text3";N;s:13:"billing_text4";N;s:13:"billing_text5";N;s:13:"billing_text6";N;s:7:"orderID";s:2:"59";s:16:"shipping_company";s:0:"";s:19:"shipping_department";s:0:"";s:19:"shipping_salutation";s:2:"mr";s:18:"shipping_firstname";s:3:"Max";s:17:"shipping_lastname";s:10:"Mustermann";s:15:"shipping_street";s:15:"Musterstraße 1";s:33:"shipping_additional_address_line1";s:0:"";s:33:"shipping_additional_address_line2";s:0:"";s:16:"shipping_zipcode";s:5:"12345";s:13:"shipping_city";s:11:"Musterstadt";s:16:"shipping_stateID";N;s:18:"shipping_countryID";s:1:"2";s:16:"shipping_country";s:11:"Deutschland";s:19:"shipping_countryiso";s:2:"DE";s:20:"shipping_countryarea";s:11:"deutschland";s:18:"shipping_countryen";s:7:"GERMANY";s:14:"shipping_text1";N;s:14:"shipping_text2";N;s:14:"shipping_text3";N;s:14:"shipping_text4";N;s:14:"shipping_text5";N;s:14:"shipping_text6";N;s:2:"id";s:1:"3";s:8:"password";s:60:"$2y$10$AzjwzOob83DJ2LG6yxXcBeghK9ciBB1zsK3UeBZADZCl10pTQN62W";s:7:"encoder";s:6:"bcrypt";s:5:"email";s:14:"xy@example.org";s:6:"active";s:1:"1";s:11:"accountmode";s:1:"0";s:15:"confirmationkey";s:0:"";s:9:"paymentID";s:1:"5";s:10:"firstlogin";s:10:"2017-08-07";s:9:"lastlogin";s:19:"2017-08-07 14:09:26";s:9:"sessionID";s:26:"hkkhfl82i1jejfvd2f0ucr6om4";s:10:"newsletter";s:1:"0";s:10:"validation";s:0:"";s:9:"affiliate";s:1:"0";s:13:"customergroup";s:2:"EK";s:13:"paymentpreset";s:1:"0";s:8:"language";s:1:"1";s:9:"subshopID";s:1:"1";s:7:"referer";s:0:"";s:12:"pricegroupID";N;s:15:"internalcomment";s:0:"";s:12:"failedlogins";s:1:"0";s:11:"lockeduntil";N;s:26:"default_billing_address_id";s:1:"5";s:27:"default_shipping_address_id";s:1:"5";s:5:"title";N;s:10:"salutation";s:2:"mr";s:9:"firstname";s:3:"Max";s:8:"lastname";s:10:"Mustermann";s:8:"birthday";N;s:11:"login_token";s:38:"1239c089-6b2f-4461-9134-c02026970bff.1";s:11:"preisgruppe";s:1:"1";s:11:"billing_net";s:1:"1";}s:9:"sDispatch";a:2:{s:4:"name";s:16:"Standard Versand";s:11:"description";s:0:"";}}' WHERE `s_core_config_mails`.`name` = 'sORDERSTATEMAIL6' AND `s_core_config_mails`.`dirty` = 0 AND `content` LIKE '%Bestellstatus für Ihre Bestellung%'; EOD; @@ -1219,9 +1218,9 @@ private function updateEmailTemplates() UPDATE `s_core_config_mails` SET `frommail` = '{config name=mail}',`fromname` = '{config name=shopName}',`subject` = 'Herzlichen Glückwunsch zum Geburtstag von {config name=shopName}',`content` = '{include file="string:{config name=emailheaderplain}"} Hallo {$sUser.salutation|salutation} {$sUser.lastname}, - + Alles Gute zum Geburtstag. Zu Ihrem persönlichen Jubiläum haben wir uns etwas Besonderes ausgedacht, wir senden Ihnen hiermit einen Geburtstagscode über {if $sVoucher.value}{$sVoucher.value|currency|unescape:"htmlall"}{else}{$sVoucher.percental} %{/if}, den Sie bei Ihrer nächsten Bestellung in unserem Online-Shop: {$sShopURL} ganz einfach einlösen können. - + Ihr persönlicher Geburtstags-Code lautet: {$sVoucher.code} {if $sVoucher.valid_from && $sVoucher.valid_to}Dieser Code ist gültig vom {$sVoucher.valid_from|date_format:"%d.%m.%Y"} bis zum {$sVoucher.valid_to|date_format:"%d.%m.%Y"}.{/if} {if $sVoucher.valid_from && !$sVoucher.valid_to}Dieser Code ist gültig ab dem {$sVoucher.valid_from|date_format:"%d.%m.%Y"}.{/if} @@ -1238,9 +1237,9 @@ private function updateEmailTemplates() {if $sVoucher.valid_from && !$sVoucher.valid_to}Dieser Code ist gültig ab dem {$sVoucher.valid_from|date_format:"%d.%m.%Y"}.{/if} {if !$sVoucher.valid_from && $sVoucher.valid_to}Dieser Code ist gültig bis zum {$sVoucher.valid_to|date_format:"%d.%m.%Y"}.{/if}

        - + {include file="string:{config name=emailfooterhtml}"} -',`ishtml` = 1,`attachment` = '',`mailtype` = 2,`context` = 'a:3:{s:5:"sUser";a:28:{s:6:"userID";s:1:"1";s:7:"company";s:11:"Muster GmbH";s:10:"department";N;s:10:"salutation";s:2:"mr";s:14:"customernumber";s:5:"20001";s:9:"firstname";s:3:"Max";s:8:"lastname";s:10:"Mustermann";s:6:"street";s:13:"Musterstr. 55";s:7:"zipcode";s:5:"55555";s:4:"city";s:12:"Musterhausen";s:5:"phone";s:14:"05555 / 555555";s:9:"countryID";s:1:"2";s:5:"ustid";N;s:5:"text1";N;s:5:"text2";N;s:5:"text3";N;s:5:"text4";N;s:5:"text5";N;s:5:"text6";N;s:5:"email";s:16:"test@example.com";s:9:"paymentID";s:1:"5";s:10:"firstlogin";s:10:"2011-11-23";s:9:"lastlogin";s:19:"2012-01-04 14:12:05";s:10:"newsletter";s:1:"0";s:9:"affiliate";s:1:"0";s:13:"customergroup";s:2:"EK";s:8:"language";s:1:"1";s:9:"subshopID";s:1:"1";}s:8:"sVoucher";a:6:{s:13:"vouchercodeID";s:3:"201";s:4:"code";s:8:"0B818118";s:5:"value";s:1:"5";s:9:"percental";s:1:"0";s:8:"valid_to";s:10:"2017-12-31";s:10:"valid_from";s:10:"2017-10-22";}s:5:"sData";N;}' +',`ishtml` = 1,`attachment` = '',`mailtype` = 2,`context` = 'a:3:{s:5:"sUser";a:28:{s:6:"userID";s:1:"1";s:7:"company";s:11:"Muster GmbH";s:10:"department";N;s:10:"salutation";s:2:"mr";s:14:"customernumber";s:5:"20001";s:9:"firstname";s:3:"Max";s:8:"lastname";s:10:"Mustermann";s:6:"street";s:13:"Musterstr. 55";s:7:"zipcode";s:5:"55555";s:4:"city";s:12:"Musterhausen";s:5:"phone";s:14:"05555 / 555555";s:9:"countryID";s:1:"2";s:5:"ustid";N;s:5:"text1";N;s:5:"text2";N;s:5:"text3";N;s:5:"text4";N;s:5:"text5";N;s:5:"text6";N;s:5:"email";s:16:"test@example.com";s:9:"paymentID";s:1:"5";s:10:"firstlogin";s:10:"2011-11-23";s:9:"lastlogin";s:19:"2012-01-04 14:12:05";s:10:"newsletter";s:1:"0";s:9:"affiliate";s:1:"0";s:13:"customergroup";s:2:"EK";s:8:"language";s:1:"1";s:9:"subshopID";s:1:"1";}s:8:"sVoucher";a:6:{s:13:"vouchercodeID";s:3:"201";s:4:"code";s:8:"0B818118";s:5:"value";s:1:"5";s:9:"percental";s:1:"0";s:8:"valid_to";s:10:"2017-12-31";s:10:"valid_from";s:10:"2017-10-22";}s:5:"sData";N;}' WHERE `s_core_config_mails`.`name` = 'sBIRTHDAY' AND `s_core_config_mails`.`dirty` = 0 AND `content` LIKE '%Ihnen alles Gute zum Geburtstag.%'; EOD; @@ -1450,7 +1449,7 @@ private function updateEmailTemplates() {$details.amount|padding:8|currency} {/foreach} - +

        @@ -1558,7 +1557,7 @@ private function updateEmailTemplates() {if $sComment}

        {$sComment}


        {/if} - + {include file="string:{config name=emailfooterhtml}"} ',`ishtml` = 1,`attachment` = '',`mailtype` = 2, `context` = 'a:5:{s:7:"sConfig";a:0:{}s:5:"sName";s:8:"John Doe";s:8:"sArticle";s:11:"Elastic Cap";s:5:"sLink";s:39:"http://shopware.example/elastic-cap-153";s:8:"sComment";s:26:"Hey Jane - this is amazing";}' @@ -1570,7 +1569,7 @@ private function updateEmailTemplates() Hello, -there is no additional free serial numbers available for the article +there is no additional free serial numbers available for the article {$sArticleName}. @@ -1943,7 +1942,7 @@ private function updateEmailTemplates() {include file="string:{config name=emailfooterhtml}"} ',`ishtml` = 1,`attachment` = '',`mailtype` = 3, `context` = 'a:4:{s:6:"sOrder";a:40:{s:7:"orderID";s:2:"62";s:11:"ordernumber";s:5:"20004";s:12:"order_number";s:5:"20004";s:6:"userID";s:1:"4";s:10:"customerID";s:1:"4";s:14:"invoice_amount";s:5:"16.85";s:18:"invoice_amount_net";s:5:"14.16";s:16:"invoice_shipping";s:3:"3.9";s:20:"invoice_shipping_net";s:4:"3.28";s:9:"ordertime";s:19:"2017-10-30 08:49:06";s:6:"status";s:1:"0";s:8:"statusID";s:1:"0";s:7:"cleared";s:2:"17";s:9:"clearedID";s:2:"17";s:9:"paymentID";s:1:"5";s:13:"transactionID";s:0:"";s:7:"comment";s:0:"";s:15:"customercomment";s:0:"";s:3:"net";s:1:"0";s:5:"netto";s:1:"0";s:9:"partnerID";s:0:"";s:11:"temporaryID";s:0:"";s:7:"referer";s:0:"";s:11:"cleareddate";N;s:12:"cleared_date";N;s:12:"trackingcode";s:0:"";s:8:"language";s:1:"1";s:8:"currency";s:3:"EUR";s:14:"currencyFactor";s:1:"1";s:9:"subshopID";s:1:"1";s:10:"dispatchID";s:1:"9";s:10:"currencyID";s:1:"1";s:12:"cleared_name";s:4:"open";s:19:"cleared_description";s:4:"Open";s:11:"status_name";s:4:"open";s:18:"status_description";s:4:"Open";s:19:"payment_description";s:18:"Payment in advance";s:20:"dispatch_description";s:17:"Standard delivery";s:20:"currency_description";s:4:"Euro";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}s:13:"sOrderDetails";a:2:{i:0;a:20:{s:14:"orderdetailsID";s:3:"214";s:7:"orderID";s:2:"62";s:11:"ordernumber";s:5:"20004";s:9:"articleID";s:3:"153";s:18:"articleordernumber";s:7:"SW10153";s:5:"price";s:5:"14.95";s:8:"quantity";s:1:"1";s:7:"invoice";s:5:"14.95";s:4:"name";s:11:"ELASTIC CAP";s:6:"status";s:1:"0";s:7:"shipped";s:1:"0";s:12:"shippedgroup";s:1:"0";s:11:"releasedate";s:10:"0000-00-00";s:5:"modus";s:1:"0";s:10:"esdarticle";s:1:"0";s:5:"taxID";s:1:"1";s:3:"tax";s:5:"19.00";s:8:"tax_rate";s:2:"19";s:3:"esd";s:1:"0";s:10:"attributes";a:6:{s:10:"attribute1";s:0:"";s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}i:1;a:20:{s:14:"orderdetailsID";s:3:"215";s:7:"orderID";s:2:"62";s:11:"ordernumber";s:5:"20004";s:9:"articleID";s:1:"0";s:18:"articleordernumber";s:16:"SHIPPINGDISCOUNT";s:5:"price";s:2:"-2";s:8:"quantity";s:1:"1";s:7:"invoice";s:2:"-2";s:4:"name";s:15:"Warenkorbrabatt";s:6:"status";s:1:"0";s:7:"shipped";s:1:"0";s:12:"shippedgroup";s:1:"0";s:11:"releasedate";s:10:"0000-00-00";s:5:"modus";s:1:"4";s:10:"esdarticle";s:1:"0";s:5:"taxID";s:1:"0";s:3:"tax";N;s:8:"tax_rate";s:2:"19";s:3:"esd";s:1:"0";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}}s:5:"sUser";a:82:{s:15:"billing_company";s:0:"";s:18:"billing_department";s:0:"";s:18:"billing_salutation";s:2:"mr";s:14:"customernumber";s:5:"20006";s:17:"billing_firstname";s:4:"John";s:16:"billing_lastname";s:3:"Doe";s:14:"billing_street";s:16:"Examplestreet 11";s:32:"billing_additional_address_line1";s:0:"";s:32:"billing_additional_address_line2";s:0:"";s:15:"billing_zipcode";s:4:"1234";s:12:"billing_city";s:11:"Examplecity";s:5:"phone";s:0:"";s:13:"billing_phone";s:0:"";s:17:"billing_countryID";s:1:"2";s:15:"billing_stateID";N;s:15:"billing_country";s:7:"Germany";s:18:"billing_countryiso";s:2:"DE";s:19:"billing_countryarea";s:7:"germany";s:17:"billing_countryen";s:7:"GERMANY";s:5:"ustid";s:0:"";s:13:"billing_text1";N;s:13:"billing_text2";N;s:13:"billing_text3";N;s:13:"billing_text4";N;s:13:"billing_text5";N;s:13:"billing_text6";N;s:7:"orderID";s:2:"62";s:16:"shipping_company";s:0:"";s:19:"shipping_department";s:0:"";s:19:"shipping_salutation";s:2:"mr";s:18:"shipping_firstname";s:4:"John";s:17:"shipping_lastname";s:3:"Doe";s:15:"shipping_street";s:16:"Examplestreet 11";s:33:"shipping_additional_address_line1";s:0:"";s:33:"shipping_additional_address_line2";s:0:"";s:16:"shipping_zipcode";s:4:"1234";s:13:"shipping_city";s:11:"Examplecity";s:16:"shipping_stateID";N;s:18:"shipping_countryID";s:1:"2";s:16:"shipping_country";s:7:"Germany";s:19:"shipping_countryiso";s:2:"DE";s:20:"shipping_countryarea";s:7:"germany";s:18:"shipping_countryen";s:7:"GERMANY";s:14:"shipping_text1";N;s:14:"shipping_text2";N;s:14:"shipping_text3";N;s:14:"shipping_text4";N;s:14:"shipping_text5";N;s:14:"shipping_text6";N;s:2:"id";s:1:"4";s:8:"password";s:60:"$2y$10$qcu486mGUDZ/qbUSJDi78uYwatm24dzQ/dCO79PVVP0MbGHJ0LLgq";s:7:"encoder";s:6:"bcrypt";s:5:"email";s:12:"xyz@mail.com";s:6:"active";s:1:"1";s:11:"accountmode";s:1:"0";s:15:"confirmationkey";s:0:"";s:9:"paymentID";s:1:"5";s:10:"firstlogin";s:10:"2017-10-30";s:9:"lastlogin";s:19:"2017-10-30 08:49:06";s:9:"sessionID";s:26:"e6b7aaevs8nvaobuejg2o3gpt4";s:10:"newsletter";s:1:"0";s:10:"validation";s:0:"";s:9:"affiliate";s:1:"0";s:13:"customergroup";s:2:"EK";s:13:"paymentpreset";s:1:"0";s:8:"language";s:1:"1";s:9:"subshopID";s:1:"1";s:7:"referer";s:0:"";s:12:"pricegroupID";N;s:15:"internalcomment";s:0:"";s:12:"failedlogins";s:1:"0";s:11:"lockeduntil";N;s:26:"default_billing_address_id";s:1:"6";s:27:"default_shipping_address_id";s:1:"6";s:5:"title";N;s:10:"salutation";s:2:"mr";s:9:"firstname";s:4:"John";s:8:"lastname";s:3:"Doe";s:8:"birthday";N;s:11:"login_token";s:38:"62c86dd9-a98d-46e7-9a85-612afff5cb7f.1";s:11:"preisgruppe";s:1:"1";s:11:"billing_net";s:1:"1";}s:9:"sDispatch";a:2:{s:4:"name";s:17:"Standard delivery";s:11:"description";s:0:"";}}' -WHERE `s_core_config_mails`.`name` = 'sORDERSTATEMAIL17' AND `dirty` = 0 AND `content` LIKE '%But in case you have purchased without a registration or a customer account, you do not have this option.%'; +WHERE `s_core_config_mails`.`name` = 'sORDERSTATEMAIL17' AND `dirty` = 0 AND `content` LIKE '%But in case you have purchased without a registration or a customer account, you do not have this option.%'; EOD; $sql .= <<<'EOD' @@ -2029,7 +2028,7 @@ private function updateEmailTemplates() $sql .= <<<'EOD' UPDATE `s_core_config_mails` SET `frommail` = '{config name=mail}',`fromname` = '{config name=shopName}',`subject` = 'Stock level of {$sData.count} article{if $sData.count>1}s{/if} under minimum stock ',`content` = '{include file="string:{config name=emailheaderplain}"} - + Hello, the following articles have undershot the minimum stock: @@ -2053,7 +2052,7 @@ private function updateEmailTemplates() Name of article Stock/Minimum stock - + {foreach from=$sJob.articles item=sArticle key=key} {$sArticle.ordernumber} @@ -2146,7 +2145,7 @@ private function updateEmailTemplates() $sql .= <<<'EOD' UPDATE `s_core_config_mails` SET `frommail` = '{config name=mail}',`fromname` = '{config name=shopName}',`subject` = 'Your article is available again',`content` = '{include file="string:{config name=emailheaderplain}"} - + Hello, your article with the order number {$sOrdernumber} is available again. @@ -2413,7 +2412,7 @@ private function updateEmailTemplates() Net total: {$sOrder.invoice_amount_net|string_format:"%.2f"} {$sOrder.currency}
        Total amount incl. VAT: {$sOrder.invoice_amount|string_format:"%.2f"} {$sOrder.currency}

        - + You can check the current status of your order on our website under "My account" - "My orders" anytime. But in case you have purchased without a registration or a customer account, you do not have this option.

        {include file="string:{config name=emailfooterhtml}"} @@ -2639,7 +2638,7 @@ private function updateEmailTemplates() {include file="string:{config name=emailfooterhtml}"} ',`ishtml` = 1,`attachment` = '',`mailtype` = 2, `context` = 'a:4:{s:6:"sOrder";a:40:{s:7:"orderID";s:2:"66";s:11:"ordernumber";s:5:"20006";s:12:"order_number";s:5:"20006";s:6:"userID";s:1:"4";s:10:"customerID";s:1:"4";s:14:"invoice_amount";s:5:"701.4";s:18:"invoice_amount_net";s:6:"589.42";s:16:"invoice_shipping";s:3:"3.9";s:20:"invoice_shipping_net";s:4:"3.28";s:9:"ordertime";s:19:"2017-10-29 10:00:08";s:6:"status";s:1:"2";s:8:"statusID";s:1:"2";s:7:"cleared";s:2:"12";s:9:"clearedID";s:2:"12";s:9:"paymentID";s:1:"5";s:13:"transactionID";s:0:"";s:7:"comment";s:0:"";s:15:"customercomment";s:0:"";s:3:"net";s:1:"0";s:5:"netto";s:1:"0";s:9:"partnerID";s:0:"";s:11:"temporaryID";s:0:"";s:7:"referer";s:0:"";s:11:"cleareddate";N;s:12:"cleared_date";N;s:12:"trackingcode";s:0:"";s:8:"language";s:1:"1";s:8:"currency";s:3:"EUR";s:14:"currencyFactor";s:1:"1";s:9:"subshopID";s:1:"1";s:10:"dispatchID";s:1:"9";s:10:"currencyID";s:1:"1";s:12:"cleared_name";s:15:"completely_paid";s:19:"cleared_description";s:15:"Completely paid";s:11:"status_name";s:9:"completed";s:18:"status_description";s:9:"Completed";s:19:"payment_description";s:18:"Payment in advance";s:20:"dispatch_description";s:17:"Standard delivery";s:20:"currency_description";s:4:"Euro";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}s:13:"sOrderDetails";a:2:{i:0;a:20:{s:14:"orderdetailsID";s:3:"222";s:7:"orderID";s:2:"66";s:11:"ordernumber";s:5:"20006";s:9:"articleID";s:3:"166";s:18:"articleordernumber";s:7:"SW10166";s:5:"price";s:5:"69.95";s:8:"quantity";s:2:"10";s:7:"invoice";s:5:"699.5";s:4:"name";s:12:"DIE ZEIT 100";s:6:"status";s:1:"0";s:7:"shipped";s:1:"0";s:12:"shippedgroup";s:1:"0";s:11:"releasedate";s:10:"0000-00-00";s:5:"modus";s:1:"0";s:10:"esdarticle";s:1:"0";s:5:"taxID";s:1:"1";s:3:"tax";s:5:"19.00";s:8:"tax_rate";s:2:"19";s:3:"esd";s:1:"0";s:10:"attributes";a:6:{s:10:"attribute1";s:0:"";s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}i:1;a:20:{s:14:"orderdetailsID";s:3:"223";s:7:"orderID";s:2:"66";s:11:"ordernumber";s:5:"20006";s:9:"articleID";s:1:"0";s:18:"articleordernumber";s:16:"SHIPPINGDISCOUNT";s:5:"price";s:2:"-2";s:8:"quantity";s:1:"1";s:7:"invoice";s:2:"-2";s:4:"name";s:15:"Warenkorbrabatt";s:6:"status";s:1:"0";s:7:"shipped";s:1:"0";s:12:"shippedgroup";s:1:"0";s:11:"releasedate";s:10:"0000-00-00";s:5:"modus";s:1:"4";s:10:"esdarticle";s:1:"0";s:5:"taxID";s:1:"0";s:3:"tax";N;s:8:"tax_rate";s:2:"19";s:3:"esd";s:1:"0";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}}s:5:"sUser";a:82:{s:15:"billing_company";s:0:"";s:18:"billing_department";s:0:"";s:18:"billing_salutation";s:2:"mr";s:14:"customernumber";s:5:"20006";s:17:"billing_firstname";s:4:"John";s:16:"billing_lastname";s:3:"Doe";s:14:"billing_street";s:16:"Examplestreet 11";s:32:"billing_additional_address_line1";s:0:"";s:32:"billing_additional_address_line2";s:0:"";s:15:"billing_zipcode";s:4:"1234";s:12:"billing_city";s:11:"Examplecity";s:5:"phone";s:0:"";s:13:"billing_phone";s:0:"";s:17:"billing_countryID";s:1:"2";s:15:"billing_stateID";N;s:15:"billing_country";s:7:"Germany";s:18:"billing_countryiso";s:2:"DE";s:19:"billing_countryarea";s:7:"germany";s:17:"billing_countryen";s:7:"GERMANY";s:5:"ustid";s:0:"";s:13:"billing_text1";N;s:13:"billing_text2";N;s:13:"billing_text3";N;s:13:"billing_text4";N;s:13:"billing_text5";N;s:13:"billing_text6";N;s:7:"orderID";s:2:"66";s:16:"shipping_company";s:0:"";s:19:"shipping_department";s:0:"";s:19:"shipping_salutation";s:2:"mr";s:18:"shipping_firstname";s:4:"John";s:17:"shipping_lastname";s:3:"Doe";s:15:"shipping_street";s:16:"Examplestreet 11";s:33:"shipping_additional_address_line1";s:0:"";s:33:"shipping_additional_address_line2";s:0:"";s:16:"shipping_zipcode";s:4:"1234";s:13:"shipping_city";s:11:"Examplecity";s:16:"shipping_stateID";N;s:18:"shipping_countryID";s:1:"2";s:16:"shipping_country";s:7:"Germany";s:19:"shipping_countryiso";s:2:"DE";s:20:"shipping_countryarea";s:7:"germany";s:18:"shipping_countryen";s:7:"GERMANY";s:14:"shipping_text1";N;s:14:"shipping_text2";N;s:14:"shipping_text3";N;s:14:"shipping_text4";N;s:14:"shipping_text5";N;s:14:"shipping_text6";N;s:2:"id";s:1:"4";s:8:"password";s:60:"$2y$10$qcu486mGUDZ/qbUSJDi78uYwatm24dzQ/dCO79PVVP0MbGHJ0LLgq";s:7:"encoder";s:6:"bcrypt";s:5:"email";s:12:"xyz@mail.com";s:6:"active";s:1:"1";s:11:"accountmode";s:1:"0";s:15:"confirmationkey";s:0:"";s:9:"paymentID";s:1:"5";s:10:"firstlogin";s:10:"2017-10-30";s:9:"lastlogin";s:19:"2017-10-30 12:02:18";s:9:"sessionID";s:26:"mpmqj6qoro0pg3ua9u5hprh646";s:10:"newsletter";s:1:"0";s:10:"validation";s:1:"0";s:9:"affiliate";s:1:"0";s:13:"customergroup";s:2:"EK";s:13:"paymentpreset";s:1:"0";s:8:"language";s:1:"1";s:9:"subshopID";s:1:"1";s:7:"referer";s:0:"";s:12:"pricegroupID";N;s:15:"internalcomment";s:0:"";s:12:"failedlogins";s:1:"0";s:11:"lockeduntil";N;s:26:"default_billing_address_id";s:1:"6";s:27:"default_shipping_address_id";s:1:"6";s:5:"title";s:0:"";s:10:"salutation";s:2:"mr";s:9:"firstname";s:4:"John";s:8:"lastname";s:3:"Doe";s:8:"birthday";s:10:"2017-10-30";s:11:"login_token";s:38:"1f6f51a1-54c1-4db8-8b4f-fbe957f8b856.1";s:11:"preisgruppe";s:1:"1";s:11:"billing_net";s:1:"1";}s:9:"sDispatch";a:2:{s:4:"name";s:17:"Standard delivery";s:11:"description";s:0:"";}}' -WHERE `s_core_config_mails`.`name` = 'sORDERDOCUMENTS' AND `dirty` = 0 AND `content` LIKE '%In the attachments of this E-Mail you will find the documents for your order in PDF format.%'; +WHERE `s_core_config_mails`.`name` = 'sORDERDOCUMENTS' AND `dirty` = 0 AND `content` LIKE '%In the attachments of this E-Mail you will find the documents for your order in PDF format.%'; EOD; // Move sORDERSEPAAUTHORIZATION to system mails diff --git a/_sql/migrations/962-add-ordernumber-form-field.php b/_sql/migrations/962-add-ordernumber-form-field.php index 24065ef2031..f9c8ed13dd7 100644 --- a/_sql/migrations/962-add-ordernumber-form-field.php +++ b/_sql/migrations/962-add-ordernumber-form-field.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class Migrations_Migration962 extends Shopware\Components\Migrations\AbstractMigration diff --git a/_sql/migrations/963-update-emotion-url-template.php b/_sql/migrations/963-update-emotion-url-template.php index ef10410988d..54e0b7bf742 100644 --- a/_sql/migrations/963-update-emotion-url-template.php +++ b/_sql/migrations/963-update-emotion-url-template.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/964-translate-slt-setting.php b/_sql/migrations/964-translate-slt-setting.php index 49600e896ad..5c37a62e38c 100644 --- a/_sql/migrations/964-translate-slt-setting.php +++ b/_sql/migrations/964-translate-slt-setting.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/965-add-album-garbage-collect-option.php b/_sql/migrations/965-add-album-garbage-collect-option.php index ac17f51ff04..60a52b4fdba 100644 --- a/_sql/migrations/965-add-album-garbage-collect-option.php +++ b/_sql/migrations/965-add-album-garbage-collect-option.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Shopware\Components\Migrations\AbstractMigration; diff --git a/_sql/migrations/common/AttributeTranslationMigrationHelper.php b/_sql/migrations/common/AttributeTranslationMigrationHelper.php index 5d54392df50..3807474c54b 100644 --- a/_sql/migrations/common/AttributeTranslationMigrationHelper.php +++ b/_sql/migrations/common/AttributeTranslationMigrationHelper.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/_sql/migrations/common/MigrationHelper.php b/_sql/migrations/common/MigrationHelper.php index a32430349ac..079606fb8af 100644 --- a/_sql/migrations/common/MigrationHelper.php +++ b/_sql/migrations/common/MigrationHelper.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ class MigrationHelper diff --git a/_sql/migrations/common/SitemapConfigMigrationHelper.php b/_sql/migrations/common/SitemapConfigMigrationHelper.php index a0684595dbe..6e43b652f9c 100644 --- a/_sql/migrations/common/SitemapConfigMigrationHelper.php +++ b/_sql/migrations/common/SitemapConfigMigrationHelper.php @@ -1,28 +1,26 @@ container->get('shopware.release'); $result['data'] = [ diff --git a/engine/Shopware/Controllers/Backend/Address.php b/engine/Shopware/Controllers/Backend/Address.php index d69d154ee75..ea08fcccd97 100644 --- a/engine/Shopware/Controllers/Backend/Address.php +++ b/engine/Shopware/Controllers/Backend/Address.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Doctrine\ORM\AbstractQuery; diff --git a/engine/Shopware/Controllers/Backend/Analytics.php b/engine/Shopware/Controllers/Backend/Analytics.php index 623fc8b17b1..13b8fcc9f8d 100644 --- a/engine/Shopware/Controllers/Backend/Analytics.php +++ b/engine/Shopware/Controllers/Backend/Analytics.php @@ -1,28 +1,26 @@ Request()->getParam('name'); - $config = $this->container->get(\Doctrine\DBAL\Connection::class)->fetchColumn( + $config = $this->container->get(Connection::class)->fetchColumn( 'SELECT config FROM s_core_auth_config WHERE user_id = :id AND `name` = :name', [':id' => $identity, ':name' => $name] ); @@ -46,9 +48,9 @@ public function saveAction() $config = $this->Request()->getParam('config'); - $this->container->get(\Doctrine\DBAL\Connection::class)->executeUpdate( - 'INSERT INTO s_core_auth_config (user_id, `name`, `config`) - VALUES (:id, :name, :config) + $this->container->get(Connection::class)->executeUpdate( + 'INSERT INTO s_core_auth_config (user_id, `name`, `config`) + VALUES (:id, :name, :config) ON DUPLICATE KEY UPDATE `config`= :config', [':id' => $identity, ':name' => $name, ':config' => $config] ); diff --git a/engine/Shopware/Controllers/Backend/UserManager.php b/engine/Shopware/Controllers/Backend/UserManager.php index cece69084d0..8c5599e6ee0 100644 --- a/engine/Shopware/Controllers/Backend/UserManager.php +++ b/engine/Shopware/Controllers/Backend/UserManager.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Doctrine\DBAL\Connection; diff --git a/engine/Shopware/Controllers/Backend/Vote.php b/engine/Shopware/Controllers/Backend/Vote.php index 6950eb54513..6f5412ab0b7 100644 --- a/engine/Shopware/Controllers/Backend/Vote.php +++ b/engine/Shopware/Controllers/Backend/Vote.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Doctrine\DBAL\Connection; diff --git a/engine/Shopware/Controllers/Backend/Voucher.php b/engine/Shopware/Controllers/Backend/Voucher.php index e8bf4ba006c..b0ee01509ef 100644 --- a/engine/Shopware/Controllers/Backend/Voucher.php +++ b/engine/Shopware/Controllers/Backend/Voucher.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Doctrine\ORM\AbstractQuery; diff --git a/engine/Shopware/Controllers/Backend/Widgets.php b/engine/Shopware/Controllers/Backend/Widgets.php index 39914808b38..73d912c75e6 100644 --- a/engine/Shopware/Controllers/Backend/Widgets.php +++ b/engine/Shopware/Controllers/Backend/Widgets.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Doctrine\ORM\AbstractQuery; diff --git a/engine/Shopware/Controllers/Frontend/Account.php b/engine/Shopware/Controllers/Frontend/Account.php index b11f7cd6d47..fcf72f1e6f6 100644 --- a/engine/Shopware/Controllers/Frontend/Account.php +++ b/engine/Shopware/Controllers/Frontend/Account.php @@ -1,28 +1,26 @@ Request()->getParam('emotionId'); - $shopContext = $this->get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class)->getShopContext(); + $shopContext = $this->get(ContextServiceInterface::class)->getShopContext(); $result = $this->get('shopware.emotion.emotion_landingpage_loader')->load( $emotionId, diff --git a/engine/Shopware/Controllers/Frontend/Checkout.php b/engine/Shopware/Controllers/Frontend/Checkout.php index fe09acf1580..c9b7f8824a3 100644 --- a/engine/Shopware/Controllers/Frontend/Checkout.php +++ b/engine/Shopware/Controllers/Frontend/Checkout.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ use Doctrine\DBAL\Connection; diff --git a/engine/Shopware/Controllers/Frontend/Compare.php b/engine/Shopware/Controllers/Frontend/Compare.php index dca9e04b7ca..5b88ea8075a 100644 --- a/engine/Shopware/Controllers/Frontend/Compare.php +++ b/engine/Shopware/Controllers/Frontend/Compare.php @@ -1,25 +1,25 @@ get(\Shopware\Bundle\MediaBundle\MediaServiceInterface::class); + $mediaService = $this->get(MediaServiceInterface::class); $requestedImage = $this->Request()->getRequestUri(); if (!$mediaService->has($requestedImage)) { diff --git a/engine/Shopware/Controllers/Frontend/Newsletter.php b/engine/Shopware/Controllers/Frontend/Newsletter.php index ef8d58b5928..01091d54ca3 100644 --- a/engine/Shopware/Controllers/Frontend/Newsletter.php +++ b/engine/Shopware/Controllers/Frontend/Newsletter.php @@ -1,27 +1,30 @@ View()->assign('sUserLoggedIn', Shopware()->Modules()->Admin()->sCheckUser()); $this->front->setParam('voteConfirmed', $this->View()->voteConfirmed); - $this->front->setParam('optinNow', (new \DateTime())->format('Y-m-d H:i:s')); + $this->front->setParam('optinNow', (new DateTime())->format('Y-m-d H:i:s')); if ($this->Request()->get('sUnsubscribe') !== null) { $this->View()->assign('sUnsubscribe', true); @@ -60,7 +63,7 @@ public function indexAction() return; } - $config = $this->container->get(\Shopware_Components_Config::class); + $config = $this->container->get(Shopware_Components_Config::class); $noCaptchaAfterLogin = $config->get('noCaptchaAfterLogin'); // redirect user if captcha is active and request is sent from the footer if (strtolower($config->get('newsletterCaptcha')) !== 'nocaptcha' @@ -81,7 +84,7 @@ public function indexAction() if ($this->View()->getAssign('sStatus')['code'] == 3) { if ($this->View()->getAssign('sStatus')['isNewRegistration']) { Shopware()->Modules()->Admin()->sNewsletterSubscription(Shopware()->System()->_POST['newsletter'], true); - $hash = \Shopware\Components\Random::getAlphanumericString(32); + $hash = Random::getAlphanumericString(32); $data = serialize(Shopware()->System()->_POST->toArray()); $link = $this->Front()->ensureRouter()->assemble(['sViewport' => 'newsletter', 'action' => 'index', 'sConfirmation' => $hash]); @@ -114,7 +117,7 @@ public function listingAction() $customergroups = $this->getCustomerGroups(); $customergroups = Shopware()->Db()->quote($customergroups); - $context = $this->container->get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class)->getShopContext(); + $context = $this->container->get(ContextServiceInterface::class)->getShopContext(); $page = (int) $this->Request()->getQuery('sPage', 1); $perPage = (int) Shopware()->Config()->get('contentPerPage', 12); @@ -172,7 +175,7 @@ public function detailAction() { $customergroups = $this->getCustomerGroups(); $customergroups = Shopware()->Db()->quote($customergroups); - $context = $this->container->get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class)->getShopContext(); + $context = $this->container->get(ContextServiceInterface::class)->getShopContext(); $sql = " SELECT id, IF(datum='00-00-0000','',datum) as `date`, subject as description, sendermail, sendername diff --git a/engine/Shopware/Controllers/Frontend/Note.php b/engine/Shopware/Controllers/Frontend/Note.php index fd90a78a9e9..c6b653edc24 100644 --- a/engine/Shopware/Controllers/Frontend/Note.php +++ b/engine/Shopware/Controllers/Frontend/Note.php @@ -1,25 +1,25 @@ get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class)->getShopContext(); - $products = $this->get(\Shopware\Bundle\StoreFrontBundle\Service\ListProductServiceInterface::class) + $context = $this->get(ContextServiceInterface::class)->getShopContext(); + $products = $this->get(ListProductServiceInterface::class) ->getList($numbers, $context); - return $this->get(\Shopware\Components\Compatibility\LegacyStructConverter::class)->convertListProductStructList($products); + return $this->get(LegacyStructConverter::class)->convertListProductStructList($products); } } diff --git a/engine/Shopware/Core/sAdmin.php b/engine/Shopware/Core/sAdmin.php index 0163c7558f2..3771b1ff3b2 100644 --- a/engine/Shopware/Core/sAdmin.php +++ b/engine/Shopware/Core/sAdmin.php @@ -1,26 +1,24 @@ loadConfig($this->AppPath() . 'Configs/Default.php'), [ diff --git a/tests/Mink/Extension/ShopwareExtension/Context/Initializer/KernelAwareInitializer.php b/tests/Mink/Extension/ShopwareExtension/Context/Initializer/KernelAwareInitializer.php index a190041af53..030f28bdd6e 100644 --- a/tests/Mink/Extension/ShopwareExtension/Context/Initializer/KernelAwareInitializer.php +++ b/tests/Mink/Extension/ShopwareExtension/Context/Initializer/KernelAwareInitializer.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Behat\ShopwareExtension\Context\Initializer; diff --git a/tests/Mink/Extension/ShopwareExtension/Context/KernelAwareContext.php b/tests/Mink/Extension/ShopwareExtension/Context/KernelAwareContext.php index 72d7d718747..2da2f68acc5 100644 --- a/tests/Mink/Extension/ShopwareExtension/Context/KernelAwareContext.php +++ b/tests/Mink/Extension/ShopwareExtension/Context/KernelAwareContext.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Behat\ShopwareExtension\Context; diff --git a/tests/Mink/Extension/ShopwareExtension/ServiceContainer/ShopwareExtension.php b/tests/Mink/Extension/ShopwareExtension/ServiceContainer/ShopwareExtension.php index 7d459d34387..25246666103 100644 --- a/tests/Mink/Extension/ShopwareExtension/ServiceContainer/ShopwareExtension.php +++ b/tests/Mink/Extension/ShopwareExtension/ServiceContainer/ShopwareExtension.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Behat\ShopwareExtension\ServiceContainer; diff --git a/tests/Mink/Page/Backend/Backend/Backend.php b/tests/Mink/Page/Backend/Backend/Backend.php index fa22925822f..2a619ff4484 100644 --- a/tests/Mink/Page/Backend/Backend/Backend.php +++ b/tests/Mink/Page/Backend/Backend/Backend.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Backend\Backend; diff --git a/tests/Mink/Page/Backend/ContentTypeManager/ContentTypeManager.php b/tests/Mink/Page/Backend/ContentTypeManager/ContentTypeManager.php index 1b884761714..c32236c4581 100644 --- a/tests/Mink/Page/Backend/ContentTypeManager/ContentTypeManager.php +++ b/tests/Mink/Page/Backend/ContentTypeManager/ContentTypeManager.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Backend\ContentTypeManager; diff --git a/tests/Mink/Page/Backend/ContentTypeManager/Elements/AddButton.php b/tests/Mink/Page/Backend/ContentTypeManager/Elements/AddButton.php index cf077bb9be1..6b03c3af688 100644 --- a/tests/Mink/Page/Backend/ContentTypeManager/Elements/AddButton.php +++ b/tests/Mink/Page/Backend/ContentTypeManager/Elements/AddButton.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Backend\ContentTypeManager\Elements; diff --git a/tests/Mink/Page/Backend/ContentTypeManager/Elements/AddFieldButton.php b/tests/Mink/Page/Backend/ContentTypeManager/Elements/AddFieldButton.php index 0b583efd592..6a23b9a3682 100644 --- a/tests/Mink/Page/Backend/ContentTypeManager/Elements/AddFieldButton.php +++ b/tests/Mink/Page/Backend/ContentTypeManager/Elements/AddFieldButton.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Backend\ContentTypeManager\Elements; diff --git a/tests/Mink/Page/Backend/ContentTypeManager/Elements/ContentTypeManagerDetailWindow.php b/tests/Mink/Page/Backend/ContentTypeManager/Elements/ContentTypeManagerDetailWindow.php index 12c19479f53..8eb8ba4a80b 100644 --- a/tests/Mink/Page/Backend/ContentTypeManager/Elements/ContentTypeManagerDetailWindow.php +++ b/tests/Mink/Page/Backend/ContentTypeManager/Elements/ContentTypeManagerDetailWindow.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Backend\ContentTypeManager\Elements; diff --git a/tests/Mink/Page/Backend/ContentTypeManager/Elements/ContentTypeManagerFieldWindow.php b/tests/Mink/Page/Backend/ContentTypeManager/Elements/ContentTypeManagerFieldWindow.php index f9923df7ba1..b1138bf6f5e 100644 --- a/tests/Mink/Page/Backend/ContentTypeManager/Elements/ContentTypeManagerFieldWindow.php +++ b/tests/Mink/Page/Backend/ContentTypeManager/Elements/ContentTypeManagerFieldWindow.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Backend\ContentTypeManager\Elements; diff --git a/tests/Mink/Page/Backend/ContentTypeManager/Elements/ContentTypeManagerListWindow.php b/tests/Mink/Page/Backend/ContentTypeManager/Elements/ContentTypeManagerListWindow.php index fafd99bb2f7..01a80749451 100644 --- a/tests/Mink/Page/Backend/ContentTypeManager/Elements/ContentTypeManagerListWindow.php +++ b/tests/Mink/Page/Backend/ContentTypeManager/Elements/ContentTypeManagerListWindow.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Backend\ContentTypeManager\Elements; diff --git a/tests/Mink/Page/Backend/ContentTypeManager/Elements/SaveButton.php b/tests/Mink/Page/Backend/ContentTypeManager/Elements/SaveButton.php index ea943d4a515..04c2f54ed82 100644 --- a/tests/Mink/Page/Backend/ContentTypeManager/Elements/SaveButton.php +++ b/tests/Mink/Page/Backend/ContentTypeManager/Elements/SaveButton.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Backend\ContentTypeManager\Elements; diff --git a/tests/Mink/Page/Backend/ContentTypeManager/Elements/SelectorScopedElement.php b/tests/Mink/Page/Backend/ContentTypeManager/Elements/SelectorScopedElement.php index 9326f584028..520bc7c202e 100644 --- a/tests/Mink/Page/Backend/ContentTypeManager/Elements/SelectorScopedElement.php +++ b/tests/Mink/Page/Backend/ContentTypeManager/Elements/SelectorScopedElement.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Backend\ContentTypeManager\Elements; diff --git a/tests/Mink/Page/Backend/CustomRecipes/CustomRecipes.php b/tests/Mink/Page/Backend/CustomRecipes/CustomRecipes.php index ce8ea481ef6..97c818ecc8c 100644 --- a/tests/Mink/Page/Backend/CustomRecipes/CustomRecipes.php +++ b/tests/Mink/Page/Backend/CustomRecipes/CustomRecipes.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Backend\CustomRecipes; diff --git a/tests/Mink/Page/Backend/CustomRecipes/Elements/CustomRecipesListWindow.php b/tests/Mink/Page/Backend/CustomRecipes/Elements/CustomRecipesListWindow.php index ab1780e7711..0a3c6cbe90f 100644 --- a/tests/Mink/Page/Backend/CustomRecipes/Elements/CustomRecipesListWindow.php +++ b/tests/Mink/Page/Backend/CustomRecipes/Elements/CustomRecipesListWindow.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Backend\CustomRecipes\Elements; diff --git a/tests/Mink/Page/Frontend/Account/Account.php b/tests/Mink/Page/Frontend/Account/Account.php index ff2d30d63d8..39066bbed41 100644 --- a/tests/Mink/Page/Frontend/Account/Account.php +++ b/tests/Mink/Page/Frontend/Account/Account.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Account; diff --git a/tests/Mink/Page/Frontend/Account/Elements/AccountBilling.php b/tests/Mink/Page/Frontend/Account/Elements/AccountBilling.php index a704bce2532..6d1cf19976b 100644 --- a/tests/Mink/Page/Frontend/Account/Elements/AccountBilling.php +++ b/tests/Mink/Page/Frontend/Account/Elements/AccountBilling.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Account\Elements; diff --git a/tests/Mink/Page/Frontend/Account/Elements/AccountOrder.php b/tests/Mink/Page/Frontend/Account/Elements/AccountOrder.php index a05473fff8b..9144deb46f6 100644 --- a/tests/Mink/Page/Frontend/Account/Elements/AccountOrder.php +++ b/tests/Mink/Page/Frontend/Account/Elements/AccountOrder.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Account\Elements; diff --git a/tests/Mink/Page/Frontend/Account/Elements/AccountPayment.php b/tests/Mink/Page/Frontend/Account/Elements/AccountPayment.php index 4bdc81e38a4..60170e8cad7 100644 --- a/tests/Mink/Page/Frontend/Account/Elements/AccountPayment.php +++ b/tests/Mink/Page/Frontend/Account/Elements/AccountPayment.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Account\Elements; diff --git a/tests/Mink/Page/Frontend/Account/Elements/AccountShipping.php b/tests/Mink/Page/Frontend/Account/Elements/AccountShipping.php index 1544605e07b..441a188c2d8 100644 --- a/tests/Mink/Page/Frontend/Account/Elements/AccountShipping.php +++ b/tests/Mink/Page/Frontend/Account/Elements/AccountShipping.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Account\Elements; diff --git a/tests/Mink/Page/Frontend/Address/Address.php b/tests/Mink/Page/Frontend/Address/Address.php index 131c2890acb..e816e5fbcf9 100644 --- a/tests/Mink/Page/Frontend/Address/Address.php +++ b/tests/Mink/Page/Frontend/Address/Address.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Address; diff --git a/tests/Mink/Page/Frontend/Address/AddressDelete.php b/tests/Mink/Page/Frontend/Address/AddressDelete.php index 2fe2991174e..b0be35a7ebf 100644 --- a/tests/Mink/Page/Frontend/Address/AddressDelete.php +++ b/tests/Mink/Page/Frontend/Address/AddressDelete.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Address; diff --git a/tests/Mink/Page/Frontend/Address/AddressEdit.php b/tests/Mink/Page/Frontend/Address/AddressEdit.php index cec945e094b..685054e3bb2 100644 --- a/tests/Mink/Page/Frontend/Address/AddressEdit.php +++ b/tests/Mink/Page/Frontend/Address/AddressEdit.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Address; diff --git a/tests/Mink/Page/Frontend/Address/Elements/AddressBox.php b/tests/Mink/Page/Frontend/Address/Elements/AddressBox.php index 54a845b9abe..5336e6e0a7c 100644 --- a/tests/Mink/Page/Frontend/Address/Elements/AddressBox.php +++ b/tests/Mink/Page/Frontend/Address/Elements/AddressBox.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Address\Elements; diff --git a/tests/Mink/Page/Frontend/Address/Elements/AddressManagementAddressBox.php b/tests/Mink/Page/Frontend/Address/Elements/AddressManagementAddressBox.php index 7bc1e171a85..d3f0369e246 100644 --- a/tests/Mink/Page/Frontend/Address/Elements/AddressManagementAddressBox.php +++ b/tests/Mink/Page/Frontend/Address/Elements/AddressManagementAddressBox.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Address\Elements; diff --git a/tests/Mink/Page/Frontend/Article/Elements/Article.php b/tests/Mink/Page/Frontend/Article/Elements/Article.php index eb6772bc0d9..68faec0d8b8 100644 --- a/tests/Mink/Page/Frontend/Article/Elements/Article.php +++ b/tests/Mink/Page/Frontend/Article/Elements/Article.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Article\Elements; diff --git a/tests/Mink/Page/Frontend/Article/Elements/ArticleBox.php b/tests/Mink/Page/Frontend/Article/Elements/ArticleBox.php index 825efcebac0..f7b11a77376 100644 --- a/tests/Mink/Page/Frontend/Article/Elements/ArticleBox.php +++ b/tests/Mink/Page/Frontend/Article/Elements/ArticleBox.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Article\Elements; diff --git a/tests/Mink/Page/Frontend/Article/Elements/ArticleEvaluation.php b/tests/Mink/Page/Frontend/Article/Elements/ArticleEvaluation.php index 401fe72064a..30e04449b69 100644 --- a/tests/Mink/Page/Frontend/Article/Elements/ArticleEvaluation.php +++ b/tests/Mink/Page/Frontend/Article/Elements/ArticleEvaluation.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Article\Elements; diff --git a/tests/Mink/Page/Frontend/Article/Elements/ArticleSlider.php b/tests/Mink/Page/Frontend/Article/Elements/ArticleSlider.php index b01303b410f..d68d379b244 100644 --- a/tests/Mink/Page/Frontend/Article/Elements/ArticleSlider.php +++ b/tests/Mink/Page/Frontend/Article/Elements/ArticleSlider.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Article\Elements; diff --git a/tests/Mink/Page/Frontend/Blog/Blog.php b/tests/Mink/Page/Frontend/Blog/Blog.php index c1e3c6303ef..b9d9889eb3a 100644 --- a/tests/Mink/Page/Frontend/Blog/Blog.php +++ b/tests/Mink/Page/Frontend/Blog/Blog.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Blog; diff --git a/tests/Mink/Page/Frontend/Blog/Elements/BlogArticle.php b/tests/Mink/Page/Frontend/Blog/Elements/BlogArticle.php index 52e80c42b6a..412758f165c 100644 --- a/tests/Mink/Page/Frontend/Blog/Elements/BlogArticle.php +++ b/tests/Mink/Page/Frontend/Blog/Elements/BlogArticle.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Blog\Elements; diff --git a/tests/Mink/Page/Frontend/Blog/Elements/BlogArticleBox.php b/tests/Mink/Page/Frontend/Blog/Elements/BlogArticleBox.php index 6f2d527fa29..0a9319b9b5d 100644 --- a/tests/Mink/Page/Frontend/Blog/Elements/BlogArticleBox.php +++ b/tests/Mink/Page/Frontend/Blog/Elements/BlogArticleBox.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Blog\Elements; diff --git a/tests/Mink/Page/Frontend/Blog/Elements/BlogBox.php b/tests/Mink/Page/Frontend/Blog/Elements/BlogBox.php index 273cb8bf2c8..bcbe7d0cf56 100644 --- a/tests/Mink/Page/Frontend/Blog/Elements/BlogBox.php +++ b/tests/Mink/Page/Frontend/Blog/Elements/BlogBox.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Blog\Elements; diff --git a/tests/Mink/Page/Frontend/Blog/Elements/BlogComment.php b/tests/Mink/Page/Frontend/Blog/Elements/BlogComment.php index 8ffa67c878b..546ce6fdbbb 100644 --- a/tests/Mink/Page/Frontend/Blog/Elements/BlogComment.php +++ b/tests/Mink/Page/Frontend/Blog/Elements/BlogComment.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Blog\Elements; diff --git a/tests/Mink/Page/Frontend/Checkout/CheckoutCart.php b/tests/Mink/Page/Frontend/Checkout/CheckoutCart.php index f562042beb4..076c369ccc5 100644 --- a/tests/Mink/Page/Frontend/Checkout/CheckoutCart.php +++ b/tests/Mink/Page/Frontend/Checkout/CheckoutCart.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Checkout; diff --git a/tests/Mink/Page/Frontend/Checkout/CheckoutConfirm.php b/tests/Mink/Page/Frontend/Checkout/CheckoutConfirm.php index 88d24233c2e..924f45e755f 100644 --- a/tests/Mink/Page/Frontend/Checkout/CheckoutConfirm.php +++ b/tests/Mink/Page/Frontend/Checkout/CheckoutConfirm.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Checkout; diff --git a/tests/Mink/Page/Frontend/Checkout/Elements/CartPositionProduct.php b/tests/Mink/Page/Frontend/Checkout/Elements/CartPositionProduct.php index fc39dc54935..6d402adcbe7 100644 --- a/tests/Mink/Page/Frontend/Checkout/Elements/CartPositionProduct.php +++ b/tests/Mink/Page/Frontend/Checkout/Elements/CartPositionProduct.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Checkout\Elements; diff --git a/tests/Mink/Page/Frontend/Checkout/Elements/CartPositionRebate.php b/tests/Mink/Page/Frontend/Checkout/Elements/CartPositionRebate.php index 29aac6f746e..2e5a1d2fec3 100644 --- a/tests/Mink/Page/Frontend/Checkout/Elements/CartPositionRebate.php +++ b/tests/Mink/Page/Frontend/Checkout/Elements/CartPositionRebate.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Checkout\Elements; diff --git a/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBox.php b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBox.php index 662e2a5faf7..1dac8fc6199 100644 --- a/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBox.php +++ b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBox.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Checkout\Elements; diff --git a/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBoxModal.php b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBoxModal.php index 9bbe3dc6391..a529c84871e 100644 --- a/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBoxModal.php +++ b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBoxModal.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Checkout\Elements; diff --git a/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutBilling.php b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutBilling.php index de10b1e4181..54d9d768783 100644 --- a/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutBilling.php +++ b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutBilling.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Checkout\Elements; diff --git a/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutModalAddressEditor.php b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutModalAddressEditor.php index f474e31866f..77ad95ff854 100644 --- a/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutModalAddressEditor.php +++ b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutModalAddressEditor.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Checkout\Elements; diff --git a/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutModalAddressSelection.php b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutModalAddressSelection.php index 9ad3839f5e6..2c68599ba81 100644 --- a/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutModalAddressSelection.php +++ b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutModalAddressSelection.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Checkout\Elements; diff --git a/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutPayment.php b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutPayment.php index 3e0534e1472..8ad88595c59 100644 --- a/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutPayment.php +++ b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutPayment.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Checkout\Elements; diff --git a/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutShipping.php b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutShipping.php index 8225173dad2..d3503cfc1bd 100644 --- a/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutShipping.php +++ b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutShipping.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Checkout\Elements; diff --git a/tests/Mink/Page/Frontend/Detail/Detail.php b/tests/Mink/Page/Frontend/Detail/Detail.php index 9b191754285..711b7370f2b 100644 --- a/tests/Mink/Page/Frontend/Detail/Detail.php +++ b/tests/Mink/Page/Frontend/Detail/Detail.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Detail; diff --git a/tests/Mink/Page/Frontend/Form/Form.php b/tests/Mink/Page/Frontend/Form/Form.php index 5ec376ccc4b..b15efbcb267 100644 --- a/tests/Mink/Page/Frontend/Form/Form.php +++ b/tests/Mink/Page/Frontend/Form/Form.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Form; diff --git a/tests/Mink/Page/Frontend/Generic/GenericPage.php b/tests/Mink/Page/Frontend/Generic/GenericPage.php index 16c35141b1d..ea7025f4e2c 100644 --- a/tests/Mink/Page/Frontend/Generic/GenericPage.php +++ b/tests/Mink/Page/Frontend/Generic/GenericPage.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Generic; diff --git a/tests/Mink/Page/Frontend/Homepage/Elements/Banner.php b/tests/Mink/Page/Frontend/Homepage/Elements/Banner.php index 50ea662e829..d4d9dea48b2 100644 --- a/tests/Mink/Page/Frontend/Homepage/Elements/Banner.php +++ b/tests/Mink/Page/Frontend/Homepage/Elements/Banner.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Homepage\Elements; diff --git a/tests/Mink/Page/Frontend/Homepage/Elements/CategoryTeaser.php b/tests/Mink/Page/Frontend/Homepage/Elements/CategoryTeaser.php index 9369767b2ac..6fdf3143a6e 100644 --- a/tests/Mink/Page/Frontend/Homepage/Elements/CategoryTeaser.php +++ b/tests/Mink/Page/Frontend/Homepage/Elements/CategoryTeaser.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Homepage\Elements; diff --git a/tests/Mink/Page/Frontend/Homepage/Elements/CompareColumn.php b/tests/Mink/Page/Frontend/Homepage/Elements/CompareColumn.php index 5071ed5fe5a..5360d03fdd2 100644 --- a/tests/Mink/Page/Frontend/Homepage/Elements/CompareColumn.php +++ b/tests/Mink/Page/Frontend/Homepage/Elements/CompareColumn.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Homepage\Elements; diff --git a/tests/Mink/Page/Frontend/Homepage/Elements/ManufacturerSlider.php b/tests/Mink/Page/Frontend/Homepage/Elements/ManufacturerSlider.php index 7c4c06b8594..ae71dd37d3b 100644 --- a/tests/Mink/Page/Frontend/Homepage/Elements/ManufacturerSlider.php +++ b/tests/Mink/Page/Frontend/Homepage/Elements/ManufacturerSlider.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Homepage\Elements; diff --git a/tests/Mink/Page/Frontend/Homepage/Elements/SearchForm.php b/tests/Mink/Page/Frontend/Homepage/Elements/SearchForm.php index bb7b23ea1d9..60a5f2e3098 100644 --- a/tests/Mink/Page/Frontend/Homepage/Elements/SearchForm.php +++ b/tests/Mink/Page/Frontend/Homepage/Elements/SearchForm.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Homepage\Elements; diff --git a/tests/Mink/Page/Frontend/Homepage/Elements/SliderElement.php b/tests/Mink/Page/Frontend/Homepage/Elements/SliderElement.php index dbdef953b84..ef07aa0a579 100644 --- a/tests/Mink/Page/Frontend/Homepage/Elements/SliderElement.php +++ b/tests/Mink/Page/Frontend/Homepage/Elements/SliderElement.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Homepage\Elements; diff --git a/tests/Mink/Page/Frontend/Homepage/Elements/YouTube.php b/tests/Mink/Page/Frontend/Homepage/Elements/YouTube.php index ff98545151e..63a02fc0321 100644 --- a/tests/Mink/Page/Frontend/Homepage/Elements/YouTube.php +++ b/tests/Mink/Page/Frontend/Homepage/Elements/YouTube.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Homepage\Elements; diff --git a/tests/Mink/Page/Frontend/Homepage/Homepage.php b/tests/Mink/Page/Frontend/Homepage/Homepage.php index 0ea19061614..d6f30534d78 100644 --- a/tests/Mink/Page/Frontend/Homepage/Homepage.php +++ b/tests/Mink/Page/Frontend/Homepage/Homepage.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Homepage; diff --git a/tests/Mink/Page/Frontend/Listing/Elements/Paging.php b/tests/Mink/Page/Frontend/Listing/Elements/Paging.php index 05b44c9ed29..371c8aac88e 100644 --- a/tests/Mink/Page/Frontend/Listing/Elements/Paging.php +++ b/tests/Mink/Page/Frontend/Listing/Elements/Paging.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Listing\Elements; diff --git a/tests/Mink/Page/Frontend/Listing/Listing.php b/tests/Mink/Page/Frontend/Listing/Listing.php index 7d57ca67f23..558c6efd0bf 100644 --- a/tests/Mink/Page/Frontend/Listing/Listing.php +++ b/tests/Mink/Page/Frontend/Listing/Listing.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Listing; diff --git a/tests/Mink/Page/Frontend/Newsletter/Newsletter.php b/tests/Mink/Page/Frontend/Newsletter/Newsletter.php index 84be4df6ac3..ea615bf2818 100644 --- a/tests/Mink/Page/Frontend/Newsletter/Newsletter.php +++ b/tests/Mink/Page/Frontend/Newsletter/Newsletter.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Newsletter; diff --git a/tests/Mink/Page/Frontend/Note/Elements/NotePosition.php b/tests/Mink/Page/Frontend/Note/Elements/NotePosition.php index db9b8ce9b5e..9020ee65e5e 100644 --- a/tests/Mink/Page/Frontend/Note/Elements/NotePosition.php +++ b/tests/Mink/Page/Frontend/Note/Elements/NotePosition.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Note\Elements; diff --git a/tests/Mink/Page/Frontend/Note/Note.php b/tests/Mink/Page/Frontend/Note/Note.php index 4baf697d64b..85238fa39a9 100644 --- a/tests/Mink/Page/Frontend/Note/Note.php +++ b/tests/Mink/Page/Frontend/Note/Note.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Note; diff --git a/tests/Mink/Page/Frontend/Sitemap/Elements/SitemapGroup.php b/tests/Mink/Page/Frontend/Sitemap/Elements/SitemapGroup.php index 57cc888d71d..543c8c51fdf 100644 --- a/tests/Mink/Page/Frontend/Sitemap/Elements/SitemapGroup.php +++ b/tests/Mink/Page/Frontend/Sitemap/Elements/SitemapGroup.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Sitemap\Elements; diff --git a/tests/Mink/Page/Frontend/Sitemap/Sitemap.php b/tests/Mink/Page/Frontend/Sitemap/Sitemap.php index 0089045ae9c..5ce09e5089f 100644 --- a/tests/Mink/Page/Frontend/Sitemap/Sitemap.php +++ b/tests/Mink/Page/Frontend/Sitemap/Sitemap.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Sitemap; diff --git a/tests/Mink/Page/Frontend/Sitemap/SitemapIndexXml.php b/tests/Mink/Page/Frontend/Sitemap/SitemapIndexXml.php index 0c8b13bd32a..42a2aeafa76 100644 --- a/tests/Mink/Page/Frontend/Sitemap/SitemapIndexXml.php +++ b/tests/Mink/Page/Frontend/Sitemap/SitemapIndexXml.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Frontend\Sitemap; diff --git a/tests/Mink/Page/Helper/Elements/BannerSlider.php b/tests/Mink/Page/Helper/Elements/BannerSlider.php index 6de49238b89..dd4d1c0577b 100644 --- a/tests/Mink/Page/Helper/Elements/BannerSlider.php +++ b/tests/Mink/Page/Helper/Elements/BannerSlider.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Helper\Elements; diff --git a/tests/Mink/Page/Helper/Elements/FilterGroup.php b/tests/Mink/Page/Helper/Elements/FilterGroup.php index e07fb841833..5bd35817856 100644 --- a/tests/Mink/Page/Helper/Elements/FilterGroup.php +++ b/tests/Mink/Page/Helper/Elements/FilterGroup.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Helper\Elements; diff --git a/tests/Mink/Page/Helper/Elements/HeaderCart.php b/tests/Mink/Page/Helper/Elements/HeaderCart.php index f762df7e5e4..b023e332d23 100644 --- a/tests/Mink/Page/Helper/Elements/HeaderCart.php +++ b/tests/Mink/Page/Helper/Elements/HeaderCart.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Helper\Elements; diff --git a/tests/Mink/Page/Helper/Elements/LanguageSwitcher.php b/tests/Mink/Page/Helper/Elements/LanguageSwitcher.php index f62fd832d6b..245d8439016 100644 --- a/tests/Mink/Page/Helper/Elements/LanguageSwitcher.php +++ b/tests/Mink/Page/Helper/Elements/LanguageSwitcher.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Helper\Elements; diff --git a/tests/Mink/Page/Helper/Elements/MultipleElement.php b/tests/Mink/Page/Helper/Elements/MultipleElement.php index 04d36a3a580..41685668e94 100644 --- a/tests/Mink/Page/Helper/Elements/MultipleElement.php +++ b/tests/Mink/Page/Helper/Elements/MultipleElement.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Page\Helper\Elements; diff --git a/tests/Mink/Tests/Backend/Backend/bootstrap/BackendContext.php b/tests/Mink/Tests/Backend/Backend/bootstrap/BackendContext.php index ce91b42fadf..6554394beec 100644 --- a/tests/Mink/Tests/Backend/Backend/bootstrap/BackendContext.php +++ b/tests/Mink/Tests/Backend/Backend/bootstrap/BackendContext.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Tests\Backend\Backend\bootstrap; diff --git a/tests/Mink/Tests/Backend/ContentTypes/bootstrap/BackendContentTypeManagerContext.php b/tests/Mink/Tests/Backend/ContentTypes/bootstrap/BackendContentTypeManagerContext.php index 3d712777eef..10db043d17f 100644 --- a/tests/Mink/Tests/Backend/ContentTypes/bootstrap/BackendContentTypeManagerContext.php +++ b/tests/Mink/Tests/Backend/ContentTypes/bootstrap/BackendContentTypeManagerContext.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Tests\Backend\ContentTypes\bootstrap; diff --git a/tests/Mink/Tests/Backend/ContentTypes/bootstrap/BackendCustomRecipesContext.php b/tests/Mink/Tests/Backend/ContentTypes/bootstrap/BackendCustomRecipesContext.php index 733c51c5026..eec54725a71 100644 --- a/tests/Mink/Tests/Backend/ContentTypes/bootstrap/BackendCustomRecipesContext.php +++ b/tests/Mink/Tests/Backend/ContentTypes/bootstrap/BackendCustomRecipesContext.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Tests\Backend\ContentTypes\bootstrap; diff --git a/tests/Mink/Tests/Backend/Export/bootstrap/ExportContext.php b/tests/Mink/Tests/Backend/Export/bootstrap/ExportContext.php index 817699be802..510ae0fd07b 100644 --- a/tests/Mink/Tests/Backend/Export/bootstrap/ExportContext.php +++ b/tests/Mink/Tests/Backend/Export/bootstrap/ExportContext.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Tests\Backend\Export\bootstrap; diff --git a/tests/Mink/Tests/Frontend/Account/bootstrap/AccountContext.php b/tests/Mink/Tests/Frontend/Account/bootstrap/AccountContext.php index babecfd1e57..9e14535bcf2 100644 --- a/tests/Mink/Tests/Frontend/Account/bootstrap/AccountContext.php +++ b/tests/Mink/Tests/Frontend/Account/bootstrap/AccountContext.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Tests\Frontend\Account\bootstrap; diff --git a/tests/Mink/Tests/Frontend/Blog/bootstrap/BlogContext.php b/tests/Mink/Tests/Frontend/Blog/bootstrap/BlogContext.php index 1db64ef66ba..9abd53c7e09 100644 --- a/tests/Mink/Tests/Frontend/Blog/bootstrap/BlogContext.php +++ b/tests/Mink/Tests/Frontend/Blog/bootstrap/BlogContext.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Tests\Frontend\Blog\bootstrap; diff --git a/tests/Mink/Tests/Frontend/Checkout/bootstrap/CheckoutContext.php b/tests/Mink/Tests/Frontend/Checkout/bootstrap/CheckoutContext.php index 248b4bb29af..0dcf8b11eb1 100644 --- a/tests/Mink/Tests/Frontend/Checkout/bootstrap/CheckoutContext.php +++ b/tests/Mink/Tests/Frontend/Checkout/bootstrap/CheckoutContext.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Tests\Frontend\Checkout\bootstrap; diff --git a/tests/Mink/Tests/Frontend/Detail/bootstrap/DetailContext.php b/tests/Mink/Tests/Frontend/Detail/bootstrap/DetailContext.php index 0c65c97d2cd..55afd6536d2 100644 --- a/tests/Mink/Tests/Frontend/Detail/bootstrap/DetailContext.php +++ b/tests/Mink/Tests/Frontend/Detail/bootstrap/DetailContext.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Tests\Frontend\Detail\bootstrap; diff --git a/tests/Mink/Tests/Frontend/Detail/bootstrap/FormContext.php b/tests/Mink/Tests/Frontend/Detail/bootstrap/FormContext.php index 3e2666f68a2..3dd96ea6d0e 100644 --- a/tests/Mink/Tests/Frontend/Detail/bootstrap/FormContext.php +++ b/tests/Mink/Tests/Frontend/Detail/bootstrap/FormContext.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Tests\Frontend\Detail\bootstrap; diff --git a/tests/Mink/Tests/Frontend/Homepage/bootstrap/SecurityContext.php b/tests/Mink/Tests/Frontend/Homepage/bootstrap/SecurityContext.php index b80838d0477..187d338bd86 100644 --- a/tests/Mink/Tests/Frontend/Homepage/bootstrap/SecurityContext.php +++ b/tests/Mink/Tests/Frontend/Homepage/bootstrap/SecurityContext.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Tests\Frontend\Homepage\bootstrap; diff --git a/tests/Mink/Tests/Frontend/Homepage/bootstrap/ShopwareContext.php b/tests/Mink/Tests/Frontend/Homepage/bootstrap/ShopwareContext.php index c8bd52aadeb..dc3da476f0f 100644 --- a/tests/Mink/Tests/Frontend/Homepage/bootstrap/ShopwareContext.php +++ b/tests/Mink/Tests/Frontend/Homepage/bootstrap/ShopwareContext.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Tests\Frontend\Homepage\bootstrap; diff --git a/tests/Mink/Tests/Frontend/Listing/bootstrap/ListingContext.php b/tests/Mink/Tests/Frontend/Listing/bootstrap/ListingContext.php index 83c1dec54fc..66e47173d06 100644 --- a/tests/Mink/Tests/Frontend/Listing/bootstrap/ListingContext.php +++ b/tests/Mink/Tests/Frontend/Listing/bootstrap/ListingContext.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Tests\Frontend\Listing\bootstrap; diff --git a/tests/Mink/Tests/Frontend/Listing/bootstrap/SeoContext.php b/tests/Mink/Tests/Frontend/Listing/bootstrap/SeoContext.php index b952efd6e02..5d66ad377e1 100644 --- a/tests/Mink/Tests/Frontend/Listing/bootstrap/SeoContext.php +++ b/tests/Mink/Tests/Frontend/Listing/bootstrap/SeoContext.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Tests\Frontend\Listing\bootstrap; diff --git a/tests/Mink/Tests/Frontend/Note/bootstrap/NoteContext.php b/tests/Mink/Tests/Frontend/Note/bootstrap/NoteContext.php index 22811d29db1..804c85adb9b 100644 --- a/tests/Mink/Tests/Frontend/Note/bootstrap/NoteContext.php +++ b/tests/Mink/Tests/Frontend/Note/bootstrap/NoteContext.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Tests\Frontend\Note\bootstrap; diff --git a/tests/Mink/Tests/Frontend/Sitemap/bootstrap/SitemapContext.php b/tests/Mink/Tests/Frontend/Sitemap/bootstrap/SitemapContext.php index ddbe50e3305..65cf2b1bebc 100644 --- a/tests/Mink/Tests/Frontend/Sitemap/bootstrap/SitemapContext.php +++ b/tests/Mink/Tests/Frontend/Sitemap/bootstrap/SitemapContext.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Tests\Frontend\Sitemap\bootstrap; diff --git a/tests/Mink/Tests/General/Helpers/FeatureContext.php b/tests/Mink/Tests/General/Helpers/FeatureContext.php index af35579e564..aa52a7ca96e 100644 --- a/tests/Mink/Tests/General/Helpers/FeatureContext.php +++ b/tests/Mink/Tests/General/Helpers/FeatureContext.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Tests\General\Helpers; diff --git a/tests/Mink/Tests/General/Helpers/Helper.php b/tests/Mink/Tests/General/Helpers/Helper.php index ef1f5a19b26..4b432e0e384 100644 --- a/tests/Mink/Tests/General/Helpers/Helper.php +++ b/tests/Mink/Tests/General/Helpers/Helper.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Tests\General\Helpers; diff --git a/tests/Mink/Tests/General/Helpers/HelperSelectorInterface.php b/tests/Mink/Tests/General/Helpers/HelperSelectorInterface.php index 0d11599cf77..3c5da8fc6ba 100644 --- a/tests/Mink/Tests/General/Helpers/HelperSelectorInterface.php +++ b/tests/Mink/Tests/General/Helpers/HelperSelectorInterface.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Tests\General\Helpers; diff --git a/tests/Mink/Tests/General/Helpers/SpecialContext.php b/tests/Mink/Tests/General/Helpers/SpecialContext.php index 811204a6aba..8d3bd4d7967 100644 --- a/tests/Mink/Tests/General/Helpers/SpecialContext.php +++ b/tests/Mink/Tests/General/Helpers/SpecialContext.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Tests\General\Helpers; diff --git a/tests/Mink/Tests/General/Helpers/SubContext.php b/tests/Mink/Tests/General/Helpers/SubContext.php index 8d2dd57c897..f2b21cd5acb 100644 --- a/tests/Mink/Tests/General/Helpers/SubContext.php +++ b/tests/Mink/Tests/General/Helpers/SubContext.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Tests\General\Helpers; diff --git a/tests/Mink/Tests/General/Helpers/TransformContext.php b/tests/Mink/Tests/General/Helpers/TransformContext.php index c1fd2dd118d..3dffdbd7487 100644 --- a/tests/Mink/Tests/General/Helpers/TransformContext.php +++ b/tests/Mink/Tests/General/Helpers/TransformContext.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Mink\Tests\General\Helpers; diff --git a/tests/PHPStan/Extension/SmartyClassDynamicReturnTypeExtension.php b/tests/PHPStan/Extension/SmartyClassDynamicReturnTypeExtension.php index fb931b2240f..415dbea89cd 100644 --- a/tests/PHPStan/Extension/SmartyClassDynamicReturnTypeExtension.php +++ b/tests/PHPStan/Extension/SmartyClassDynamicReturnTypeExtension.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\PHPStan\Extension; diff --git a/tests/TestReflectionHelper.php b/tests/TestReflectionHelper.php index 1a4bb24d92c..8c9fbdd8d8e 100644 --- a/tests/TestReflectionHelper.php +++ b/tests/TestReflectionHelper.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests; diff --git a/tests/Unit/ArrayCollectionTest.php b/tests/Unit/ArrayCollectionTest.php index a36cf262e2c..47daf9f6c64 100644 --- a/tests/Unit/ArrayCollectionTest.php +++ b/tests/Unit/ArrayCollectionTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit; diff --git a/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterDynamicControllerTest.php b/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterDynamicControllerTest.php index e7fa7cc34c0..bb5c89e8ec7 100644 --- a/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterDynamicControllerTest.php +++ b/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterDynamicControllerTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\ContentTypeBundle\DependencyInjection; diff --git a/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterFieldsCompilerPassTest.php b/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterFieldsCompilerPassTest.php index c6671c390f9..2bf8c49734c 100644 --- a/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterFieldsCompilerPassTest.php +++ b/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterFieldsCompilerPassTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\ContentTypeBundle\DependencyInjection; diff --git a/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterTypeRepositoriesTest.php b/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterTypeRepositoriesTest.php index 2b6bec0599c..1c0d496d264 100644 --- a/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterTypeRepositoriesTest.php +++ b/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterTypeRepositoriesTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\ContentTypeBundle\DependencyInjection; diff --git a/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/TypeReaderTest.php b/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/TypeReaderTest.php index 3df2a3a6fa4..3a283902c5d 100644 --- a/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/TypeReaderTest.php +++ b/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/TypeReaderTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\ContentTypeBundle\DependencyInjection; diff --git a/tests/Unit/Bundle/ContentTypeBundle/Field/Shopware/AbstractGridFieldTest.php b/tests/Unit/Bundle/ContentTypeBundle/Field/Shopware/AbstractGridFieldTest.php index f233081e582..90e30a73e47 100644 --- a/tests/Unit/Bundle/ContentTypeBundle/Field/Shopware/AbstractGridFieldTest.php +++ b/tests/Unit/Bundle/ContentTypeBundle/Field/Shopware/AbstractGridFieldTest.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\ContentTypeBundle\Field\Shopware; diff --git a/tests/Unit/Bundle/ContentTypeBundle/Field/Shopware/AbstractSingleSelectionFieldTest.php b/tests/Unit/Bundle/ContentTypeBundle/Field/Shopware/AbstractSingleSelectionFieldTest.php index 1faf3cc2015..41cf1f4c6a5 100644 --- a/tests/Unit/Bundle/ContentTypeBundle/Field/Shopware/AbstractSingleSelectionFieldTest.php +++ b/tests/Unit/Bundle/ContentTypeBundle/Field/Shopware/AbstractSingleSelectionFieldTest.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\ContentTypeBundle\Field\Shopware; diff --git a/tests/Unit/Bundle/ContentTypeBundle/Services/FrontendTypeTranslatorTest.php b/tests/Unit/Bundle/ContentTypeBundle/Services/FrontendTypeTranslatorTest.php index e41ae5fb3d8..4ec2c15234a 100644 --- a/tests/Unit/Bundle/ContentTypeBundle/Services/FrontendTypeTranslatorTest.php +++ b/tests/Unit/Bundle/ContentTypeBundle/Services/FrontendTypeTranslatorTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\ContentTypeBundle\Services; diff --git a/tests/Unit/Bundle/ContentTypeBundle/XmlReaderTest.php b/tests/Unit/Bundle/ContentTypeBundle/XmlReaderTest.php index 3fcaf9c3504..08badf5c004 100644 --- a/tests/Unit/Bundle/ContentTypeBundle/XmlReaderTest.php +++ b/tests/Unit/Bundle/ContentTypeBundle/XmlReaderTest.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\ContentTypeBundle; diff --git a/tests/Unit/Bundle/CookieBundle/CookieCollectionTest.php b/tests/Unit/Bundle/CookieBundle/CookieCollectionTest.php index 1b36c48e504..fb401b59b81 100644 --- a/tests/Unit/Bundle/CookieBundle/CookieCollectionTest.php +++ b/tests/Unit/Bundle/CookieBundle/CookieCollectionTest.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\CookieBundle; diff --git a/tests/Unit/Bundle/CookieBundle/CookieGroupCollectionTest.php b/tests/Unit/Bundle/CookieBundle/CookieGroupCollectionTest.php index 21a934d6d55..e7773ac66c5 100644 --- a/tests/Unit/Bundle/CookieBundle/CookieGroupCollectionTest.php +++ b/tests/Unit/Bundle/CookieBundle/CookieGroupCollectionTest.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\CookieBundle; diff --git a/tests/Unit/Bundle/ESIndexingBundle/DependencyInjection/Factory/TextMappingFactoryTest.php b/tests/Unit/Bundle/ESIndexingBundle/DependencyInjection/Factory/TextMappingFactoryTest.php index d9e9cb1ad54..6375964f5e5 100644 --- a/tests/Unit/Bundle/ESIndexingBundle/DependencyInjection/Factory/TextMappingFactoryTest.php +++ b/tests/Unit/Bundle/ESIndexingBundle/DependencyInjection/Factory/TextMappingFactoryTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\ESIndexingBundle\DependencyInjection\Factory; diff --git a/tests/Unit/Bundle/ESIndexingBundle/Product/ProductMappingTest.php b/tests/Unit/Bundle/ESIndexingBundle/Product/ProductMappingTest.php index 1a675b64df6..05bcee0cccd 100644 --- a/tests/Unit/Bundle/ESIndexingBundle/Product/ProductMappingTest.php +++ b/tests/Unit/Bundle/ESIndexingBundle/Product/ProductMappingTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\ESIndexingBundle\Product; diff --git a/tests/Unit/Bundle/ESIndexingBundle/Property/PropertyMappingTest.php b/tests/Unit/Bundle/ESIndexingBundle/Property/PropertyMappingTest.php index a6380922d9e..d1213b443a9 100644 --- a/tests/Unit/Bundle/ESIndexingBundle/Property/PropertyMappingTest.php +++ b/tests/Unit/Bundle/ESIndexingBundle/Property/PropertyMappingTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\ESIndexingBundle\Property; diff --git a/tests/Unit/Bundle/EmotionBundle/ComponentHandler/EventComponentHandlerTest.php b/tests/Unit/Bundle/EmotionBundle/ComponentHandler/EventComponentHandlerTest.php index fcdf34b83e2..aec3ce2febf 100644 --- a/tests/Unit/Bundle/EmotionBundle/ComponentHandler/EventComponentHandlerTest.php +++ b/tests/Unit/Bundle/EmotionBundle/ComponentHandler/EventComponentHandlerTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\EmotionBundle\ComponentHandler; diff --git a/tests/Unit/Bundle/EsBackendBundle/SearchQueryBuilderTest.php b/tests/Unit/Bundle/EsBackendBundle/SearchQueryBuilderTest.php index cfbbe482904..45b6bd47719 100644 --- a/tests/Unit/Bundle/EsBackendBundle/SearchQueryBuilderTest.php +++ b/tests/Unit/Bundle/EsBackendBundle/SearchQueryBuilderTest.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\EsBackendBundle; diff --git a/tests/Unit/Bundle/FormBundle/StringRendererServiceTest.php b/tests/Unit/Bundle/FormBundle/StringRendererServiceTest.php index 20a78a42bd4..7d76b79d954 100644 --- a/tests/Unit/Bundle/FormBundle/StringRendererServiceTest.php +++ b/tests/Unit/Bundle/FormBundle/StringRendererServiceTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\FormBundle; diff --git a/tests/Unit/Bundle/FormBundle/fixtures/View.php b/tests/Unit/Bundle/FormBundle/fixtures/View.php index 4591dae3838..4e14a9b92a2 100644 --- a/tests/Unit/Bundle/FormBundle/fixtures/View.php +++ b/tests/Unit/Bundle/FormBundle/fixtures/View.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\FormBundle\fixtures; diff --git a/tests/Unit/Bundle/MediaBundle/CacheOptimizerServiceTest.php b/tests/Unit/Bundle/MediaBundle/CacheOptimizerServiceTest.php index 949d195228d..2478f7a220f 100644 --- a/tests/Unit/Bundle/MediaBundle/CacheOptimizerServiceTest.php +++ b/tests/Unit/Bundle/MediaBundle/CacheOptimizerServiceTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\MediaBundle; diff --git a/tests/Unit/Bundle/MediaBundle/CdnOptimizerServiceTest.php b/tests/Unit/Bundle/MediaBundle/CdnOptimizerServiceTest.php index d33aaeca038..0a2f7b2e129 100644 --- a/tests/Unit/Bundle/MediaBundle/CdnOptimizerServiceTest.php +++ b/tests/Unit/Bundle/MediaBundle/CdnOptimizerServiceTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\MediaBundle; diff --git a/tests/Unit/Bundle/MediaBundle/Commands/MediaOptimizeCommandTest.php b/tests/Unit/Bundle/MediaBundle/Commands/MediaOptimizeCommandTest.php index eeabf074b27..18c17dddf50 100644 --- a/tests/Unit/Bundle/MediaBundle/Commands/MediaOptimizeCommandTest.php +++ b/tests/Unit/Bundle/MediaBundle/Commands/MediaOptimizeCommandTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\MediaBundle\Commands; diff --git a/tests/Unit/Bundle/MediaBundle/GarbageCollectorTest.php b/tests/Unit/Bundle/MediaBundle/GarbageCollectorTest.php index 5262a77d562..90aa7306b10 100644 --- a/tests/Unit/Bundle/MediaBundle/GarbageCollectorTest.php +++ b/tests/Unit/Bundle/MediaBundle/GarbageCollectorTest.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\MediaBundle; diff --git a/tests/Unit/Bundle/MediaBundle/MediaExtensionMappingServiceTest.php b/tests/Unit/Bundle/MediaBundle/MediaExtensionMappingServiceTest.php index d97c9c5b255..2f883667bed 100644 --- a/tests/Unit/Bundle/MediaBundle/MediaExtensionMappingServiceTest.php +++ b/tests/Unit/Bundle/MediaBundle/MediaExtensionMappingServiceTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\MediaBundle; diff --git a/tests/Unit/Bundle/MediaBundle/OptimizerServiceTest.php b/tests/Unit/Bundle/MediaBundle/OptimizerServiceTest.php index 203b20a8342..8f0c214fa41 100644 --- a/tests/Unit/Bundle/MediaBundle/OptimizerServiceTest.php +++ b/tests/Unit/Bundle/MediaBundle/OptimizerServiceTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\MediaBundle; diff --git a/tests/Unit/Bundle/MediaBundle/Strategy/Md5StrategyTest.php b/tests/Unit/Bundle/MediaBundle/Strategy/Md5StrategyTest.php index e5c925f6ff2..5e5b26f561a 100644 --- a/tests/Unit/Bundle/MediaBundle/Strategy/Md5StrategyTest.php +++ b/tests/Unit/Bundle/MediaBundle/Strategy/Md5StrategyTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\MediaBundle\Strategy; diff --git a/tests/Unit/Bundle/MediaBundle/Strategy/PlainStrategyTest.php b/tests/Unit/Bundle/MediaBundle/Strategy/PlainStrategyTest.php index f7c9f05d986..95746bdb9ff 100644 --- a/tests/Unit/Bundle/MediaBundle/Strategy/PlainStrategyTest.php +++ b/tests/Unit/Bundle/MediaBundle/Strategy/PlainStrategyTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\MediaBundle\Strategy; diff --git a/tests/Unit/Bundle/OrderBundle/ShippingConstServiceTest.php b/tests/Unit/Bundle/OrderBundle/ShippingConstServiceTest.php index 0c800b238db..52a4fc0d091 100644 --- a/tests/Unit/Bundle/OrderBundle/ShippingConstServiceTest.php +++ b/tests/Unit/Bundle/OrderBundle/ShippingConstServiceTest.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\OrderBundle; diff --git a/tests/Unit/Bundle/PluginInstallerBundle/Fixtures/TestPlugin/TestPlugin.php b/tests/Unit/Bundle/PluginInstallerBundle/Fixtures/TestPlugin/TestPlugin.php index 315f38acf4b..a48c9ca9d54 100644 --- a/tests/Unit/Bundle/PluginInstallerBundle/Fixtures/TestPlugin/TestPlugin.php +++ b/tests/Unit/Bundle/PluginInstallerBundle/Fixtures/TestPlugin/TestPlugin.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace TestPlugin; diff --git a/tests/Unit/Bundle/PluginInstallerBundle/Service/PluginInstallerTest.php b/tests/Unit/Bundle/PluginInstallerBundle/Service/PluginInstallerTest.php index 9ed64036afb..b05db2ac057 100644 --- a/tests/Unit/Bundle/PluginInstallerBundle/Service/PluginInstallerTest.php +++ b/tests/Unit/Bundle/PluginInstallerBundle/Service/PluginInstallerTest.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\PluginInstallerBundle\Service; diff --git a/tests/Unit/Bundle/PluginInstallerBundle/UniqueIdGenerator/UniqueIdGeneratorTest.php b/tests/Unit/Bundle/PluginInstallerBundle/UniqueIdGenerator/UniqueIdGeneratorTest.php index fe371679bcc..3efc3448391 100644 --- a/tests/Unit/Bundle/PluginInstallerBundle/UniqueIdGenerator/UniqueIdGeneratorTest.php +++ b/tests/Unit/Bundle/PluginInstallerBundle/UniqueIdGenerator/UniqueIdGeneratorTest.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\PluginInstallerBundle\UniqueIdGenerator; diff --git a/tests/Unit/Bundle/SearchBundle/BatchProductNumberSearchTest.php b/tests/Unit/Bundle/SearchBundle/BatchProductNumberSearchTest.php index e13f29b1847..14f874c0769 100644 --- a/tests/Unit/Bundle/SearchBundle/BatchProductNumberSearchTest.php +++ b/tests/Unit/Bundle/SearchBundle/BatchProductNumberSearchTest.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\SearchBundle; diff --git a/tests/Unit/Bundle/SearchBundle/BatchProductSearchTest.php b/tests/Unit/Bundle/SearchBundle/BatchProductSearchTest.php index b520e616c89..e8e36b91713 100644 --- a/tests/Unit/Bundle/SearchBundle/BatchProductSearchTest.php +++ b/tests/Unit/Bundle/SearchBundle/BatchProductSearchTest.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\SearchBundle; diff --git a/tests/Unit/Bundle/SearchBundle/CriteriaTest.php b/tests/Unit/Bundle/SearchBundle/CriteriaTest.php index c1431e7598c..bab4d771fa1 100644 --- a/tests/Unit/Bundle/SearchBundle/CriteriaTest.php +++ b/tests/Unit/Bundle/SearchBundle/CriteriaTest.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\SearchBundle; diff --git a/tests/Unit/Bundle/SearchBundleDBAL/SearchTerm/TermHelperTest.php b/tests/Unit/Bundle/SearchBundleDBAL/SearchTerm/TermHelperTest.php index 0ace0a2bd1e..f27fa72b63c 100644 --- a/tests/Unit/Bundle/SearchBundleDBAL/SearchTerm/TermHelperTest.php +++ b/tests/Unit/Bundle/SearchBundleDBAL/SearchTerm/TermHelperTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\SearchBundleDBAL\SearchTerm; diff --git a/tests/Unit/Bundle/SitemapBundle/Service/FilterContainerFactoryTest.php b/tests/Unit/Bundle/SitemapBundle/Service/FilterContainerFactoryTest.php index ff3aa0a72a9..5cb5391545a 100644 --- a/tests/Unit/Bundle/SitemapBundle/Service/FilterContainerFactoryTest.php +++ b/tests/Unit/Bundle/SitemapBundle/Service/FilterContainerFactoryTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\SitemapBundle\Service; diff --git a/tests/Unit/Bundle/SitemapBundle/Service/UrlFilterTest.php b/tests/Unit/Bundle/SitemapBundle/Service/UrlFilterTest.php index d17ea33c2ca..290c7b8579f 100644 --- a/tests/Unit/Bundle/SitemapBundle/Service/UrlFilterTest.php +++ b/tests/Unit/Bundle/SitemapBundle/Service/UrlFilterTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\SitemapBundle\Service; diff --git a/tests/Unit/Bundle/SitemapBundle/SitemapListenerTest.php b/tests/Unit/Bundle/SitemapBundle/SitemapListenerTest.php index a42f5a39f22..88c08155fc8 100644 --- a/tests/Unit/Bundle/SitemapBundle/SitemapListenerTest.php +++ b/tests/Unit/Bundle/SitemapBundle/SitemapListenerTest.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\SitemapBundle; diff --git a/tests/Unit/Bundle/SitemapBundle/SitemapLockTest.php b/tests/Unit/Bundle/SitemapBundle/SitemapLockTest.php index 6c156f7338f..b5b162ef8fb 100644 --- a/tests/Unit/Bundle/SitemapBundle/SitemapLockTest.php +++ b/tests/Unit/Bundle/SitemapBundle/SitemapLockTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\SitemapBundle; diff --git a/tests/Unit/Bundle/SitemapBundle/SitemapNameGeneratorTest.php b/tests/Unit/Bundle/SitemapBundle/SitemapNameGeneratorTest.php index 08266de2278..0d66faff1b6 100644 --- a/tests/Unit/Bundle/SitemapBundle/SitemapNameGeneratorTest.php +++ b/tests/Unit/Bundle/SitemapBundle/SitemapNameGeneratorTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\SitemapBundle; diff --git a/tests/Unit/Bundle/SitemapBundle/UrlFilter/BaseTest.php b/tests/Unit/Bundle/SitemapBundle/UrlFilter/BaseTest.php index 38c230c8a28..b1d6b981ffb 100644 --- a/tests/Unit/Bundle/SitemapBundle/UrlFilter/BaseTest.php +++ b/tests/Unit/Bundle/SitemapBundle/UrlFilter/BaseTest.php @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\SitemapBundle\UrlFilter; diff --git a/tests/Unit/Bundle/SitemapBundle/UrlFilter/Example.php b/tests/Unit/Bundle/SitemapBundle/UrlFilter/Example.php index 74c3e3da25f..8cb69bcde3e 100644 --- a/tests/Unit/Bundle/SitemapBundle/UrlFilter/Example.php +++ b/tests/Unit/Bundle/SitemapBundle/UrlFilter/Example.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\SitemapBundle\UrlFilter; diff --git a/tests/Unit/Bundle/StoreFrontBundle/Gateway/Dbal/ProductHydratorTest.php b/tests/Unit/Bundle/StoreFrontBundle/Gateway/Dbal/ProductHydratorTest.php index d9ad238498a..a8ba4e4ece1 100644 --- a/tests/Unit/Bundle/StoreFrontBundle/Gateway/Dbal/ProductHydratorTest.php +++ b/tests/Unit/Bundle/StoreFrontBundle/Gateway/Dbal/ProductHydratorTest.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ namespace Shopware\Tests\Unit\Bundle\StoreFrontBundle\Gateway\Dbal; diff --git a/tests/Unit/Bundle/StoreFrontBundle/Gateway/Dbal/_fixtures/ProductData.php b/tests/Unit/Bundle/StoreFrontBundle/Gateway/Dbal/_fixtures/ProductData.php index fa19fde0368..1a6ed84387f 100644 --- a/tests/Unit/Bundle/StoreFrontBundle/Gateway/Dbal/_fixtures/ProductData.php +++ b/tests/Unit/Bundle/StoreFrontBundle/Gateway/Dbal/_fixtures/ProductData.php @@ -5,23 +5,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ return [ diff --git a/tests/Unit/Bundle/StoreFrontBundle/Service/BlogServiceTest.php b/tests/Unit/Bundle/StoreFrontBundle/Service/BlogServiceTest.php index d3aca3b4340..7cc243d28d9 100644 --- a/tests/Unit/Bundle/StoreFrontBundle/Service/BlogServiceTest.php +++ b/tests/Unit/Bundle/StoreFrontBundle/Service/BlogServiceTest.php @@ -1,28 +1,26 @@ Date: Wed, 6 Sep 2023 10:01:10 +0200 Subject: [PATCH 462/730] fix: Change license header in JavaScript files --- .../components/Enlight.app.Controller.js | 17 +++++++------- .../components/Enlight.app.SubApplication.js | 17 +++++++------- .../ExtJs/components/Enlight.app.SubWindow.js | 17 +++++++------- .../ExtJs/components/Enlight.app.Window.js | 17 +++++++------- .../Enlight.app.WindowManagement.js | 17 +++++++------- .../Enlight.form.mixin.HelpSupportElements.js | 17 +++++++------- .../ExtJs/components/Ext.util.FileUpload.js | 17 +++++++------- engine/Library/ExtJs/overrides/Ext.Ajax.js | 19 ++++++++-------- engine/Library/ExtJs/overrides/Ext.Base.js | 19 ++++++++-------- .../ExtJs/overrides/Ext.ClassManager.js | 17 +++++++------- .../Library/ExtJs/overrides/Ext.LoadMask.js | 19 ++++++++-------- engine/Library/ExtJs/overrides/Ext.Loader.js | 19 ++++++++-------- .../Library/ExtJs/overrides/Ext.MessageBox.js | 19 ++++++++-------- engine/Library/ExtJs/overrides/Ext.String.js | 19 ++++++++-------- .../Library/ExtJs/overrides/Ext.Template.js | 19 ++++++++-------- engine/Library/ExtJs/overrides/Ext.Timeout.js | 19 ++++++++-------- .../ExtJs/overrides/Ext.app.Application.js | 17 +++++++------- .../ExtJs/overrides/Ext.app.Controller.js | 19 ++++++++-------- .../ExtJs/overrides/Ext.app.EventBus.js | 19 ++++++++-------- .../ExtJs/overrides/Ext.button.Button.js | 19 ++++++++-------- .../Ext.container.DockingContainer.js | 17 +++++++------- .../ExtJs/overrides/Ext.data.proxy.Server.js | 19 ++++++++-------- .../Library/ExtJs/overrides/Ext.form.Field.js | 17 +++++++------- .../overrides/Ext.form.field.ComboBox.js | 19 ++++++++-------- .../ExtJs/overrides/Ext.form.field.Display.js | 19 ++++++++-------- .../overrides/Ext.form.field.HtmlEditor.js | 19 ++++++++-------- .../ExtJs/overrides/Ext.form.field.Number.js | 19 ++++++++-------- .../ExtJs/overrides/Ext.form.field.Time.js | 19 ++++++++-------- .../ExtJs/overrides/Ext.grid.RowEditor.js | 19 ++++++++-------- .../ExtJs/overrides/Ext.grid.column.Action.js | 19 ++++++++-------- .../overrides/Ext.grid.header.Container.js | 19 ++++++++-------- .../Library/ExtJs/overrides/Ext.menu.Menu.js | 19 ++++++++-------- .../ExtJs/overrides/Ext.panel.Panel.js | 19 ++++++++-------- .../ExtJs/overrides/Ext.picker.Date.js | 19 ++++++++-------- engine/Library/ExtJs/overrides/Ext.tab.Tab.js | 19 ++++++++-------- .../ExtJs/overrides/Ext.toolbar.Paging.js | 19 ++++++++-------- .../Library/ExtJs/overrides/Ext.tree.Panel.js | 19 ++++++++-------- .../ExtJs/overrides/Ext.view.BoundList.js | 19 ++++++++-------- .../Library/ExtJs/overrides/Ext.view.Table.js | 19 ++++++++-------- .../backend/index/view/swag_update_menu.js | 17 +++++++------- .../Views/backend/swag_update/app.js | 17 +++++++------- .../backend/swag_update/controller/main.js | 17 +++++++------- .../swag_update/controller/progress.js | 17 +++++++------- .../backend/swag_update/model/changelog.js | 17 +++++++------- .../backend/swag_update/model/plugins.js | 17 +++++++------- .../backend/swag_update/model/requirement.js | 17 +++++++------- .../backend/swag_update/store/changelog.js | 17 +++++++------- .../backend/swag_update/store/plugins.js | 17 +++++++------- .../backend/swag_update/store/requirements.js | 17 +++++++------- .../backend/swag_update/view/no_update.js | 17 +++++++------- .../backend/swag_update/view/progress.js | 17 +++++++------- .../view/security_update_window.js | 17 +++++++------- .../Views/backend/swag_update/view/window.js | 17 +++++++------- .../payment_methods/controller/detail.js | 17 +++++++------- .../payment_methods/controller/detail.js | 17 +++++++------- .../resources/css/core-icon-set-new.css | 17 +++++++------- .../resources/css/core-icon-set.css | 17 +++++++------- .../resources/css/extra-icon-set-01.css | 17 +++++++------- .../resources/css/extra-icon-set-02.css | 17 +++++++------- .../resources/css/extra-icon-set-03.css | 17 +++++++------- .../resources/css/extra-icon-set-04.css | 17 +++++++------- .../resources/css/extra-icon-set-05.css | 17 +++++++------- .../resources/css/extra-icon-set-06.css | 17 +++++++------- .../resources/css/extra-icon-set-07.css | 17 +++++++------- .../resources/css/extra-icon-set-08.css | 17 +++++++------- .../_resources/resources/sass/ext-all.scss | 17 +++++++------- .../stylesheets/shopware-ui/_legacy.scss | 17 +++++++------- .../stylesheets/shopware-ui/_mixins.scss | 17 +++++++------- .../stylesheets/shopware-ui/_modules.scss | 17 +++++++------- .../stylesheets/shopware-ui/_widgets.scss | 19 +++++++--------- .../shopware-ui/modules/_analytics.scss | 17 +++++++------- .../shopware-ui/modules/_article.scss | 17 +++++++------- .../shopware-ui/modules/_banner.scss | 17 +++++++------- .../shopware-ui/modules/_blog.scss | 17 +++++++------- .../shopware-ui/modules/_customerlist.scss | 17 +++++++------- .../shopware-ui/modules/_emotions.scss | 19 ++++++++-------- .../shopware-ui/modules/_login.scss | 17 +++++++------- .../shopware-ui/modules/_mediamanager.scss | 17 +++++++------- .../shopware-ui/modules/_orderlist.scss | 17 +++++++------- .../shopware-ui/modules/_theme.scss | 17 +++++++------- .../shopware-ui/modules/_widgets.scss | 17 +++++++------- .../shopware-ui/variables/_button.scss | 17 +++++++------- .../shopware-ui/variables/_fieldset.scss | 17 +++++++------- .../shopware-ui/variables/_panel.scss | 17 +++++++------- .../shopware-ui/variables/_toolbar.scss | 17 +++++++------- .../shopware-ui/variables/_viewport.scss | 17 +++++++------- .../shopware-ui/variables/_window.scss | 17 +++++++------- .../shopware-ui/widgets/_accordion.scss | 17 +++++++------- .../shopware-ui/widgets/_article-dd.scss | 17 +++++++------- .../shopware-ui/widgets/_boundlist.scss | 17 +++++++------- .../shopware-ui/widgets/_button.scss | 17 +++++++------- .../shopware-ui/widgets/_datepicker.scss | 17 +++++++------- .../shopware-ui/widgets/_desktopswitcher.scss | 17 +++++++------- .../shopware-ui/widgets/_grid.scss | 17 +++++++------- .../shopware-ui/widgets/_headertooltip.scss | 17 +++++++------- .../shopware-ui/widgets/_keynav.scss | 17 +++++++------- .../shopware-ui/widgets/_loadmask.scss | 17 +++++++------- .../shopware-ui/widgets/_login.scss | 17 +++++++------- .../shopware-ui/widgets/_mediadropzone.scss | 17 +++++++------- .../shopware-ui/widgets/_menu.scss | 17 +++++++------- .../shopware-ui/widgets/_notification.scss | 17 +++++++------- .../shopware-ui/widgets/_panel.scss | 17 +++++++------- .../shopware-ui/widgets/_progressbar.scss | 17 +++++++------- .../shopware-ui/widgets/_rowediting.scss | 17 +++++++------- .../stylesheets/shopware-ui/widgets/_tab.scss | 17 +++++++------- .../shopware-ui/widgets/_toolbar.scss | 17 +++++++------- .../shopware-ui/widgets/_tooltip.scss | 17 +++++++------- .../shopware-ui/widgets/_tree.scss | 17 +++++++------- .../shopware-ui/widgets/_viewport.scss | 17 +++++++------- .../shopware-ui/widgets/_widgets.scss | 17 +++++++------- .../shopware-ui/widgets/_window.scss | 17 +++++++------- .../shopware-ui/widgets/form/_all.scss | 17 +++++++------- .../shopware-ui/widgets/form/_fieldset.scss | 18 +++++++-------- .../shopware-ui/widgets/form/_panel.scss | 17 +++++++------- .../shopware-ui/widgets/form/field/_all.scss | 17 +++++++------- .../widgets/form/field/_boxselect.scss | 17 +++++++------- .../widgets/form/field/_checkbox.scss | 17 +++++++------- .../widgets/form/field/_combobox.scss | 17 +++++++------- .../widgets/form/field/_datefield.scss | 17 +++++++------- .../widgets/form/field/_filefield.scss | 17 +++++++------- .../widgets/form/field/_itemselector.scss | 17 +++++++------- .../form/field/_livearticlesearch.scss | 17 +++++++------- .../widgets/form/field/_mediaselection.scss | 17 +++++++------- .../widgets/form/field/_numberfield.scss | 17 +++++++------- .../widgets/form/field/_passwordstrength.scss | 17 +++++++------- .../widgets/form/field/_radiobox.scss | 17 +++++++------- .../widgets/form/field/_slider.scss | 17 +++++++------- .../widgets/form/field/_textfield.scss | 17 +++++++------- .../widgets/form/field/_timefield.scss | 17 +++++++------- .../widgets/form/field/_tinymce.scss | 17 +++++++------- themes/Backend/ExtJs/backend/analytics/app.js | 17 +++++++------- .../backend/analytics/controller/main.js | 17 +++++++------- .../analytics/controller/referrer_visitors.js | 17 +++++++------- .../backend/analytics/model/navigation.js | 17 +++++++------- .../ExtJs/backend/analytics/store/data.js | 17 +++++++------- .../backend/analytics/store/navigation.js | 17 +++++++------- .../store/navigation/article_impressions.js | 17 +++++++------- .../store/navigation/article_sales.js | 17 +++++++------- .../store/navigation/calendar_weeks.js | 17 +++++++------- .../analytics/store/navigation/categories.js | 17 +++++++------- .../analytics/store/navigation/countries.js | 17 +++++++------- .../store/navigation/customer_age.js | 17 +++++++------- .../store/navigation/customer_groups.js | 17 +++++++------- .../analytics/store/navigation/customers.js | 17 +++++++------- .../store/navigation/device_types.js | 17 +++++++------- .../analytics/store/navigation/month.js | 17 +++++++------- .../analytics/store/navigation/overview.js | 17 +++++++------- .../store/navigation/partner_revenue.js | 17 +++++++------- .../analytics/store/navigation/payment.js | 17 +++++++------- .../analytics/store/navigation/rating.js | 17 +++++++------- .../store/navigation/referrer_revenue.js | 17 +++++++------- .../store/navigation/referrer_visitors.js | 17 +++++++------- .../analytics/store/navigation/search.js | 17 +++++++------- .../store/navigation/search_terms.js | 17 +++++++------- .../analytics/store/navigation/search_urls.js | 17 +++++++------- .../store/navigation/shipping_methods.js | 17 +++++++------- .../analytics/store/navigation/time.js | 17 +++++++------- .../analytics/store/navigation/vendors.js | 17 +++++++------- .../analytics/store/navigation/visitors.js | 17 +++++++------- .../analytics/store/navigation/weekdays.js | 17 +++++++------- .../ExtJs/backend/analytics/store/shop.js | 17 +++++++------- .../backend/analytics/view/chart/category.js | 17 +++++++------- .../backend/analytics/view/chart/country.js | 17 +++++++------- .../analytics/view/chart/customer_age.js | 17 +++++++------- .../analytics/view/chart/customer_group.js | 17 +++++++------- .../backend/analytics/view/chart/customers.js | 17 +++++++------- .../backend/analytics/view/chart/daytime.js | 17 +++++++------- .../analytics/view/chart/device_types.js | 17 +++++++------- .../backend/analytics/view/chart/dispatch.js | 17 +++++++------- .../backend/analytics/view/chart/month.js | 17 +++++++------- .../analytics/view/chart/partner_revenue.js | 17 +++++++------- .../backend/analytics/view/chart/payment.js | 17 +++++++------- .../backend/analytics/view/chart/supplier.js | 17 +++++++------- .../backend/analytics/view/chart/visitors.js | 17 +++++++------- .../backend/analytics/view/chart/week.js | 17 +++++++------- .../backend/analytics/view/chart/weekday.js | 17 +++++++------- .../backend/analytics/view/main/chart.js | 17 +++++++------- .../backend/analytics/view/main/navigation.js | 17 +++++++------- .../backend/analytics/view/main/panel.js | 17 +++++++------- .../backend/analytics/view/main/table.js | 17 +++++++------- .../backend/analytics/view/main/toolbar.js | 17 +++++++------- .../backend/analytics/view/main/window.js | 17 +++++++------- .../view/table/article_impression.js | 17 +++++++------- .../analytics/view/table/article_sales.js | 17 +++++++------- .../backend/analytics/view/table/category.js | 17 +++++++------- .../backend/analytics/view/table/country.js | 17 +++++++------- .../analytics/view/table/customer_age.js | 17 +++++++------- .../analytics/view/table/customer_group.js | 17 +++++++------- .../backend/analytics/view/table/customers.js | 17 +++++++------- .../backend/analytics/view/table/daytime.js | 17 +++++++------- .../analytics/view/table/device_types.js | 17 +++++++------- .../backend/analytics/view/table/dispatch.js | 17 +++++++------- .../backend/analytics/view/table/month.js | 17 +++++++------- .../backend/analytics/view/table/overview.js | 17 +++++++------- .../analytics/view/table/partner_revenue.js | 17 +++++++------- .../backend/analytics/view/table/payment.js | 17 +++++++------- .../backend/analytics/view/table/rating.js | 17 +++++++------- .../analytics/view/table/referrer_revenue.js | 17 +++++++------- .../analytics/view/table/referrer_visitors.js | 17 +++++++------- .../backend/analytics/view/table/search.js | 17 +++++++------- .../analytics/view/table/search_terms.js | 17 +++++++------- .../analytics/view/table/search_urls.js | 17 +++++++------- .../backend/analytics/view/table/supplier.js | 17 +++++++------- .../backend/analytics/view/table/visitors.js | 17 +++++++------- .../backend/analytics/view/table/week.js | 17 +++++++------- .../backend/analytics/view/table/weekday.js | 17 +++++++------- themes/Backend/ExtJs/backend/app/growl.js | 17 +++++++------- themes/Backend/ExtJs/backend/article/app.js | 17 +++++++------- .../backend/article/controller/category.js | 17 +++++++------- .../article/controller/crossselling.js | 17 +++++++------- .../backend/article/controller/detail.js | 17 +++++++------- .../ExtJs/backend/article/controller/esd.js | 17 +++++++------- .../ExtJs/backend/article/controller/main.js | 17 +++++++------- .../ExtJs/backend/article/controller/media.js | 17 +++++++------- .../article/controller/price_variation.js | 17 +++++++------- .../backend/article/controller/statistic.js | 17 +++++++------- .../backend/article/controller/variant.js | 17 +++++++------- .../ExtJs/backend/article/model/accessory.js | 17 +++++++------- .../ExtJs/backend/article/model/article.js | 17 +++++++------- .../ExtJs/backend/article/model/batch.js | 17 +++++++------- .../ExtJs/backend/article/model/category.js | 17 +++++++------- .../backend/article/model/configurator.js | 17 +++++++------- .../article/model/configurator_group.js | 17 +++++++------- .../article/model/configurator_option.js | 17 +++++++------- .../backend/article/model/configurator_set.js | 17 +++++++------- .../article/model/configurator_template.js | 17 +++++++------- .../ExtJs/backend/article/model/dependency.js | 17 +++++++------- .../ExtJs/backend/article/model/detail.js | 17 +++++++------- .../ExtJs/backend/article/model/download.js | 17 +++++++------- .../article/model/download_attribute.js | 17 +++++++------- .../ExtJs/backend/article/model/esd.js | 17 +++++++------- .../backend/article/model/esd_attribute.js | 17 +++++++------- .../ExtJs/backend/article/model/esd_file.js | 17 +++++++------- .../ExtJs/backend/article/model/field.js | 17 +++++++------- .../ExtJs/backend/article/model/link.js | 17 +++++++------- .../backend/article/model/link_attribute.js | 17 +++++++------- .../ExtJs/backend/article/model/mapping.js | 17 +++++++------- .../ExtJs/backend/article/model/media.js | 17 +++++++------- .../backend/article/model/media_attribute.js | 17 +++++++------- .../backend/article/model/media_mapping.js | 17 +++++++------- .../article/model/media_mapping_rule.js | 17 +++++++------- .../ExtJs/backend/article/model/price.js | 17 +++++++------- .../backend/article/model/price_attribute.js | 17 +++++++------- .../backend/article/model/price_group.js | 17 +++++++------- .../backend/article/model/price_variation.js | 17 +++++++------- .../ExtJs/backend/article/model/property.js | 17 +++++++------- .../backend/article/model/property_group.js | 17 +++++++------- .../backend/article/model/property_option.js | 17 +++++++------- .../backend/article/model/seo_category.js | 17 +++++++------- .../ExtJs/backend/article/model/serial.js | 17 +++++++------- .../ExtJs/backend/article/model/similar.js | 17 +++++++------- .../ExtJs/backend/article/model/statistic.js | 17 +++++++------- .../ExtJs/backend/article/model/stream.js | 17 +++++++------- .../ExtJs/backend/article/model/template.js | 17 +++++++------- .../ExtJs/backend/article/model/unit.js | 17 +++++++------- .../ExtJs/backend/article/store/batch.js | 17 +++++++------- .../backend/article/store/category_path.js | 17 +++++++------- .../backend/article/store/category_tree.js | 17 +++++++------- .../backend/article/store/configurator_set.js | 17 +++++++------- .../ExtJs/backend/article/store/dependency.js | 17 +++++++------- .../ExtJs/backend/article/store/detail.js | 17 +++++++------- .../ExtJs/backend/article/store/esd.js | 17 +++++++------- .../ExtJs/backend/article/store/esd_file.js | 17 +++++++------- .../ExtJs/backend/article/store/group.js | 17 +++++++------- .../backend/article/store/media_mapping.js | 17 +++++++------- .../ExtJs/backend/article/store/option.js | 17 +++++++------- .../ExtJs/backend/article/store/property.js | 17 +++++++------- .../ExtJs/backend/article/store/serial.js | 17 +++++++------- .../ExtJs/backend/article/store/statistic.js | 17 +++++++------- .../ExtJs/backend/article/store/variant.js | 17 +++++++------- .../ExtJs/backend/article/store/variation.js | 17 +++++++------- .../article/view/category/drop_zone.js | 17 +++++++------- .../backend/article/view/category/list.js | 17 +++++++------- .../backend/article/view/category/seo.js | 17 +++++++------- .../backend/article/view/category/tree.js | 17 +++++++------- .../backend/article/view/crossselling/base.js | 17 +++++++------- .../view/crossselling/product_streams.js | 17 +++++++------- .../backend/article/view/crossselling/tab.js | 17 +++++++------- .../ExtJs/backend/article/view/detail/base.js | 17 +++++++------- .../backend/article/view/detail/prices.js | 17 +++++++------- .../backend/article/view/detail/properties.js | 17 +++++++------- .../backend/article/view/detail/settings.js | 17 +++++++------- .../backend/article/view/detail/toolbar.js | 17 +++++++------- .../backend/article/view/detail/window.js | 17 +++++++------- .../ExtJs/backend/article/view/esd/detail.js | 17 +++++++------- .../ExtJs/backend/article/view/esd/list.js | 17 +++++++------- .../ExtJs/backend/article/view/esd/serials.js | 17 +++++++------- .../backend/article/view/image/data_view.js | 17 +++++++------- .../backend/article/view/image/drop_zone.js | 17 +++++++------- .../ExtJs/backend/article/view/image/info.js | 17 +++++++------- .../ExtJs/backend/article/view/image/list.js | 17 +++++++------- .../backend/article/view/image/mapping.js | 17 +++++++------- .../backend/article/view/image/new_rule.js | 17 +++++++------- .../backend/article/view/image/progress.js | 17 +++++++------- .../article/view/resources/downloads.js | 17 +++++++------- .../backend/article/view/resources/links.js | 17 +++++++------- .../backend/article/view/statistics/chart.js | 17 +++++++------- .../backend/article/view/statistics/list.js | 17 +++++++------- .../article/view/variant/configurator.js | 17 +++++++------- .../view/variant/configurator/dependency.js | 17 +++++++------- .../view/variant/configurator/group_edit.js | 17 +++++++------- .../view/variant/configurator/mapping.js | 17 +++++++------- .../view/variant/configurator/option_edit.js | 17 +++++++------- .../variant/configurator/price_variation.js | 17 +++++++------- .../configurator/price_variation_rule.js | 17 +++++++------- .../article/view/variant/configurator/sets.js | 17 +++++++------- .../view/variant/configurator/template.js | 17 +++++++------- .../backend/article/view/variant/detail.js | 17 +++++++------- .../view/variant/image_relation_process.js | 17 +++++++------- .../backend/article/view/variant/list.js | 17 +++++++------- .../article/view/variant/number_progress.js | 17 +++++++------- .../backend/article/view/variant/progress.js | 17 +++++++------- .../Backend/ExtJs/backend/article_list/app.js | 17 +++++++------- .../article_list/controller/article_crud.js | 17 +++++++------- .../backend/article_list/controller/backup.js | 17 +++++++------- .../article_list/controller/batch_process.js | 17 +++++++------- .../controller/category_filter.js | 17 +++++++------- .../backend/article_list/controller/filter.js | 17 +++++++------- .../backend/article_list/controller/list.js | 17 +++++++------- .../backend/article_list/controller/main.js | 17 +++++++------- .../article_list/controller/split_view.js | 17 +++++++------- .../article_list/controller/suggest.js | 17 +++++++------- .../backend/article_list/model/backup.js | 17 +++++++------- .../backend/article_list/model/detail.js | 17 +++++++------- .../article_list/model/editable_column.js | 17 +++++++------- .../backend/article_list/model/filter.js | 17 +++++++------- .../backend/article_list/model/operation.js | 17 +++++++------- .../backend/article_list/model/operator.js | 17 +++++++------- .../backend/article_list/resource/lexer.js | 17 +++++++------- .../backend/article_list/resource/parser.js | 17 +++++++------- .../article_list/resource/tokenizer.js | 17 +++++++------- .../backend/article_list/store/backup.js | 17 +++++++------- .../backend/article_list/store/detail.js | 17 +++++++------- .../article_list/store/editable_columns.js | 17 +++++++------- .../backend/article_list/store/filter.js | 17 +++++++------- .../backend/article_list/store/operation.js | 17 +++++++------- .../backend/article_list/store/operator.js | 17 +++++++------- .../article_list/view/add_filter/grid.js | 17 +++++++------- .../article_list/view/add_filter/window.js | 17 +++++++------- .../backend/article_list/view/backup/grid.js | 17 +++++++------- .../article_list/view/backup/window.js | 17 +++++++------- .../article_list/view/batch_process/grid.js | 17 +++++++------- .../article_list/view/batch_process/window.js | 17 +++++++------- .../backend/article_list/view/filter_combo.js | 17 +++++++------- .../article_list/view/main/category_tree.js | 17 +++++++------- .../backend/article_list/view/main/grid.js | 17 +++++++------- .../article_list/view/main/multi_edit_menu.js | 17 +++++++------- .../article_list/view/main/navigation_grid.js | 17 +++++++------- .../backend/article_list/view/main/sidebar.js | 17 +++++++------- .../backend/article_list/view/main/window.js | 17 +++++++------- .../backend/article_list/view/query_field.js | 17 +++++++------- .../Backend/ExtJs/backend/attributes/app.js | 17 +++++++------- .../backend/attributes/controller/main.js | 17 +++++++------- .../ExtJs/backend/attributes/model/table.js | 17 +++++++------- .../ExtJs/backend/attributes/model/types.js | 17 +++++++------- .../ExtJs/backend/attributes/store/column.js | 17 +++++++------- .../attributes/store/depending_table.js | 17 +++++++------- .../backend/attributes/store/entities.js | 17 +++++++------- .../ExtJs/backend/attributes/store/table.js | 17 +++++++------- .../ExtJs/backend/attributes/store/types.js | 17 +++++++------- .../attributes/view/array_store_field.js | 17 +++++++------- .../ExtJs/backend/attributes/view/detail.js | 17 +++++++------- .../ExtJs/backend/attributes/view/listing.js | 17 +++++++------- .../ExtJs/backend/attributes/view/window.js | 17 +++++++------- themes/Backend/ExtJs/backend/banner/app.js | 17 +++++++------- .../ExtJs/backend/banner/controller/main.js | 17 +++++++------- .../backend/banner/model/banner_detail.js | 17 +++++++------- .../ExtJs/backend/banner/store/banner.js | 17 +++++++------- .../ExtJs/backend/banner/store/category.js | 17 +++++++------- .../Backend/ExtJs/backend/banner/view/main.js | 17 +++++++------- .../backend/banner/view/main/banner_form.js | 17 +++++++------- .../banner/view/main/banner_form_add.js | 17 +++++++------- .../ExtJs/backend/banner/view/main/panel.js | 17 +++++++------- .../base/application/Shopware.store.Search.js | 17 +++++++------- .../attribute/Shopware.attribute.Button.js | 17 +++++++------- ...hopware.attribute.FieldHandlerInterface.js | 17 +++++++------- .../base/attribute/Shopware.attribute.Form.js | 17 +++++++------- .../attribute/Shopware.attribute.Window.js | 17 +++++++------- .../Shopware.grid.plugin.Attribute.js | 17 +++++++------- ...are.form.field.AttributeSingleSelection.js | 17 +++++++------- .../field/Shopware.form.field.BlogGrid.js | 17 +++++++------- ...Shopware.form.field.BlogSingleSelection.js | 17 +++++++------- .../field/Shopware.form.field.CategoryGrid.js | 17 +++++++------- ...ware.form.field.CategorySingleSelection.js | 17 +++++++------- ...hopware.form.field.ContentTypeSelection.js | 17 +++++++------- .../field/Shopware.form.field.CountryGrid.js | 17 +++++++------- ...pware.form.field.CountrySingleSelection.js | 17 +++++++------- .../Shopware.form.field.CustomFacetGrid.js | 17 +++++++------- .../Shopware.form.field.CustomSortingGrid.js | 17 +++++++------- .../field/Shopware.form.field.CustomerGrid.js | 17 +++++++------- ...ware.form.field.CustomerSingleSelection.js | 17 +++++++------- .../Shopware.form.field.CustomerStreamGrid.js | 17 +++++++------- ...orm.field.CustomerStreamSingleSelection.js | 17 +++++++------- .../field/Shopware.form.field.DispatchGrid.js | 17 +++++++------- .../field/Shopware.form.field.EmotionGrid.js | 17 +++++++------- ...pware.form.field.EmotionSingleSelection.js | 17 +++++++------- .../field/Shopware.form.field.FormGrid.js | 17 +++++++------- ...Shopware.form.field.FormSingleSelection.js | 17 +++++++------- .../field/Shopware.form.field.Grid.js | 17 +++++++------- .../field/Shopware.form.field.GridView.js | 17 +++++++------- .../field/Shopware.form.field.MailGrid.js | 17 +++++++------- ...Shopware.form.field.MailSingleSelection.js | 17 +++++++------- .../field/Shopware.form.field.MediaGrid.js | 17 +++++++------- .../Shopware.form.field.NewsletterGrid.js | 17 +++++++------- ...re.form.field.NewsletterSingleSelection.js | 17 +++++++------- .../Shopware.form.field.OrderDetailGrid.js | 17 +++++++------- ...e.form.field.OrderDetailSingleSelection.js | 17 +++++++------- .../field/Shopware.form.field.PartnerGrid.js | 17 +++++++------- ...pware.form.field.PartnerSingleSelection.js | 17 +++++++------- .../field/Shopware.form.field.PaymentGrid.js | 17 +++++++------- ...pware.form.field.PaymentSingleSelection.js | 17 +++++++------- .../field/Shopware.form.field.PremiumGrid.js | 17 +++++++------- ...pware.form.field.PremiumSingleSelection.js | 17 +++++++------- .../Shopware.form.field.ProductFeedGrid.js | 17 +++++++------- ...e.form.field.ProductFeedSingleSelection.js | 17 +++++++------- .../field/Shopware.form.field.ProductGrid.js | 17 +++++++------- ...pware.form.field.ProductSingleSelection.js | 17 +++++++------- .../Shopware.form.field.ProductStreamGrid.js | 17 +++++++------- ...form.field.ProductStreamSingleSelection.js | 17 +++++++------- .../Shopware.form.field.PropertyOptionGrid.js | 17 +++++++------- ...orm.field.PropertyOptionSingleSelection.js | 17 +++++++------- .../field/Shopware.form.field.ShopGrid.js | 17 +++++++------- .../Shopware.form.field.SingleSelection.js | 17 +++++++------- .../field/Shopware.form.field.VoucherGrid.js | 17 +++++++------- ...pware.form.field.VoucherSingleSelection.js | 17 +++++++------- ...re.attribute.AbstractEntityFieldHandler.js | 17 +++++++------- .../Shopware.attribute.BlogFieldHandler.js | 17 +++++++------- .../Shopware.attribute.BooleanFieldHandler.js | 17 +++++++------- ...Shopware.attribute.CategoryFieldHandler.js | 17 +++++++------- ...Shopware.attribute.ComboBoxFieldHandler.js | 17 +++++++------- .../Shopware.attribute.CountryFieldHandler.js | 17 +++++++------- ...Shopware.attribute.CustomerFieldHandler.js | 17 +++++++------- ...re.attribute.CustomerStreamFieldHandler.js | 17 +++++++------- .../Shopware.attribute.DateFieldHandler.js | 17 +++++++------- ...Shopware.attribute.DateTimeFieldHandler.js | 17 +++++++------- ...Shopware.attribute.DispatchFieldHandler.js | 17 +++++++------- .../Shopware.attribute.EmotionFieldHandler.js | 17 +++++++------- .../Shopware.attribute.FloatFieldHandler.js | 17 +++++++------- .../Shopware.attribute.FormFieldHandler.js | 17 +++++++------- .../Shopware.attribute.HtmlFieldHandler.js | 17 +++++++------- .../Shopware.attribute.IntegerFieldHandler.js | 17 +++++++------- .../Shopware.attribute.MailFieldHandler.js | 17 +++++++------- .../Shopware.attribute.MediaFieldHandler.js | 17 +++++++------- ...re.attribute.MultiSelectionFieldHandler.js | 17 +++++++------- ...opware.attribute.NewsletterFieldHandler.js | 17 +++++++------- .../Shopware.attribute.NoUrlFieldHandler.js | 17 +++++++------- ...pware.attribute.OrderDetailFieldHandler.js | 17 +++++++------- .../Shopware.attribute.PartnerFieldHandler.js | 17 +++++++------- .../Shopware.attribute.PaymentFieldHandler.js | 17 +++++++------- .../Shopware.attribute.PremiumFieldHandler.js | 17 +++++++------- ...pware.attribute.ProductFeedFieldHandler.js | 17 +++++++------- .../Shopware.attribute.ProductFieldHandler.js | 17 +++++++------- ...are.attribute.ProductStreamFieldHandler.js | 17 +++++++------- ...re.attribute.PropertyOptionFieldHandler.js | 17 +++++++------- .../Shopware.attribute.ShopFieldHandler.js | 17 +++++++------- ...e.attribute.SingleSelectionFieldHandler.js | 17 +++++++------- .../Shopware.attribute.StringFieldHandler.js | 17 +++++++------- ...Shopware.attribute.TextAreaFieldHandler.js | 17 +++++++------- .../Shopware.attribute.VoucherFieldHandler.js | 17 +++++++------- .../Shopware.attribute.SelectionFactory.js | 17 +++++++------- .../backend/base/attribute/model/dynamic.js | 17 +++++++------- .../base/attribute/model/dynamic_reader.js | 17 +++++++------- .../Backend/ExtJs/backend/base/bootstrap.js | 17 +++++++------- .../Shopware.DataView.GooglePreview.js | 17 +++++++------- .../component/Shopware.DragAndDropSelector.js | 17 +++++++------- .../Shopware.MediaManager.MediaSelection.js | 17 +++++++------- ...hopware.MediaManager.MediaTextSelection.js | 17 +++++++------- .../base/component/Shopware.ModuleManager.js | 17 +++++++------- .../base/component/Shopware.Notification.js | 17 +++++++------- .../backend/base/component/Shopware.VTypes.js | 17 +++++++------- .../component/Shopware.button.HoverButton.js | 17 +++++++------- .../Shopware.component.IconPreloader.js | 17 +++++++------- .../component/Shopware.component.Preloader.js | 17 +++++++------- .../Shopware.component.ValidatePassword.js | 17 +++++++------- .../component/Shopware.container.Viewport.js | 17 +++++++------- .../Shopware.data.reader.Application.js | 17 +++++++------- .../Shopware.form.PasswordStrengthMeter.js | 17 +++++++------- .../component/Shopware.form.PluginPanel.js | 17 +++++++------- .../Shopware.form.field.AceEditor.js | 17 +++++++------- .../Shopware.form.field.ArticleSearch.js | 17 +++++++------- .../Shopware.form.field.ColorField.js | 17 +++++++------- .../Shopware.form.field.ComboTree.js | 17 +++++++------- .../Shopware.form.field.PagingComboBox.js | 17 +++++++------- ...pware.form.field.ProductStreamSelection.js | 17 +++++++------- .../component/Shopware.form.field.TinyMCE.js | 17 +++++++------- ...Shopware.form.plugin.SnippetTranslation.js | 17 +++++++------- .../Shopware.form.plugin.Translation.js | 17 +++++++------- .../Shopware.global.ErrorReporter.js | 17 +++++++------- .../component/Shopware.grid.HeaderToolTip.js | 17 +++++++------- .../component/Shopware.grid.Searchable.js | 19 ++++++++-------- .../Shopware.grid.plugin.Translation.js | 17 +++++++------- ...opware.notification.SubscriptionWarning.js | 17 +++++++------- .../Shopware.window.ExpiredPluginStop.js | 17 +++++++------- .../Shopware.window.ExpiredPluginWarning.js | 17 +++++++------- .../component/Shopware.window.SimpleModule.js | 17 +++++++------- .../component/Shopware.window.plugin.Hub.js | 17 +++++++------- .../backend/base/component/element/boolean.js | 19 ++++++++-------- .../base/component/element/boolean_select.js | 17 +++++++------- .../backend/base/component/element/button.js | 17 +++++++------- .../backend/base/component/element/color.js | 19 ++++++++-------- .../backend/base/component/element/date.js | 19 ++++++++-------- .../base/component/element/date_time.js | 19 ++++++++-------- .../base/component/element/fieldset.js | 17 +++++++------- .../backend/base/component/element/html.js | 17 +++++++------- .../base/component/element/interval.js | 17 +++++++------- .../element/listing_filter_mode_select.js | 17 +++++++------- .../base/component/element/media_selection.js | 19 ++++++++-------- .../component/element/media_text_selection.js | 19 ++++++++-------- .../backend/base/component/element/number.js | 17 +++++++------- .../element/product_box_layout_select.js | 22 +++++++++---------- .../backend/base/component/element/select.js | 17 +++++++------- .../base/component/element/select_tree.js | 17 +++++++------- .../backend/base/component/element/text.js | 17 +++++++------- .../base/component/element/textarea.js | 17 +++++++------- .../backend/base/component/element/time.js | 17 +++++++------- .../backend/base/frame/postmessage-api.js | 17 +++++++------- .../ExtJs/backend/base/model/address.js | 17 +++++++------- .../ExtJs/backend/base/model/article.js | 17 +++++++------- .../backend/base/model/billing_address.js | 17 +++++++------- .../Backend/ExtJs/backend/base/model/blog.js | 17 +++++++------- .../ExtJs/backend/base/model/captcha.js | 17 +++++++------- .../ExtJs/backend/base/model/category.js | 17 +++++++------- .../ExtJs/backend/base/model/cookie_mode.js | 17 +++++++------- .../backend/base/model/corner_position.js | 17 +++++++------- .../ExtJs/backend/base/model/country.js | 17 +++++++------- .../ExtJs/backend/base/model/country_area.js | 17 +++++++------- .../ExtJs/backend/base/model/country_state.js | 17 +++++++------- .../ExtJs/backend/base/model/currency.js | 17 +++++++------- .../ExtJs/backend/base/model/custom_facet.js | 17 +++++++------- .../backend/base/model/custom_sorting.js | 17 +++++++------- .../ExtJs/backend/base/model/customer.js | 17 +++++++------- .../backend/base/model/customer_group.js | 17 +++++++------- .../ExtJs/backend/base/model/dispatch.js | 17 +++++++------- .../ExtJs/backend/base/model/doc_type.js | 17 +++++++------- .../ExtJs/backend/base/model/element.js | 17 +++++++------- .../Backend/ExtJs/backend/base/model/form.js | 17 +++++++------- .../ExtJs/backend/base/model/landing_page.js | 17 +++++++------- .../ExtJs/backend/base/model/locale.js | 17 +++++++------- .../Backend/ExtJs/backend/base/model/media.js | 17 +++++++------- .../ExtJs/backend/base/model/order_status.js | 17 +++++++------- .../page_not_found_destination_options.js | 17 +++++++------- .../backend/base/model/password_encoder.js | 17 +++++++------- .../ExtJs/backend/base/model/payment.js | 17 +++++++------- .../backend/base/model/payment_status.js | 17 +++++++------- .../backend/base/model/position_status.js | 17 +++++++------- .../backend/base/model/product_box_layout.js | 17 +++++++------- .../Backend/ExtJs/backend/base/model/shop.js | 17 +++++++------- .../ExtJs/backend/base/model/static.js | 17 +++++++------- .../ExtJs/backend/base/model/supplier.js | 17 +++++++------- .../Backend/ExtJs/backend/base/model/tax.js | 17 +++++++------- .../ExtJs/backend/base/model/template.js | 17 +++++++------- .../Backend/ExtJs/backend/base/model/user.js | 17 +++++++------- .../Backend/ExtJs/backend/base/model/value.js | 17 +++++++------- .../ExtJs/backend/base/model/variant.js | 17 +++++++------- .../ExtJs/backend/base/store/article.js | 17 +++++++------- .../Backend/ExtJs/backend/base/store/blog.js | 17 +++++++------- .../ExtJs/backend/base/store/captcha.js | 17 +++++++------- .../ExtJs/backend/base/store/category.js | 17 +++++++------- .../ExtJs/backend/base/store/category_tree.js | 17 +++++++------- .../ExtJs/backend/base/store/cookie_mode.js | 17 +++++++------- .../backend/base/store/corner_position.js | 17 +++++++------- .../ExtJs/backend/base/store/country.js | 17 +++++++------- .../ExtJs/backend/base/store/country_area.js | 17 +++++++------- .../ExtJs/backend/base/store/country_state.js | 17 +++++++------- .../ExtJs/backend/base/store/currency.js | 17 +++++++------- .../ExtJs/backend/base/store/custom_facet.js | 17 +++++++------- .../backend/base/store/custom_sorting.js | 17 +++++++------- .../backend/base/store/customer_group.js | 17 +++++++------- .../ExtJs/backend/base/store/dispatch.js | 17 +++++++------- .../ExtJs/backend/base/store/doc_type.js | 17 +++++++------- .../Backend/ExtJs/backend/base/store/form.js | 17 +++++++------- .../ExtJs/backend/base/store/landing_page.js | 17 +++++++------- .../backend/base/store/listing_filter_mode.js | 17 +++++++------- .../ExtJs/backend/base/store/locale.js | 17 +++++++------- .../ExtJs/backend/base/store/order_status.js | 17 +++++++------- .../page_not_found_destination_options.js | 17 +++++++------- .../backend/base/store/password_encoder.js | 17 +++++++------- .../ExtJs/backend/base/store/payment.js | 17 +++++++------- .../backend/base/store/payment_status.js | 17 +++++++------- .../backend/base/store/position_status.js | 17 +++++++------- .../backend/base/store/product_box_layout.js | 17 +++++++------- .../ExtJs/backend/base/store/salutation.js | 17 +++++++------- .../Backend/ExtJs/backend/base/store/shop.js | 17 +++++++------- .../ExtJs/backend/base/store/shop_language.js | 17 +++++++------- .../ExtJs/backend/base/store/static.js | 17 +++++++------- .../ExtJs/backend/base/store/supplier.js | 17 +++++++------- .../Backend/ExtJs/backend/base/store/tax.js | 17 +++++++------- .../ExtJs/backend/base/store/template.js | 17 +++++++------- .../ExtJs/backend/base/store/translation.js | 17 +++++++------- .../Backend/ExtJs/backend/base/store/user.js | 17 +++++++------- .../ExtJs/backend/base/store/variant.js | 17 +++++++------- themes/Backend/ExtJs/backend/blog/app.js | 17 +++++++------- .../ExtJs/backend/blog/controller/blog.js | 17 +++++++------- .../ExtJs/backend/blog/controller/comment.js | 17 +++++++------- .../ExtJs/backend/blog/controller/main.js | 17 +++++++------- .../ExtJs/backend/blog/controller/media.js | 17 +++++++------- .../backend/blog/model/assigned_articles.js | 17 +++++++------- .../ExtJs/backend/blog/model/comment.js | 17 +++++++------- .../ExtJs/backend/blog/model/detail.js | 17 +++++++------- .../Backend/ExtJs/backend/blog/model/main.js | 17 +++++++------- .../Backend/ExtJs/backend/blog/model/media.js | 17 +++++++------- .../ExtJs/backend/blog/model/template.js | 17 +++++++------- .../Backend/ExtJs/backend/blog/model/tree.js | 17 +++++++------- .../ExtJs/backend/blog/store/category_path.js | 17 +++++++------- .../ExtJs/backend/blog/store/comment.js | 17 +++++++------- .../ExtJs/backend/blog/store/detail.js | 17 +++++++------- .../Backend/ExtJs/backend/blog/store/list.js | 17 +++++++------- .../ExtJs/backend/blog/store/template.js | 17 +++++++------- .../Backend/ExtJs/backend/blog/store/tree.js | 17 +++++++------- .../backend/blog/view/blog/detail/comments.js | 17 +++++++------- .../blog/view/blog/detail/comments/grid.js | 17 +++++++------- .../view/blog/detail/comments/info_panel.js | 17 +++++++------- .../backend/blog/view/blog/detail/main.js | 17 +++++++------- .../blog/detail/sidebar/assigned_articles.js | 17 +++++++------- .../blog/view/blog/detail/sidebar/options.js | 17 +++++++------- .../blog/view/blog/detail/sidebar/seo.js | 17 +++++++------- .../ExtJs/backend/blog/view/blog/list.js | 17 +++++++------- .../ExtJs/backend/blog/view/blog/tree.js | 17 +++++++------- .../ExtJs/backend/blog/view/blog/window.js | 17 +++++++------- .../ExtJs/backend/blog/view/main/window.js | 17 +++++++------- .../ExtJs/backend/canceled_order/app.js | 17 +++++++------- .../canceled_order/controller/basket.js | 17 +++++++------- .../backend/canceled_order/controller/main.js | 17 +++++++------- .../canceled_order/controller/order.js | 17 +++++++------- .../backend/canceled_order/model/articles.js | 17 +++++++------- .../backend/canceled_order/model/basket.js | 17 +++++++------- .../backend/canceled_order/model/order.js | 17 +++++++------- .../backend/canceled_order/model/position.js | 17 +++++++------- .../backend/canceled_order/model/statistic.js | 17 +++++++------- .../backend/canceled_order/model/viewports.js | 17 +++++++------- .../backend/canceled_order/model/voucher.js | 17 +++++++------- .../backend/canceled_order/store/articles.js | 17 +++++++------- .../backend/canceled_order/store/basket.js | 17 +++++++------- .../backend/canceled_order/store/order.js | 17 +++++++------- .../backend/canceled_order/store/statistic.js | 17 +++++++------- .../backend/canceled_order/store/viewports.js | 17 +++++++------- .../backend/canceled_order/store/voucher.js | 17 +++++++------- .../canceled_order/view/main/window.js | 17 +++++++------- .../view/tabs/baskets/articles.js | 17 +++++++------- .../canceled_order/view/tabs/baskets/main.js | 17 +++++++------- .../view/tabs/baskets/overview.js | 17 +++++++------- .../view/tabs/baskets/viewports.js | 17 +++++++------- .../canceled_order/view/tabs/order/detail.js | 17 +++++++------- .../canceled_order/view/tabs/order/main.js | 17 +++++++------- .../canceled_order/view/tabs/order/orders.js | 17 +++++++------- .../view/tabs/order/position.js | 17 +++++++------- .../canceled_order/view/tabs/statistics.js | 17 +++++++------- .../backend/canceled_order/view/toolbar.js | 17 +++++++------- themes/Backend/ExtJs/backend/category/app.js | 17 +++++++------- .../category/controller/article_mapping.js | 19 ++++++++-------- .../category/controller/duplicate_tasks.js | 17 +++++++------- .../ExtJs/backend/category/controller/main.js | 17 +++++++------- .../category/controller/manual_sorting.js | 17 +++++++------- .../category/controller/multi_request.js | 17 +++++++------- .../backend/category/controller/settings.js | 17 +++++++------- .../ExtJs/backend/category/controller/tree.js | 17 +++++++------- .../ExtJs/backend/category/model/detail.js | 17 +++++++------- .../ExtJs/backend/category/model/emotion.js | 17 +++++++------- .../backend/category/model/manual_sorting.js | 17 +++++++------- .../category/model/product_assignment.js | 17 +++++++------- .../ExtJs/backend/category/model/template.js | 17 +++++++------- .../ExtJs/backend/category/model/tree.js | 17 +++++++------- .../category/store/assigned_products.js | 17 +++++++------- .../category/store/available_products.js | 17 +++++++------- .../backend/category/store/category_path.js | 17 +++++++------- .../backend/category/store/customer_groups.js | 17 +++++++------- .../ExtJs/backend/category/store/detail.js | 17 +++++++------- .../backend/category/store/manual_sorting.js | 17 +++++++------- .../ExtJs/backend/category/store/template.js | 17 +++++++------- .../ExtJs/backend/category/store/tree.js | 17 +++++++------- .../view/category/tabs/article_mapping.js | 17 +++++++------- .../view/category/tabs/custom_listing.js | 17 +++++++------- .../view/category/tabs/restriction.js | 17 +++++++------- .../category/view/category/tabs/settings.js | 17 +++++++------- .../backend/category/view/category/tree.js | 17 +++++++------- .../backend/category/view/fields/shop_grid.js | 17 +++++++------- .../category/view/main/duplicate_settings.js | 17 +++++++------- .../category/view/main/duplicate_tasks.js | 17 +++++++------- .../category/view/main/multi_request_tasks.js | 17 +++++++------- .../backend/category/view/main/window.js | 17 +++++++------- .../backend/category/view/sorting/grid.js | 17 +++++++------- .../backend/category/view/sorting/tab.js | 17 +++++++------- .../backend/category/view/sorting/table.js | 17 +++++++------- themes/Backend/ExtJs/backend/config/app.js | 17 +++++++------- .../backend/config/controller/document.js | 17 +++++++------- .../ExtJs/backend/config/controller/form.js | 17 +++++++------- .../ExtJs/backend/config/controller/main.js | 17 +++++++------- .../backend/config/model/form/country.js | 17 +++++++------- .../backend/config/model/form/country_area.js | 17 +++++++------- .../backend/config/model/form/cron_job.js | 17 +++++++------- .../backend/config/model/form/currency.js | 17 +++++++------- .../config/model/form/customer_group.js | 17 +++++++------- .../backend/config/model/form/document.js | 17 +++++++------- .../config/model/form/document_element.js | 17 +++++++------- .../ExtJs/backend/config/model/form/locale.js | 17 +++++++------- .../ExtJs/backend/config/model/form/number.js | 17 +++++++------- .../backend/config/model/form/page_group.js | 17 +++++++------- .../backend/config/model/form/price_group.js | 17 +++++++------- .../backend/config/model/form/search_field.js | 17 +++++++------- .../backend/config/model/form/search_table.js | 17 +++++++------- .../ExtJs/backend/config/model/form/shop.js | 17 +++++++------- .../ExtJs/backend/config/model/form/tax.js | 17 +++++++------- .../ExtJs/backend/config/model/form/unit.js | 17 +++++++------- .../ExtJs/backend/config/model/form/widget.js | 17 +++++++------- .../backend/config/model/form/widget_view.js | 17 +++++++------- .../backend/config/model/main/element.js | 17 +++++++------- .../config/model/main/element_translation.js | 17 +++++++------- .../ExtJs/backend/config/model/main/form.js | 17 +++++++------- .../config/model/main/form_translation.js | 17 +++++++------- .../backend/config/model/main/navigation.js | 17 +++++++------- .../ExtJs/backend/config/model/main/value.js | 17 +++++++------- .../backend/config/store/base/page_group.js | 17 +++++++------- .../backend/config/store/base/search_table.js | 17 +++++++------- .../backend/config/store/detail/country.js | 17 +++++++------- .../config/store/detail/customer_group.js | 17 +++++++------- .../backend/config/store/detail/document.js | 17 +++++++------- .../backend/config/store/detail/page_group.js | 17 +++++++------- .../config/store/detail/price_group.js | 17 +++++++------- .../ExtJs/backend/config/store/detail/shop.js | 17 +++++++------- .../ExtJs/backend/config/store/detail/tax.js | 17 +++++++------- .../backend/config/store/form/attribute.js | 17 +++++++------- .../backend/config/store/form/country.js | 17 +++++++------- .../backend/config/store/form/country_area.js | 17 +++++++------- .../backend/config/store/form/cron_job.js | 17 +++++++------- .../backend/config/store/form/currency.js | 17 +++++++------- .../config/store/form/customer_group.js | 17 +++++++------- .../backend/config/store/form/document.js | 17 +++++++------- .../ExtJs/backend/config/store/form/locale.js | 17 +++++++------- .../ExtJs/backend/config/store/form/number.js | 17 +++++++------- .../backend/config/store/form/page_group.js | 17 +++++++------- .../backend/config/store/form/price_group.js | 17 +++++++------- .../backend/config/store/form/search_field.js | 17 +++++++------- .../ExtJs/backend/config/store/form/shop.js | 17 +++++++------- .../ExtJs/backend/config/store/form/tax.js | 17 +++++++------- .../ExtJs/backend/config/store/form/unit.js | 17 +++++++------- .../ExtJs/backend/config/store/form/widget.js | 17 +++++++------- .../backend/config/store/form/widget_view.js | 17 +++++++------- .../ExtJs/backend/config/store/main/form.js | 17 +++++++------- .../backend/config/store/main/navigation.js | 17 +++++++------- .../ExtJs/backend/config/view/base/detail.js | 17 +++++++------- .../ExtJs/backend/config/view/base/form.js | 17 +++++++------- .../backend/config/view/base/property.js | 17 +++++++------- .../ExtJs/backend/config/view/base/search.js | 17 +++++++------- .../ExtJs/backend/config/view/base/table.js | 17 +++++++------- .../view/custom_search/common/listing.js | 17 +++++++------- .../facet/classes/category_facet.js | 17 +++++++------- .../facet/classes/combined_condition_facet.js | 17 +++++++------- .../facet/classes/condition_selection.js | 17 +++++++------- .../facet/classes/facet_interface.js | 17 +++++++------- .../facet/classes/height_facet.js | 17 +++++++------- .../facet/classes/immediate_delivery_facet.js | 17 +++++++------- .../facet/classes/length_facet.js | 17 +++++++------- .../facet/classes/manufacturer_facet.js | 17 +++++++------- .../facet/classes/price_facet.js | 17 +++++++------- .../facet/classes/product_attribute_facet.js | 17 +++++++------- .../facet/classes/property_facet.js | 17 +++++++------- .../facet/classes/shipping_free_facet.js | 17 +++++++------- .../facet/classes/variant_facet.js | 17 +++++++------- .../facet/classes/vote_average_facet.js | 17 +++++++------- .../facet/classes/weight_facet.js | 17 +++++++------- .../facet/classes/width_facet.js | 17 +++++++------- .../config/view/custom_search/facet/detail.js | 17 +++++++------- .../config/view/custom_search/facet/facet.js | 17 +++++++------- .../view/custom_search/facet/listing.js | 17 +++++++------- .../config/view/custom_search/overview.js | 17 +++++++------- .../sorting/classes/manual_sorting.js | 17 +++++++------- .../sorting/classes/popularity_sorting.js | 17 +++++++------- .../sorting/classes/price_sorting.js | 17 +++++++------- .../classes/product_attribute_sorting.js | 17 +++++++------- .../sorting/classes/product_name_sorting.js | 17 +++++++------- .../sorting/classes/product_number_sorting.js | 17 +++++++------- .../sorting/classes/product_stock_sorting.js | 17 +++++++------- .../sorting/classes/release_date_sorting.js | 17 +++++++------- .../sorting/classes/search_ranking_sorting.js | 17 +++++++------- .../sorting/classes/sorting_interface.js | 17 +++++++------- .../view/custom_search/sorting/detail.js | 17 +++++++------- .../sorting/includes/create_window.js | 17 +++++++------- .../sorting/includes/direction_combo.js | 17 +++++++------- .../view/custom_search/sorting/listing.js | 17 +++++++------- .../sorting/sorting_selection.js | 17 +++++++------- .../config/view/customer_group/detail.js | 17 +++++++------- .../config/view/customer_group/discount.js | 17 +++++++------- .../config/view/element/custom_facet_grid.js | 17 +++++++------- .../view/element/custom_sorting_grid.js | 17 +++++++------- .../view/element/custom_sorting_selection.js | 17 +++++++------- .../backend/config/view/form/core_license.js | 17 +++++++------- .../ExtJs/backend/config/view/form/country.js | 17 +++++++------- .../backend/config/view/form/country_area.js | 17 +++++++------- .../backend/config/view/form/cron_job.js | 17 +++++++------- .../backend/config/view/form/currency.js | 17 +++++++------- .../config/view/form/customer_group.js | 17 +++++++------- .../backend/config/view/form/document.js | 17 +++++++------- .../ExtJs/backend/config/view/form/locale.js | 17 +++++++------- .../ExtJs/backend/config/view/form/number.js | 17 +++++++------- .../backend/config/view/form/page_group.js | 17 +++++++------- .../backend/config/view/form/price_group.js | 17 +++++++------- .../ExtJs/backend/config/view/form/search.js | 17 +++++++------- .../ExtJs/backend/config/view/form/shop.js | 17 +++++++------- .../ExtJs/backend/config/view/form/tax.js | 17 +++++++------- .../ExtJs/backend/config/view/form/unit.js | 17 +++++++------- .../ExtJs/backend/config/view/form/widget.js | 17 +++++++------- .../backend/config/view/main/fieldset.js | 17 +++++++------- .../ExtJs/backend/config/view/main/form.js | 17 +++++++------- .../backend/config/view/main/navigation.js | 17 +++++++------- .../ExtJs/backend/config/view/main/panel.js | 17 +++++++------- .../ExtJs/backend/config/view/main/window.js | 17 +++++++------- .../backend/config/view/shop/currency.js | 17 +++++++------- .../ExtJs/backend/config/view/shop/detail.js | 17 +++++++------- .../ExtJs/backend/config/view/shop/page.js | 17 +++++++------- .../ExtJs/backend/config/view/tax/detail.js | 17 +++++++------- .../ExtJs/backend/config/view/tax/rule.js | 17 +++++++------- .../variant_filter/dynamic_variant_reader.js | 17 +++++++------- .../view/variant_filter/expand_groups_grid.js | 17 +++++++------- .../expand_groups_hidden_field.js | 17 +++++++------- .../Backend/ExtJs/backend/content_type/app.js | 17 +++++++------- .../backend/content_type/controller/main.js | 17 +++++++------- .../backend/content_type/model/content.js | 17 +++++++------- .../backend/content_type/store/content.js | 17 +++++++------- .../content_type/view/detail/content.js | 17 +++++++------- .../content_type/view/detail/window.js | 17 +++++++------- .../view/fields/single_selection.js | 17 +++++++------- .../view/fields/static_combobox.js | 17 +++++++------- .../backend/content_type/view/list/content.js | 17 +++++++------- .../backend/content_type/view/list/window.js | 17 +++++++------- .../ExtJs/backend/content_type_manager/app.js | 17 +++++++------- .../content_type_manager/controller/detail.js | 17 +++++++------- .../content_type_manager/controller/field.js | 17 +++++++------- .../content_type_manager/controller/main.js | 17 +++++++------- .../content_type_manager/model/field.js | 17 +++++++------- .../content_type_manager/model/type.js | 17 +++++++------- .../backend/content_type_manager/model/url.js | 17 +++++++------- .../content_type_manager/store/fields.js | 17 +++++++------- .../content_type_manager/store/robots.js | 17 +++++++------- .../content_type_manager/store/type.js | 17 +++++++------- .../view/detail/fields.js | 17 +++++++------- .../content_type_manager/view/detail/type.js | 17 +++++++------- .../view/detail/window.js | 17 +++++++------- .../view/field/fieldset.js | 17 +++++++------- .../content_type_manager/view/field/form.js | 17 +++++++------- .../content_type_manager/view/field/window.js | 17 +++++++------- .../view/field_handler/combobox_handler.js | 17 +++++++------- .../view/field_handler/integer_handler.js | 17 +++++++------- .../content_type_manager/view/list/grid.js | 17 +++++++------- .../content_type_manager/view/list/window.js | 17 +++++++------- themes/Backend/ExtJs/backend/customer/app.js | 17 +++++++------- .../backend/customer/controller/detail.js | 17 +++++++------- .../ExtJs/backend/customer/controller/main.js | 17 +++++++------- .../backend/customer/controller/order.js | 17 +++++++------- .../backend/customer/controller/stream.js | 17 +++++++------- .../ExtJs/backend/customer/model/address.js | 17 +++++++------- .../ExtJs/backend/customer/model/batch.js | 17 +++++++------- .../ExtJs/backend/customer/model/chart.js | 17 +++++++------- .../ExtJs/backend/customer/model/customer.js | 17 +++++++------- .../backend/customer/model/customer_stream.js | 17 +++++++------- .../ExtJs/backend/customer/model/debit.js | 17 +++++++------- .../ExtJs/backend/customer/model/order.js | 17 +++++++------- .../backend/customer/model/payment_data.js | 17 +++++++------- .../backend/customer/model/quick_view.js | 17 +++++++------- .../ExtJs/backend/customer/store/address.js | 17 +++++++------- .../ExtJs/backend/customer/store/batch.js | 17 +++++++------- .../ExtJs/backend/customer/store/chart.js | 17 +++++++------- .../backend/customer/store/customer_stream.js | 17 +++++++------- .../ExtJs/backend/customer/store/detail.js | 17 +++++++------- .../ExtJs/backend/customer/store/orders.js | 17 +++++++------- .../ExtJs/backend/customer/store/preview.js | 17 +++++++------- .../backend/customer/store/quick_view.js | 17 +++++++------- .../customer/view/address/detail/address.js | 17 +++++++------- .../customer/view/address/detail/window.js | 17 +++++++------- .../backend/customer/view/address/list.js | 17 +++++++------- .../view/chart/amount_chart_factory.js | 17 +++++++------- .../backend/customer/view/chart/chart.js | 17 +++++++------- .../backend/customer/view/chart/meta_chart.js | 17 +++++++------- .../view/customer_stream/condition_field.js | 17 +++++++------- .../view/customer_stream/condition_panel.js | 17 +++++++------- .../conditions/account_mode_condition.js | 17 +++++++------- .../conditions/age_condition.js | 17 +++++++------- .../customer_attribute_condition.js | 17 +++++++------- .../conditions/field/attribute_value.js | 17 +++++++------- .../conditions/field/attribute_window.js | 17 +++++++------- .../conditions/field/operator_field.js | 17 +++++++------- .../has_address_with_country_condition.js | 17 +++++++------- .../has_canceled_orders_condition.js | 17 +++++++------- .../has_newsletter_registration_condition.js | 17 +++++++------- .../has_no_address_with_country_condition.js | 17 +++++++------- .../has_no_canceled_orders_condition.js | 17 +++++++------- ...as_no_newsletter_registration_condition.js | 17 +++++++------- .../conditions/has_order_count_condition.js | 17 +++++++------- .../has_total_order_amount_condition.js | 17 +++++++------- .../conditions/is_customer_since_condition.js | 17 +++++++------- .../is_in_customer_group_condition.js | 17 +++++++------- .../is_not_in_customer_group_condition.js | 17 +++++++------- .../not_ordered_in_last_days_condition.js | 17 +++++++------- .../not_ordered_in_shop_condition.js | 17 +++++++------- .../not_ordered_product_condition.js | 17 +++++++------- ...t_ordered_product_of_category_condition.js | 17 +++++++------- ...dered_product_of_manufacturer_condition.js | 17 +++++++------- .../not_ordered_with_delivery_condition.js | 17 +++++++------- .../not_ordered_with_payment_condition.js | 17 +++++++------- .../not_registered_in_shop_condition.js | 17 +++++++------- .../conditions/not_salutation_condition.js | 17 +++++++------- .../ordered_at_weekday_condition.js | 17 +++++++------- .../ordered_in_last_days_condition.js | 17 +++++++------- .../conditions/ordered_in_shop_condition.js | 17 +++++++------- .../conditions/ordered_on_device_condition.js | 17 +++++++------- .../conditions/ordered_product_condition.js | 17 +++++++------- .../ordered_product_of_category_condition.js | 17 +++++++------- ...dered_product_of_manufacturer_condition.js | 17 +++++++------- .../ordered_with_delivery_condition.js | 17 +++++++------- .../ordered_with_payment_condition.js | 17 +++++++------- .../registered_in_shop_condition.js | 17 +++++++------- .../conditions/salutation_condition.js | 17 +++++++------- .../conditions/search_term_condition.js | 17 +++++++------- .../customer/view/customer_stream/detail.js | 17 +++++++------- .../customer/view/customer_stream/listing.js | 17 +++++++------- .../customer/view/customer_stream/preview.js | 17 +++++++------- .../customer/view/detail/additional.js | 17 +++++++------- .../backend/customer/view/detail/base.js | 17 +++++++------- .../backend/customer/view/detail/comment.js | 17 +++++++------- .../backend/customer/view/detail/debit.js | 17 +++++++------- .../backend/customer/view/detail/window.js | 17 +++++++------- .../customer/view/main/customer_list.js | 17 +++++++------- .../view/main/customer_list_filter.js | 17 +++++++------- .../backend/customer/view/main/quick_view.js | 17 +++++++------- .../backend/customer/view/main/stream_view.js | 17 +++++++------- .../backend/customer/view/main/window.js | 17 +++++++------- .../backend/customer/view/order/chart.js | 17 +++++++------- .../ExtJs/backend/customer/view/order/list.js | 17 +++++++------- themes/Backend/ExtJs/backend/emotion/app.js | 17 +++++++------- .../backend/emotion/controller/detail.js | 17 +++++++------- .../ExtJs/backend/emotion/controller/main.js | 17 +++++++------- .../backend/emotion/controller/templates.js | 17 +++++++------- .../backend/emotion/model/article_slider.js | 17 +++++++------- .../backend/emotion/model/banner_slider.js | 17 +++++++------- .../ExtJs/backend/emotion/model/component.js | 17 +++++++------- .../ExtJs/backend/emotion/model/emotion.js | 17 +++++++------- .../backend/emotion/model/emotion_element.js | 17 +++++++------- .../backend/emotion/model/emotion_shop.js | 17 +++++++------- .../ExtJs/backend/emotion/model/field.js | 17 +++++++------- .../emotion/model/manufacturer_slider.js | 17 +++++++------- .../ExtJs/backend/emotion/model/preset.js | 17 +++++++------- .../ExtJs/backend/emotion/model/presetdata.js | 17 +++++++------- .../ExtJs/backend/emotion/model/template.js | 17 +++++++------- .../ExtJs/backend/emotion/model/viewport.js | 17 +++++++------- .../backend/emotion/store/category_path.js | 17 +++++++------- .../emotion/store/content_type_mode.js | 17 +++++++------- .../ExtJs/backend/emotion/store/detail.js | 17 +++++++------- .../backend/emotion/store/landing_page.js | 17 +++++++------- .../ExtJs/backend/emotion/store/library.js | 17 +++++++------- .../ExtJs/backend/emotion/store/list.js | 17 +++++++------- .../ExtJs/backend/emotion/store/presets.js | 17 +++++++------- .../ExtJs/backend/emotion/store/templates.js | 17 +++++++------- .../ExtJs/backend/emotion/store/visibility.js | 17 +++++++------- .../emotion/view/components/article.js | 17 +++++++------- .../emotion/view/components/article_slider.js | 17 +++++++------- .../backend/emotion/view/components/banner.js | 17 +++++++------- .../emotion/view/components/banner_mapping.js | 17 +++++++------- .../emotion/view/components/banner_slider.js | 17 +++++++------- .../backend/emotion/view/components/base.js | 17 +++++++------- .../backend/emotion/view/components/blog.js | 17 +++++++------- .../view/components/category_teaser.js | 17 +++++++------- .../emotion/view/components/content_type.js | 17 +++++++------- .../emotion/view/components/fields/article.js | 17 +++++++------- .../components/fields/article_slider_type.js | 17 +++++++------- .../view/components/fields/article_type.js | 17 +++++++------- .../components/fields/category_image_type.js | 17 +++++++------- .../components/fields/category_selection.js | 17 +++++++------- .../view/components/fields/link_target.js | 17 +++++++------- .../components/fields/manufacturer_type.js | 17 +++++++------- .../view/components/fields/slider_select.js | 17 +++++++------- .../emotion/view/components/fields/variant.js | 17 +++++++------- .../view/components/fields/video_mode.js | 17 +++++++------- .../emotion/view/components/html_code.js | 17 +++++++------- .../emotion/view/components/html_element.js | 17 +++++++------- .../emotion/view/components/html_video.js | 17 +++++++------- .../backend/emotion/view/components/iframe.js | 17 +++++++------- .../view/components/manufacturer_slider.js | 17 +++++++------- .../view/components/settings_window.js | 17 +++++++------- .../emotion/view/components/youtube.js | 17 +++++++------- .../backend/emotion/view/detail/designer.js | 17 +++++++------- .../emotion/view/detail/elements/article.js | 17 +++++++------- .../view/detail/elements/article_slider.js | 17 +++++++------- .../emotion/view/detail/elements/banner.js | 17 +++++++------- .../view/detail/elements/banner_slider.js | 17 +++++++------- .../emotion/view/detail/elements/base.js | 17 +++++++------- .../emotion/view/detail/elements/blog.js | 17 +++++++------- .../view/detail/elements/category_teaser.js | 17 +++++++------- .../view/detail/elements/content_type.js | 17 +++++++------- .../emotion/view/detail/elements/html.js | 17 +++++++------- .../emotion/view/detail/elements/html_code.js | 17 +++++++------- .../view/detail/elements/html_video.js | 17 +++++++------- .../emotion/view/detail/elements/iframe.js | 17 +++++++------- .../detail/elements/manufacturer_slider.js | 17 +++++++------- .../emotion/view/detail/elements/youtube.js | 17 +++++++------- .../ExtJs/backend/emotion/view/detail/grid.js | 17 +++++++------- .../backend/emotion/view/detail/layout.js | 17 +++++++------- .../backend/emotion/view/detail/preview.js | 17 +++++++------- .../backend/emotion/view/detail/settings.js | 17 +++++++------- .../backend/emotion/view/detail/widgets.js | 17 +++++++------- .../backend/emotion/view/detail/window.js | 17 +++++++------- .../ExtJs/backend/emotion/view/list/grid.js | 17 +++++++------- .../backend/emotion/view/list/toolbar.js | 17 +++++++------- .../ExtJs/backend/emotion/view/main/window.js | 17 +++++++------- .../backend/emotion/view/presets/form.js | 17 +++++++------- .../backend/emotion/view/presets/info.js | 17 +++++++------- .../backend/emotion/view/presets/list.js | 17 +++++++------- .../backend/emotion/view/presets/window.js | 17 +++++++------- .../backend/emotion/view/templates/list.js | 17 +++++++------- .../emotion/view/templates/settings.js | 17 +++++++------- .../backend/emotion/view/templates/toolbar.js | 17 +++++++------- .../emotion/view/translation/window.js | 17 +++++++------- .../first_run_wizard/controller/config.js | 17 +++++++------- .../controller/localization.js | 17 +++++++------- .../first_run_wizard/controller/main.js | 17 +++++++------- .../first_run_wizard/controller/pay_pal.js | 17 +++++++------- .../controller/recommendation.js | 17 +++++++------- .../model/integrated_plugins_countries.js | 17 +++++++------- .../backend/first_run_wizard/model/locale.js | 17 +++++++------- .../first_run_wizard/model/localization.js | 17 +++++++------- .../store/available_localization_plugin.js | 17 +++++++------- .../first_run_wizard/store/demo_plugin.js | 17 +++++++------- .../store/integrated_plugin.js | 17 +++++++------- .../store/integrated_plugins_countries.js | 17 +++++++------- .../first_run_wizard/store/license_plugin.js | 17 +++++++------- .../backend/first_run_wizard/store/locale.js | 17 +++++++------- .../first_run_wizard/store/localization.js | 17 +++++++------- .../store/localization_plugin.js | 17 +++++++------- .../store/recommended_plugin.js | 17 +++++++------- .../first_run_wizard/view/main/config.js | 17 +++++++------- .../first_run_wizard/view/main/demo_data.js | 17 +++++++------- .../first_run_wizard/view/main/finish.js | 17 +++++++------- .../view/main/localization.js | 17 +++++++------- .../view/main/localization_installer.js | 17 +++++++------- .../view/main/localization_switcher.js | 17 +++++++------- .../first_run_wizard/view/main/pay_pal.js | 17 +++++++------- .../view/main/recommendation.js | 17 +++++++------- .../first_run_wizard/view/main/window.js | 17 +++++++------- themes/Backend/ExtJs/backend/form/app.js | 17 +++++++------- .../ExtJs/backend/form/controller/fields.js | 17 +++++++------- .../ExtJs/backend/form/controller/main.js | 17 +++++++------- .../Backend/ExtJs/backend/form/model/field.js | 17 +++++++------- .../Backend/ExtJs/backend/form/model/form.js | 17 +++++++------- .../Backend/ExtJs/backend/form/store/field.js | 17 +++++++------- .../Backend/ExtJs/backend/form/store/form.js | 17 +++++++------- .../Backend/ExtJs/backend/form/store/shop.js | 17 +++++++------- .../backend/form/view/main/editwindow.js | 17 +++++++------- .../ExtJs/backend/form/view/main/fieldgrid.js | 17 +++++++------- .../ExtJs/backend/form/view/main/formpanel.js | 17 +++++++------- .../ExtJs/backend/form/view/main/list.js | 17 +++++++------- .../backend/form/view/main/mainwindow.js | 17 +++++++------- themes/Backend/ExtJs/backend/index/app.js | 17 +++++++------- .../index/controller/error_reporter.js | 17 +++++++------- .../ExtJs/backend/index/controller/main.js | 17 +++++++------- .../index/controller/theme_cache_warm_up.js | 17 +++++++------- .../ExtJs/backend/index/controller/widgets.js | 17 +++++++------- .../ExtJs/backend/index/model/batch.js | 17 +++++++------- .../ExtJs/backend/index/model/customers.js | 17 +++++++------- .../backend/index/model/error_reporter.js | 17 +++++++------- .../ExtJs/backend/index/model/merchant.js | 17 +++++++------- .../backend/index/model/merchant_mail.js | 17 +++++++------- .../Backend/ExtJs/backend/index/model/news.js | 17 +++++++------- .../ExtJs/backend/index/model/orders.js | 17 +++++++------- .../ExtJs/backend/index/model/rating.js | 17 +++++++------- .../index/model/theme_cache_warm_up.js | 17 +++++++------- .../ExtJs/backend/index/model/turnover.js | 17 +++++++------- .../ExtJs/backend/index/model/visitors.js | 17 +++++++------- .../ExtJs/backend/index/model/widget.js | 17 +++++++------- .../backend/index/model/widget_settings.js | 17 +++++++------- .../backend/index/store/error_reporter.js | 17 +++++++------- .../ExtJs/backend/index/store/merchant.js | 17 +++++++------- .../Backend/ExtJs/backend/index/store/news.js | 17 +++++++------- .../ExtJs/backend/index/store/news_local.js | 17 +++++++------- .../ExtJs/backend/index/store/orders.js | 17 +++++++------- .../index/store/theme_cache_warm_up.js | 17 +++++++------- .../ExtJs/backend/index/store/turnover.js | 17 +++++++------- .../ExtJs/backend/index/store/visitors.js | 17 +++++++------- .../ExtJs/backend/index/store/widget.js | 17 +++++++------- .../backend/index/store/widget_settings.js | 17 +++++++------- .../backend/index/view/error_reporter/list.js | 17 +++++++------- .../ExtJs/backend/index/view/footer.js | 17 +++++++------- .../Backend/ExtJs/backend/index/view/main.js | 17 +++++++------- .../Backend/ExtJs/backend/index/view/menu.js | 17 +++++++------- .../backend/index/view/merchant/window.js | 17 +++++++------- .../ExtJs/backend/index/view/search.js | 17 +++++++------- .../view/theme_cache/theme_cache_warm_up.js | 17 +++++++------- .../ExtJs/backend/index/view/widgets/base.js | 17 +++++++------- .../backend/index/view/widgets/merchant.js | 17 +++++++------- .../ExtJs/backend/index/view/widgets/news.js | 17 +++++++------- .../backend/index/view/widgets/notice.js | 17 +++++++------- .../backend/index/view/widgets/orders.js | 17 +++++++------- .../backend/index/view/widgets/rating.js | 17 +++++++------- .../ExtJs/backend/index/view/widgets/sales.js | 21 +++++++++--------- .../backend/index/view/widgets/upload.js | 17 +++++++------- .../backend/index/view/widgets/visitors.js | 17 +++++++------- .../backend/index/view/widgets/window.js | 17 +++++++------- themes/Backend/ExtJs/backend/log/app.js | 17 +++++++------- .../ExtJs/backend/log/controller/log.js | 17 +++++++------- .../ExtJs/backend/log/controller/main.js | 17 +++++++------- .../ExtJs/backend/log/controller/system.js | 17 +++++++------- themes/Backend/ExtJs/backend/log/model/log.js | 17 +++++++------- .../ExtJs/backend/log/model/log_file.js | 17 +++++++------- .../ExtJs/backend/log/model/system_log.js | 17 +++++++------- .../ExtJs/backend/log/store/log_files.js | 17 +++++++------- .../Backend/ExtJs/backend/log/store/logs.js | 17 +++++++------- .../ExtJs/backend/log/store/system_logs.js | 17 +++++++------- .../ExtJs/backend/log/view/log/detail.js | 17 +++++++------- .../ExtJs/backend/log/view/log/list.js | 17 +++++++------- .../ExtJs/backend/log/view/main/window.js | 17 +++++++------- .../ExtJs/backend/log/view/system/detail.js | 17 +++++++------- .../ExtJs/backend/log/view/system/list.js | 17 +++++++------- themes/Backend/ExtJs/backend/login/app.js | 17 +++++++------- .../ExtJs/backend/login/controller/main.js | 17 +++++++------- .../ExtJs/backend/login/model/locale.js | 17 +++++++------- .../ExtJs/backend/login/store/locale.js | 17 +++++++------- .../Backend/ExtJs/backend/login/view/main.js | 17 +++++++------- .../ExtJs/backend/login/view/main/form.js | 17 +++++++------- themes/Backend/ExtJs/backend/mail/app.js | 17 +++++++------- .../backend/mail/controller/attachment.js | 17 +++++++------- .../ExtJs/backend/mail/controller/main.js | 17 +++++++------- .../ExtJs/backend/mail/model/attachment.js | 17 +++++++------- .../Backend/ExtJs/backend/mail/model/mail.js | 17 +++++++------- .../ExtJs/backend/mail/store/attachment.js | 17 +++++++------- .../Backend/ExtJs/backend/mail/store/mail.js | 17 +++++++------- .../Backend/ExtJs/backend/mail/store/tree.js | 17 +++++++------- .../backend/mail/view/main/attachments.js | 17 +++++++------- .../backend/mail/view/main/content_editor.js | 17 +++++++------- .../ExtJs/backend/mail/view/main/form.js | 17 +++++++------- .../ExtJs/backend/mail/view/main/info.js | 17 +++++++------- .../backend/mail/view/main/navigation.js | 17 +++++++------- .../ExtJs/backend/mail/view/main/window.js | 17 +++++++------- .../ExtJs/backend/media_manager/app.js | 17 +++++++------- .../backend/media_manager/controller/album.js | 17 +++++++------- .../backend/media_manager/controller/main.js | 17 +++++++------- .../backend/media_manager/controller/media.js | 17 +++++++------- .../media_manager/controller/thumbnail.js | 17 +++++++------- .../backend/media_manager/model/album.js | 17 +++++++------- .../backend/media_manager/model/media.js | 17 +++++++------- .../backend/media_manager/model/setting.js | 17 +++++++------- .../backend/media_manager/store/album.js | 17 +++++++------- .../backend/media_manager/store/media.js | 17 +++++++------- .../backend/media_manager/view/album/add.js | 17 +++++++------- .../media_manager/view/album/setting.js | 17 +++++++------- .../backend/media_manager/view/album/tree.js | 17 +++++++------- .../view/batch_move/batch_move.js | 17 +++++++------- .../media_manager/view/main/selection.js | 17 +++++++------- .../backend/media_manager/view/main/window.js | 17 +++++++------- .../backend/media_manager/view/media/grid.js | 17 +++++++------- .../backend/media_manager/view/media/view.js | 17 +++++++------- .../media_manager/view/replace/file_select.js | 17 +++++++------- .../media_manager/view/replace/grid.js | 17 +++++++------- .../backend/media_manager/view/replace/row.js | 17 +++++++------- .../media_manager/view/replace/upload.js | 17 +++++++------- .../media_manager/view/replace/window.js | 17 +++++++------- .../media_manager/view/thumbnail/main.js | 17 +++++++------- .../ExtJs/backend/newsletter_manager/app.js | 17 +++++++------- .../newsletter_manager/controller/admin.js | 17 +++++++------- .../newsletter_manager/controller/editor.js | 17 +++++++------- .../newsletter_manager/controller/main.js | 17 +++++++------- .../newsletter_manager/controller/overview.js | 17 +++++++------- .../newsletter_manager/model/container.js | 17 +++++++------- .../model/container_type_text.js | 17 +++++++------- .../newsletter_manager/model/mail_dispatch.js | 17 +++++++------- .../newsletter_manager/model/mailing.js | 17 +++++++------- .../model/newsletter_group.js | 17 +++++++------- .../newsletter_manager/model/recipient.js | 17 +++++++------- .../model/recipient_group.js | 17 +++++++------- .../newsletter_manager/model/sender.js | 17 +++++++------- .../newsletter_manager/model/settings.js | 17 +++++++------- .../newsletter_manager/store/mail_dispatch.js | 17 +++++++------- .../newsletter_manager/store/mailing.js | 17 +++++++------- .../store/newsletter_group.js | 17 +++++++------- .../newsletter_manager/store/recipient.js | 17 +++++++------- .../store/recipient_group.js | 17 +++++++------- .../newsletter_manager/store/sender.js | 17 +++++++------- .../newsletter_manager/view/main/window.js | 17 +++++++------- .../view/newsletter/bottom_toolbar.js | 17 +++++++------- .../view/newsletter/editor.js | 17 +++++++------- .../view/newsletter/settings.js | 17 +++++++------- .../view/newsletter/window.js | 17 +++++++------- .../newsletter_manager/view/sender_dialog.js | 17 +++++++------- .../newsletter_manager/view/tabs/admin.js | 17 +++++++------- .../newsletter_manager/view/tabs/overview.js | 17 +++++++------- .../view/tabs/recipient_groups.js | 17 +++++++------- .../view/tabs/recipients.js | 17 +++++++------- .../newsletter_manager/view/tabs/sender.js | 17 +++++++------- .../Backend/ExtJs/backend/notification/app.js | 17 +++++++------- .../backend/notification/controller/main.js | 17 +++++++------- .../notification/controller/notification.js | 17 +++++++------- .../backend/notification/model/article.js | 17 +++++++------- .../backend/notification/model/customer.js | 17 +++++++------- .../backend/notification/store/article.js | 17 +++++++------- .../backend/notification/store/customer.js | 17 +++++++------- .../backend/notification/view/main/window.js | 17 +++++++------- .../notification/view/notification/article.js | 17 +++++++------- .../view/notification/customer.js | 17 +++++++------- themes/Backend/ExtJs/backend/order/app.js | 17 +++++++------- .../backend/order/controller/attachment.js | 17 +++++++------- .../ExtJs/backend/order/controller/batch.js | 17 +++++++------- .../ExtJs/backend/order/controller/detail.js | 17 +++++++------- .../backend/order/controller/document.js | 17 +++++++------- .../ExtJs/backend/order/controller/filter.js | 17 +++++++------- .../ExtJs/backend/order/controller/list.js | 17 +++++++------- .../ExtJs/backend/order/controller/mail.js | 17 +++++++------- .../ExtJs/backend/order/controller/main.js | 17 +++++++------- .../ExtJs/backend/order/model/batch.js | 17 +++++++------- .../ExtJs/backend/order/model/billing.js | 17 +++++++------- .../backend/order/model/configuration.js | 17 +++++++------- .../ExtJs/backend/order/model/debit.js | 17 +++++++------- .../ExtJs/backend/order/model/detail_batch.js | 17 +++++++------- .../ExtJs/backend/order/model/dispatch.js | 17 +++++++------- .../ExtJs/backend/order/model/list_batch.js | 17 +++++++------- .../Backend/ExtJs/backend/order/model/mail.js | 17 +++++++------- .../backend/order/model/mail_template.js | 17 +++++++------- .../ExtJs/backend/order/model/order.js | 17 +++++++------- .../backend/order/model/order_history.js | 17 +++++++------- .../ExtJs/backend/order/model/payment.js | 17 +++++++------- .../backend/order/model/payment_instance.js | 17 +++++++------- .../ExtJs/backend/order/model/position.js | 17 +++++++------- .../order/model/position_product_search.js | 17 +++++++------- .../ExtJs/backend/order/model/receipt.js | 17 +++++++------- .../backend/order/model/receipt_attribute.js | 17 +++++++------- .../ExtJs/backend/order/model/shipping.js | 17 +++++++------- .../Backend/ExtJs/backend/order/model/tax.js | 17 +++++++------- .../ExtJs/backend/order/model/voucher.js | 17 +++++++------- .../ExtJs/backend/order/store/batch.js | 17 +++++++------- .../backend/order/store/configuration.js | 17 +++++++------- .../ExtJs/backend/order/store/detail_batch.js | 17 +++++++------- .../ExtJs/backend/order/store/doc_type.js | 17 +++++++------- .../backend/order/store/document_registry.js | 17 +++++++------- .../ExtJs/backend/order/store/list_batch.js | 17 +++++++------- .../backend/order/store/mail_template.js | 17 +++++++------- .../ExtJs/backend/order/store/order.js | 17 +++++++------- .../backend/order/store/order_history.js | 17 +++++++------- .../order/store/position_product_search.js | 17 +++++++------- .../Backend/ExtJs/backend/order/store/tax.js | 17 +++++++------- .../ExtJs/backend/order/store/voucher.js | 17 +++++++------- .../ExtJs/backend/order/view/batch/form.js | 17 +++++++------- .../ExtJs/backend/order/view/batch/list.js | 17 +++++++------- .../backend/order/view/batch/progress.js | 17 +++++++------- .../ExtJs/backend/order/view/batch/window.js | 17 +++++++------- .../backend/order/view/detail/billing.js | 17 +++++++------- .../order/view/detail/communication.js | 17 +++++++------- .../order/view/detail/configuration.js | 17 +++++++------- .../ExtJs/backend/order/view/detail/debit.js | 17 +++++++------- .../ExtJs/backend/order/view/detail/detail.js | 17 +++++++------- .../backend/order/view/detail/dispatch.js | 17 +++++++------- .../backend/order/view/detail/document.js | 17 +++++++------- .../order/view/detail/order_history.js | 17 +++++++------- .../backend/order/view/detail/overview.js | 17 +++++++------- .../backend/order/view/detail/position.js | 17 +++++++------- .../backend/order/view/detail/shipping.js | 17 +++++++------- .../ExtJs/backend/order/view/detail/window.js | 17 +++++++------- .../ExtJs/backend/order/view/list/document.js | 17 +++++++------- .../ExtJs/backend/order/view/list/filter.js | 17 +++++++------- .../ExtJs/backend/order/view/list/list.js | 17 +++++++------- .../backend/order/view/list/navigation.js | 17 +++++++------- .../ExtJs/backend/order/view/list/position.js | 17 +++++++------- .../backend/order/view/mail/attachment.js | 17 +++++++------- .../ExtJs/backend/order/view/mail/form.js | 17 +++++++------- .../ExtJs/backend/order/view/mail/window.js | 17 +++++++------- .../ExtJs/backend/order/view/main/window.js | 17 +++++++------- themes/Backend/ExtJs/backend/overview/app.js | 17 +++++++------- .../ExtJs/backend/overview/controller/main.js | 17 +++++++------- .../ExtJs/backend/overview/model/overview.js | 17 +++++++------- .../ExtJs/backend/overview/store/overview.js | 17 +++++++------- .../ExtJs/backend/overview/view/main/grid.js | 17 +++++++------- .../backend/overview/view/main/window.js | 17 +++++++------- themes/Backend/ExtJs/backend/partner/app.js | 17 +++++++------- .../ExtJs/backend/partner/controller/main.js | 17 +++++++------- .../backend/partner/controller/partner.js | 17 +++++++------- .../backend/partner/controller/statistic.js | 17 +++++++------- .../ExtJs/backend/partner/model/detail.js | 17 +++++++------- .../ExtJs/backend/partner/model/main.js | 17 +++++++------- .../backend/partner/model/statistic_chart.js | 17 +++++++------- .../backend/partner/model/statistic_list.js | 17 +++++++------- .../ExtJs/backend/partner/store/detail.js | 17 +++++++------- .../ExtJs/backend/partner/store/list.js | 17 +++++++------- .../backend/partner/store/statistic_chart.js | 17 +++++++------- .../backend/partner/store/statistic_list.js | 17 +++++++------- .../ExtJs/backend/partner/view/main/window.js | 17 +++++++------- .../backend/partner/view/partner/detail.js | 17 +++++++------- .../backend/partner/view/partner/list.js | 17 +++++++------- .../backend/partner/view/partner/window.js | 17 +++++++------- .../backend/partner/view/statistic/chart.js | 17 +++++++------- .../backend/partner/view/statistic/list.js | 17 +++++++------- .../backend/partner/view/statistic/window.js | 17 +++++++------- themes/Backend/ExtJs/backend/payment/app.js | 17 +++++++------- .../ExtJs/backend/payment/controller/main.js | 17 +++++++------- .../backend/payment/controller/payment.js | 17 +++++++------- .../ExtJs/backend/payment/model/country.js | 17 +++++++------- .../ExtJs/backend/payment/model/payment.js | 17 +++++++------- .../ExtJs/backend/payment/store/countries.js | 17 +++++++------- .../ExtJs/backend/payment/store/payments.js | 17 +++++++------- .../ExtJs/backend/payment/view/main/window.js | 17 +++++++------- .../payment/view/payment/country_list.js | 17 +++++++------- .../payment/view/payment/form_panel.js | 17 +++++++------- .../payment/view/payment/subshop_list.js | 17 +++++++------- .../backend/payment/view/payment/surcharge.js | 17 +++++++------- .../backend/payment/view/payment/tree.js | 17 +++++++------- .../Backend/ExtJs/backend/performance/app.js | 17 +++++++------- .../backend/performance/controller/cache.js | 17 +++++++------- .../backend/performance/controller/direct.js | 17 +++++++------- .../backend/performance/controller/main.js | 17 +++++++------- .../performance/controller/multi_request.js | 17 +++++++------- .../performance/controller/settings.js | 17 +++++++------- .../backend/performance/controller/start.js | 17 +++++++------- .../backend/performance/model/categories.js | 17 +++++++------- .../ExtJs/backend/performance/model/check.js | 17 +++++++------- .../ExtJs/backend/performance/model/config.js | 17 +++++++------- .../backend/performance/model/customer.js | 17 +++++++------- .../ExtJs/backend/performance/model/filter.js | 17 +++++++------- .../backend/performance/model/http_cache.js | 17 +++++++------- .../backend/performance/model/key_value.js | 17 +++++++------- .../ExtJs/backend/performance/model/search.js | 17 +++++++------- .../ExtJs/backend/performance/model/seo.js | 17 +++++++------- .../backend/performance/model/sitemap.js | 17 +++++++------- .../performance/model/sitemap/custom_urls.js | 17 +++++++------- .../model/sitemap/excluded_urls.js | 17 +++++++------- .../backend/performance/model/top_seller.js | 17 +++++++------- .../backend/performance/model/various.js | 17 +++++++------- .../ExtJs/backend/performance/store/config.js | 17 +++++++------- .../ExtJs/backend/performance/store/info.js | 17 +++++++------- .../ExtJs/backend/performance/store/shop.js | 17 +++++++------- .../performance/view/main/categories.js | 17 +++++++------- .../view/main/multi_request_dialog.js | 17 +++++++------- .../view/main/multi_request_tasks.js | 17 +++++++------- .../backend/performance/view/main/window.js | 17 +++++++------- .../performance/view/tabs/cache/form.js | 17 +++++++------- .../performance/view/tabs/cache/info.js | 17 +++++++------- .../performance/view/tabs/cache/main.js | 17 +++++++------- .../view/tabs/settings/elements/base_grid.js | 17 +++++++------- .../view/tabs/settings/elements/cache_time.js | 17 +++++++------- .../settings/elements/multi_request_button.js | 17 +++++++------- .../view/tabs/settings/elements/no_cache.js | 17 +++++++------- .../settings/elements/sitemap_custom_urls.js | 17 +++++++------- .../elements/sitemap_excluded_urls.js | 17 +++++++------- .../view/tabs/settings/elements/tree.js | 17 +++++++------- .../view/tabs/settings/fields/base.js | 17 +++++++------- .../view/tabs/settings/fields/categories.js | 17 +++++++------- .../view/tabs/settings/fields/customers.js | 17 +++++++------- .../view/tabs/settings/fields/filter.js | 17 +++++++------- .../view/tabs/settings/fields/home.js | 17 +++++++------- .../view/tabs/settings/fields/http_cache.js | 17 +++++++------- .../view/tabs/settings/fields/search.js | 17 +++++++------- .../view/tabs/settings/fields/seo.js | 17 +++++++------- .../view/tabs/settings/fields/sitemap.js | 17 +++++++------- .../view/tabs/settings/fields/theme_cache.js | 17 +++++++------- .../view/tabs/settings/fields/topseller.js | 19 ++++++++-------- .../view/tabs/settings/fields/various.js | 17 +++++++------- .../performance/view/tabs/settings/main.js | 17 +++++++------- .../view/tabs/settings/navigation.js | 17 +++++++------- .../performance/view/tabs/start/main.js | 17 +++++++------- .../ExtJs/backend/plugin_manager/app.js | 17 +++++++------- .../backend/plugin_manager/controller/main.js | 17 +++++++------- .../plugin_manager/controller/navigation.js | 17 +++++++------- .../plugin_manager/controller/plugin.js | 17 +++++++------- .../backend/plugin_manager/model/address.js | 17 +++++++------- .../backend/plugin_manager/model/basket.js | 17 +++++++------- .../plugin_manager/model/basket_position.js | 17 +++++++------- .../backend/plugin_manager/model/category.js | 17 +++++++------- .../backend/plugin_manager/model/comment.js | 17 +++++++------- .../backend/plugin_manager/model/domain.js | 17 +++++++------- .../backend/plugin_manager/model/licence.js | 17 +++++++------- .../backend/plugin_manager/model/picture.js | 17 +++++++------- .../backend/plugin_manager/model/plugin.js | 17 +++++++------- .../backend/plugin_manager/model/price.js | 17 +++++++------- .../backend/plugin_manager/model/producer.js | 17 +++++++------- .../backend/plugin_manager/store/basket.js | 17 +++++++------- .../backend/plugin_manager/store/category.js | 17 +++++++------- .../plugin_manager/store/expired_plugins.js | 17 +++++++------- .../backend/plugin_manager/store/licence.js | 17 +++++++------- .../plugin_manager/store/local_plugin.js | 17 +++++++------- .../plugin_manager/store/store_plugin.js | 17 +++++++------- .../plugin_manager/store/update_plugins.js | 17 +++++++------- .../plugin_manager/view/account/checkout.js | 17 +++++++------- .../plugin_manager/view/account/login.js | 17 +++++++------- .../view/account/login_window.js | 17 +++++++------- .../plugin_manager/view/account/upload.js | 17 +++++++------- .../view/components/container.js | 17 +++++++------- .../view/components/download_window.js | 17 +++++++------- .../view/components/expired_plugin.js | 17 +++++++------- .../view/components/image_slider.js | 17 +++++++------- .../plugin_manager/view/components/listing.js | 17 +++++++------- .../plugin_manager/view/components/slider.js | 17 +++++++------- .../view/components/store_plugin.js | 17 +++++++------- .../plugin_manager/view/components/tab.js | 17 +++++++------- .../plugin_manager/view/components/tree.js | 17 +++++++------- .../plugin_manager/view/detail/actions.js | 17 +++++++------- .../plugin_manager/view/detail/comments.js | 17 +++++++------- .../plugin_manager/view/detail/container.js | 17 +++++++------- .../plugin_manager/view/detail/header.js | 17 +++++++------- .../plugin_manager/view/detail/meta.js | 17 +++++++------- .../plugin_manager/view/detail/prices.js | 17 +++++++------- .../plugin_manager/view/detail/window.js | 17 +++++++------- .../view/list/expired_plugins_page.js | 17 +++++++------- .../plugin_manager/view/list/home_page.js | 17 +++++++------- .../view/list/import_export_teaser_page.js | 17 +++++++------- .../plugin_manager/view/list/licence_page.js | 17 +++++++------- .../view/list/local_plugin_listing_page.js | 17 +++++++------- .../plugin_manager/view/list/navigation.js | 17 +++++++------- .../view/list/premium_plugins_page.js | 17 +++++++------- .../view/list/store_listing_page.js | 17 +++++++------- .../plugin_manager/view/list/update_page.js | 17 +++++++------- .../plugin_manager/view/list/window.js | 17 +++++++------- .../plugin_manager/view/loading/mask.js | 17 +++++++------- .../plugin_manager/view/plugin_helper.js | 17 +++++++------- themes/Backend/ExtJs/backend/premium/app.js | 17 +++++++------- .../ExtJs/backend/premium/controller/main.js | 17 +++++++------- .../backend/premium/controller/premium.js | 17 +++++++------- .../ExtJs/backend/premium/model/premium.js | 17 +++++++------- .../ExtJs/backend/premium/model/subshop.js | 17 +++++++------- .../ExtJs/backend/premium/store/premiums.js | 17 +++++++------- .../ExtJs/backend/premium/store/subshops.js | 17 +++++++------- .../ExtJs/backend/premium/view/main/window.js | 17 +++++++------- .../backend/premium/view/premium/detail.js | 17 +++++++------- .../backend/premium/view/premium/list.js | 17 +++++++------- .../Backend/ExtJs/backend/product_feed/app.js | 17 +++++++------- .../backend/product_feed/controller/feed.js | 17 +++++++------- .../backend/product_feed/controller/main.js | 17 +++++++------- .../backend/product_feed/model/category.js | 17 +++++++------- .../model/category_for_combo_tree.js | 17 +++++++------- .../backend/product_feed/model/detail.js | 17 +++++++------- .../ExtJs/backend/product_feed/model/main.js | 17 +++++++------- .../ExtJs/backend/product_feed/model/shop.js | 17 +++++++------- .../backend/product_feed/store/article.js | 17 +++++++------- .../backend/product_feed/store/category.js | 17 +++++++------- .../store/category_for_combo_tree.js | 17 +++++++------- .../backend/product_feed/store/detail.js | 17 +++++++------- .../ExtJs/backend/product_feed/store/list.js | 17 +++++++------- .../ExtJs/backend/product_feed/store/shop.js | 17 +++++++------- .../backend/product_feed/store/supplier.js | 17 +++++++------- .../backend/product_feed/view/feed/detail.js | 17 +++++++------- .../backend/product_feed/view/feed/list.js | 17 +++++++------- .../product_feed/view/feed/tab/article.js | 17 +++++++------- .../product_feed/view/feed/tab/body.js | 17 +++++++------- .../product_feed/view/feed/tab/category.js | 17 +++++++------- .../product_feed/view/feed/tab/filter.js | 17 +++++++------- .../product_feed/view/feed/tab/footer.js | 17 +++++++------- .../product_feed/view/feed/tab/format.js | 17 +++++++------- .../product_feed/view/feed/tab/header.js | 17 +++++++------- .../product_feed/view/feed/tab/supplier.js | 17 +++++++------- .../backend/product_feed/view/feed/window.js | 17 +++++++------- .../backend/product_feed/view/main/window.js | 17 +++++++------- .../ExtJs/backend/product_stream/app.js | 17 +++++++------- .../backend/product_stream/controller/main.js | 17 +++++++------- .../backend/product_stream/model/product.js | 17 +++++++------- .../backend/product_stream/model/stream.js | 17 +++++++------- .../backend/product_stream/store/attribute.js | 17 +++++++------- .../backend/product_stream/store/preview.js | 17 +++++++------- .../product_stream/store/selected_products.js | 17 +++++++------- .../backend/product_stream/store/stream.js | 17 +++++++------- .../product_stream/view/common/attributes.js | 17 +++++++------- .../product_stream/view/common/settings.js | 17 +++++++------- .../condition/abstract_condition.js | 17 +++++++------- .../condition_list/condition/attribute.js | 17 +++++++------- .../view/condition_list/condition/category.js | 17 +++++++------- .../view/condition_list/condition/closeout.js | 17 +++++++------- .../condition_list/condition/create_date.js | 17 +++++++------- .../condition/has_pseudo_price.js | 17 +++++++------- .../view/condition_list/condition/height.js | 17 +++++++------- .../condition/immediate_delivery.js | 17 +++++++------- .../view/condition_list/condition/is_new.js | 17 +++++++------- .../view/condition_list/condition/length.js | 17 +++++++------- .../condition_list/condition/manufacturer.js | 17 +++++++------- .../view/condition_list/condition/price.js | 17 +++++++------- .../view/condition_list/condition/property.js | 17 +++++++------- .../condition_list/condition/release_date.js | 17 +++++++------- .../view/condition_list/condition/sales.js | 17 +++++++------- .../condition_list/condition/search_term.js | 17 +++++++------- .../condition_list/condition/vote_average.js | 17 +++++++------- .../view/condition_list/condition/weight.js | 17 +++++++------- .../view/condition_list/condition/width.js | 17 +++++++------- .../view/condition_list/condition_panel.js | 17 +++++++------- .../view/condition_list/field/attribute.js | 17 +++++++------- .../condition_list/field/attribute_date.js | 17 +++++++------- .../field/attribute_date_time.js | 17 +++++++------- .../condition_list/field/attribute_window.js | 17 +++++++------- .../view/condition_list/field/create_date.js | 17 +++++++------- .../view/condition_list/field/grid.js | 17 +++++++------- .../view/condition_list/field/property.js | 17 +++++++------- .../condition_list/field/property_window.js | 17 +++++++------- .../view/condition_list/field/range.js | 17 +++++++------- .../view/condition_list/field/release_date.js | 17 +++++++------- .../view/condition_list/field/sales.js | 17 +++++++------- .../view/condition_list/field/search_term.js | 17 +++++++------- .../view/condition_list/field/vote_average.js | 17 +++++++------- .../view/condition_list/preview_grid.js | 17 +++++++------- .../view/condition_list/window.js | 17 +++++++------- .../backend/product_stream/view/list/list.js | 17 +++++++------- .../product_stream/view/list/window.js | 17 +++++++------- .../product_stream/view/search_grid.js | 17 +++++++------- .../view/selected_list/product.js | 17 +++++++------- .../view/selected_list/window.js | 17 +++++++------- themes/Backend/ExtJs/backend/property/app.js | 17 +++++++------- .../ExtJs/backend/property/controller/main.js | 17 +++++++------- .../ExtJs/backend/property/model/group.js | 17 +++++++------- .../ExtJs/backend/property/model/option.js | 17 +++++++------- .../ExtJs/backend/property/model/set.js | 17 +++++++------- .../backend/property/model/set_assign.js | 17 +++++++------- .../ExtJs/backend/property/store/group.js | 17 +++++++------- .../ExtJs/backend/property/store/option.js | 17 +++++++------- .../ExtJs/backend/property/store/set.js | 17 +++++++------- .../backend/property/store/set_assign.js | 17 +++++++------- .../backend/property/view/main/group_grid.js | 17 +++++++------- .../backend/property/view/main/option_grid.js | 17 +++++++------- .../property/view/main/set_assign_grid.js | 17 +++++++------- .../backend/property/view/main/set_grid.js | 17 +++++++------- .../backend/property/view/main/window.js | 17 +++++++------- .../ExtJs/backend/risk_management/app.js | 17 +++++++------- .../risk_management/controller/main.js | 17 +++++++------- .../controller/risk_management.js | 17 +++++++------- .../backend/risk_management/model/areas.js | 17 +++++++------- .../backend/risk_management/model/payment.js | 17 +++++++------- .../backend/risk_management/model/risk.js | 17 +++++++------- .../backend/risk_management/model/rule.js | 17 +++++++------- .../backend/risk_management/model/subshop.js | 17 +++++++------- .../backend/risk_management/store/areas.js | 17 +++++++------- .../backend/risk_management/store/payments.js | 17 +++++++------- .../backend/risk_management/store/risks.js | 17 +++++++------- .../backend/risk_management/store/rules.js | 17 +++++++------- .../backend/risk_management/store/subshops.js | 17 +++++++------- .../risk_management/view/main/window.js | 17 +++++++------- .../view/risk_management/container.js | 17 +++++++------- .../view/risk_management/panel.js | 17 +++++++------- themes/Backend/ExtJs/backend/shipping/app.js | 17 +++++++------- .../shipping/controller/categories_tree.js | 17 +++++++------- .../shipping/controller/costs_matrix.js | 17 +++++++------- .../shipping/controller/default_form.js | 17 +++++++------- .../ExtJs/backend/shipping/controller/main.js | 17 +++++++------- .../backend/shipping/model/category_tree.js | 17 +++++++------- .../backend/shipping/model/costsmatrix.js | 17 +++++++------- .../ExtJs/backend/shipping/model/dispatch.js | 17 +++++++------- .../backend/shipping/model/dispatch_list.js | 17 +++++++------- .../ExtJs/backend/shipping/model/holiday.js | 17 +++++++------- .../ExtJs/backend/shipping/model/tax.js | 17 +++++++------- .../backend/shipping/store/category_tree.js | 17 +++++++------- .../backend/shipping/store/costsmatrix.js | 17 +++++++------- .../ExtJs/backend/shipping/store/country.js | 17 +++++++------- .../ExtJs/backend/shipping/store/dispatch.js | 17 +++++++------- .../backend/shipping/store/dispatch_list.js | 17 +++++++------- .../ExtJs/backend/shipping/store/holiday.js | 17 +++++++------- .../ExtJs/backend/shipping/store/payment.js | 17 +++++++------- .../ExtJs/backend/shipping/store/tax.js | 17 +++++++------- .../backend/shipping/view/edit/advanced.js | 17 +++++++------- .../shipping/view/edit/categories_tree.js | 17 +++++++------- .../backend/shipping/view/edit/country.js | 17 +++++++------- .../shipping/view/edit/default/form_left.js | 17 +++++++------- .../shipping/view/edit/default/form_right.js | 17 +++++++------- .../view/edit/dispatch_costs_matrix.js | 17 +++++++------- .../ExtJs/backend/shipping/view/edit/panel.js | 17 +++++++------- .../shipping/view/edit/payment_means.js | 17 +++++++------- .../ExtJs/backend/shipping/view/main.js | 17 +++++++------- .../ExtJs/backend/shipping/view/main/list.js | 17 +++++++------- themes/Backend/ExtJs/backend/site/app.js | 17 +++++++------- .../ExtJs/backend/site/controller/form.js | 17 +++++++------- .../ExtJs/backend/site/controller/main.js | 17 +++++++------- .../ExtJs/backend/site/controller/tree.js | 17 +++++++------- .../ExtJs/backend/site/model/groups.js | 17 +++++++------- .../Backend/ExtJs/backend/site/model/nodes.js | 17 +++++++------- .../ExtJs/backend/site/model/selected.js | 17 +++++++------- .../ExtJs/backend/site/store/groups.js | 17 +++++++------- .../Backend/ExtJs/backend/site/store/nodes.js | 17 +++++++------- .../ExtJs/backend/site/store/selected.js | 17 +++++++------- .../Backend/ExtJs/backend/site/store/shop.js | 17 +++++++------- .../ExtJs/backend/site/view/main/window.js | 17 +++++++------- .../ExtJs/backend/site/view/site/form.js | 17 +++++++------- .../backend/site/view/site/group_dialog.js | 17 +++++++------- .../ExtJs/backend/site/view/site/tree.js | 17 +++++++------- themes/Backend/ExtJs/backend/snippet/app.js | 17 +++++++------- .../ExtJs/backend/snippet/controller/main.js | 17 +++++++------- .../ExtJs/backend/snippet/model/n_space.js | 17 +++++++------- .../ExtJs/backend/snippet/model/shoplocale.js | 17 +++++++------- .../ExtJs/backend/snippet/model/snippet.js | 17 +++++++------- .../ExtJs/backend/snippet/store/n_space.js | 17 +++++++------- .../ExtJs/backend/snippet/store/shoplocale.js | 17 +++++++------- .../ExtJs/backend/snippet/store/snippet.js | 17 +++++++------- .../backend/snippet/view/main/create_form.js | 17 +++++++------- .../backend/snippet/view/main/edit_form.js | 17 +++++++------- .../ExtJs/backend/snippet/view/main/form.js | 17 +++++++------- .../ExtJs/backend/snippet/view/main/grid.js | 17 +++++++------- .../snippet/view/main/import_export.js | 17 +++++++------- .../backend/snippet/view/main/navigation.js | 17 +++++++------- .../snippet/view/main/snippet_panel.js | 17 +++++++------- .../snippet/view/main/translate_form.js | 17 +++++++------- .../snippet/view/main/translate_window.js | 17 +++++++------- .../ExtJs/backend/snippet/view/main/window.js | 17 +++++++------- themes/Backend/ExtJs/backend/supplier/app.js | 17 +++++++------- .../ExtJs/backend/supplier/controller/main.js | 17 +++++++------- .../ExtJs/backend/supplier/model/supplier.js | 17 +++++++------- .../ExtJs/backend/supplier/store/supplier.js | 17 +++++++------- .../ExtJs/backend/supplier/view/main.js | 17 +++++++------- .../backend/supplier/view/main/create.js | 17 +++++++------- .../backend/supplier/view/main/detail.js | 17 +++++++------- .../ExtJs/backend/supplier/view/main/edit.js | 17 +++++++------- .../ExtJs/backend/supplier/view/main/list.js | 17 +++++++------- .../backend/supplier/view/main/toolbar.js | 17 +++++++------- .../Backend/ExtJs/backend/systeminfo/app.js | 17 +++++++------- .../backend/systeminfo/controller/main.js | 17 +++++++------- .../systeminfo/controller/systeminfo.js | 17 +++++++------- .../ExtJs/backend/systeminfo/model/config.js | 17 +++++++------- .../ExtJs/backend/systeminfo/model/file.js | 17 +++++++------- .../backend/systeminfo/model/optimizer.js | 17 +++++++------- .../ExtJs/backend/systeminfo/model/path.js | 17 +++++++------- .../ExtJs/backend/systeminfo/model/version.js | 17 +++++++------- .../ExtJs/backend/systeminfo/store/configs.js | 17 +++++++------- .../ExtJs/backend/systeminfo/store/files.js | 17 +++++++------- .../backend/systeminfo/store/optimizers.js | 17 +++++++------- .../ExtJs/backend/systeminfo/store/paths.js | 17 +++++++------- .../backend/systeminfo/store/versions.js | 17 +++++++------- .../backend/systeminfo/view/main/window.js | 17 +++++++------- .../systeminfo/view/systeminfo/configlist.js | 17 +++++++------- .../systeminfo/view/systeminfo/filelist.js | 17 +++++++------- .../view/systeminfo/optimizerlist.js | 17 +++++++------- .../systeminfo/view/systeminfo/pathlist.js | 17 +++++++------- .../systeminfo/view/systeminfo/phpinfo.js | 17 +++++++------- .../systeminfo/view/systeminfo/timezone.js | 17 +++++++------- .../systeminfo/view/systeminfo/versionlist.js | 17 +++++++------- themes/Backend/ExtJs/backend/tax/app.js | 17 +++++++------- .../ExtJs/backend/tax/controller/main.js | 17 +++++++------- .../Backend/ExtJs/backend/tax/model/areas.js | 17 +++++++------- .../ExtJs/backend/tax/model/countries.js | 17 +++++++------- .../Backend/ExtJs/backend/tax/model/groups.js | 17 +++++++------- .../Backend/ExtJs/backend/tax/model/rules.js | 17 +++++++------- .../Backend/ExtJs/backend/tax/model/states.js | 17 +++++++------- .../Backend/ExtJs/backend/tax/store/areas.js | 17 +++++++------- .../ExtJs/backend/tax/store/countries.js | 17 +++++++------- .../Backend/ExtJs/backend/tax/store/groups.js | 17 +++++++------- .../Backend/ExtJs/backend/tax/store/rules.js | 17 +++++++------- .../Backend/ExtJs/backend/tax/store/states.js | 17 +++++++------- .../ExtJs/backend/tax/view/main/rules.js | 17 +++++++------- .../ExtJs/backend/tax/view/main/tree.js | 17 +++++++------- .../ExtJs/backend/tax/view/main/window.js | 17 +++++++------- themes/Backend/ExtJs/backend/theme/app.js | 17 +++++++------- .../ExtJs/backend/theme/controller/detail.js | 17 +++++++------- .../ExtJs/backend/theme/controller/list.js | 17 +++++++------- .../backend/theme/controller/settings.js | 17 +++++++------- .../ExtJs/backend/theme/model/config_set.js | 17 +++++++------- .../ExtJs/backend/theme/model/config_value.js | 17 +++++++------- .../ExtJs/backend/theme/model/element.js | 17 +++++++------- .../ExtJs/backend/theme/model/layout.js | 17 +++++++------- .../ExtJs/backend/theme/model/settings.js | 17 +++++++------- .../ExtJs/backend/theme/model/theme.js | 17 +++++++------- .../ExtJs/backend/theme/store/config_sets.js | 17 +++++++------- .../ExtJs/backend/theme/store/theme.js | 17 +++++++------- .../backend/theme/view/config_sets/window.js | 17 +++++++------- .../ExtJs/backend/theme/view/create/theme.js | 17 +++++++------- .../ExtJs/backend/theme/view/create/window.js | 17 +++++++------- .../theme/view/detail/containers/field_set.js | 17 +++++++------- .../theme/view/detail/containers/tab.js | 17 +++++++------- .../theme/view/detail/containers/tab_panel.js | 17 +++++++------- .../view/detail/fields/checkbox_field.js | 17 +++++++------- .../theme/view/detail/fields/color_picker.js | 17 +++++++------- .../theme/view/detail/fields/date_field.js | 17 +++++++------- .../theme/view/detail/fields/em_field.js | 17 +++++++------- .../view/detail/fields/media_selection.js | 17 +++++++------- .../theme/view/detail/fields/no_url_field.js | 17 +++++++------- .../theme/view/detail/fields/percent_field.js | 17 +++++++------- .../theme/view/detail/fields/pixel_field.js | 17 +++++++------- .../theme/view/detail/fields/select_field.js | 17 +++++++------- .../theme/view/detail/fields/suffix.js | 17 +++++++------- .../view/detail/fields/text_area_field.js | 17 +++++++------- .../theme/view/detail/fields/text_field.js | 17 +++++++------- .../ExtJs/backend/theme/view/detail/theme.js | 17 +++++++------- .../ExtJs/backend/theme/view/detail/window.js | 17 +++++++------- .../theme/view/list/extensions/info.js | 17 +++++++------- .../ExtJs/backend/theme/view/list/theme.js | 17 +++++++------- .../ExtJs/backend/theme/view/list/window.js | 17 +++++++------- .../backend/theme/view/settings/settings.js | 17 +++++++------- .../backend/theme/view/settings/window.js | 17 +++++++------- .../Backend/ExtJs/backend/translation/app.js | 17 +++++++------- .../backend/translation/controller/main.js | 17 +++++++------- .../backend/translation/model/language.js | 17 +++++++------- .../backend/translation/store/language.js | 17 +++++++------- .../backend/translation/view/main/form.js | 17 +++++++------- .../translation/view/main/navigation.js | 17 +++++++------- .../backend/translation/view/main/services.js | 17 +++++++------- .../backend/translation/view/main/toolbar.js | 17 +++++++------- .../backend/translation/view/main/window.js | 17 +++++++------- .../Backend/ExtJs/backend/user_manager/app.js | 17 +++++++------- .../backend/user_manager/controller/main.js | 17 +++++++------- .../backend/user_manager/controller/roles.js | 17 +++++++------- .../backend/user_manager/controller/rules.js | 17 +++++++------- .../backend/user_manager/controller/user.js | 17 +++++++------- .../backend/user_manager/model/detail.js | 17 +++++++------- .../backend/user_manager/model/locale.js | 17 +++++++------- .../backend/user_manager/model/privilege.js | 17 +++++++------- .../backend/user_manager/model/resource.js | 17 +++++++------- .../ExtJs/backend/user_manager/model/roles.js | 17 +++++++------- .../ExtJs/backend/user_manager/model/rules.js | 17 +++++++------- .../ExtJs/backend/user_manager/model/user.js | 17 +++++++------- .../backend/user_manager/model/user_detail.js | 17 +++++++------- .../backend/user_manager/store/detail.js | 17 +++++++------- .../backend/user_manager/store/locale.js | 17 +++++++------- .../ExtJs/backend/user_manager/store/roles.js | 17 +++++++------- .../ExtJs/backend/user_manager/store/rules.js | 17 +++++++------- .../ExtJs/backend/user_manager/store/user.js | 17 +++++++------- .../backend/user_manager/store/user_detail.js | 17 +++++++------- .../backend/user_manager/view/main/window.js | 17 +++++++------- .../backend/user_manager/view/roles/form.js | 17 +++++++------- .../backend/user_manager/view/roles/list.js | 17 +++++++------- .../backend/user_manager/view/rules/add.js | 17 +++++++------- .../backend/user_manager/view/rules/tree.js | 17 +++++++------- .../backend/user_manager/view/user/create.js | 17 +++++++------- .../backend/user_manager/view/user/list.js | 17 +++++++------- themes/Backend/ExtJs/backend/vote/app.js | 17 +++++++------- .../ExtJs/backend/vote/controller/main.js | 17 +++++++------- .../backend/vote/model/accept_response.js | 17 +++++++------- .../Backend/ExtJs/backend/vote/model/vote.js | 17 +++++++------- .../Backend/ExtJs/backend/vote/store/vote.js | 17 +++++++------- .../ExtJs/backend/vote/view/detail/vote.js | 17 +++++++------- .../ExtJs/backend/vote/view/detail/window.js | 17 +++++++------- .../vote/view/list/extensions/filter.js | 17 +++++++------- .../backend/vote/view/list/extensions/info.js | 17 +++++++------- .../ExtJs/backend/vote/view/list/progress.js | 17 +++++++------- .../ExtJs/backend/vote/view/list/vote.js | 17 +++++++------- .../ExtJs/backend/vote/view/list/window.js | 17 +++++++------- .../ExtJs/backend/vote/view/point_helper.js | 17 +++++++------- themes/Backend/ExtJs/backend/voucher/app.js | 17 +++++++------- .../ExtJs/backend/voucher/controller/code.js | 17 +++++++------- .../ExtJs/backend/voucher/controller/main.js | 17 +++++++------- .../backend/voucher/controller/voucher.js | 17 +++++++------- .../ExtJs/backend/voucher/model/code.js | 17 +++++++------- .../ExtJs/backend/voucher/model/detail.js | 17 +++++++------- .../ExtJs/backend/voucher/model/main.js | 17 +++++++------- .../ExtJs/backend/voucher/model/tax.js | 17 +++++++------- .../ExtJs/backend/voucher/store/code.js | 17 +++++++------- .../ExtJs/backend/voucher/store/detail.js | 17 +++++++------- .../ExtJs/backend/voucher/store/list.js | 17 +++++++------- .../ExtJs/backend/voucher/store/tax.js | 17 +++++++------- .../ExtJs/backend/voucher/view/code/list.js | 17 +++++++------- .../backend/voucher/view/code/progress.js | 17 +++++++------- .../ExtJs/backend/voucher/view/main/window.js | 17 +++++++------- .../view/voucher/base_configuration.js | 17 +++++++------- .../backend/voucher/view/voucher/list.js | 17 +++++++------- .../backend/voucher/view/voucher/window.js | 17 +++++++------- 1734 files changed, 13915 insertions(+), 15651 deletions(-) diff --git a/engine/Library/ExtJs/components/Enlight.app.Controller.js b/engine/Library/ExtJs/components/Enlight.app.Controller.js index b60db8520ae..b9ab8767e9d 100644 --- a/engine/Library/ExtJs/components/Enlight.app.Controller.js +++ b/engine/Library/ExtJs/components/Enlight.app.Controller.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/engine/Library/ExtJs/components/Enlight.app.SubApplication.js b/engine/Library/ExtJs/components/Enlight.app.SubApplication.js index 92bf5071ed2..eef6730251e 100644 --- a/engine/Library/ExtJs/components/Enlight.app.SubApplication.js +++ b/engine/Library/ExtJs/components/Enlight.app.SubApplication.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/engine/Library/ExtJs/components/Enlight.app.SubWindow.js b/engine/Library/ExtJs/components/Enlight.app.SubWindow.js index 755540e0cbb..ac422287958 100644 --- a/engine/Library/ExtJs/components/Enlight.app.SubWindow.js +++ b/engine/Library/ExtJs/components/Enlight.app.SubWindow.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/engine/Library/ExtJs/components/Enlight.app.Window.js b/engine/Library/ExtJs/components/Enlight.app.Window.js index f11b58e74e9..760e65b3e2d 100644 --- a/engine/Library/ExtJs/components/Enlight.app.Window.js +++ b/engine/Library/ExtJs/components/Enlight.app.Window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/engine/Library/ExtJs/components/Enlight.app.WindowManagement.js b/engine/Library/ExtJs/components/Enlight.app.WindowManagement.js index 603bfe495b9..995e99071db 100644 --- a/engine/Library/ExtJs/components/Enlight.app.WindowManagement.js +++ b/engine/Library/ExtJs/components/Enlight.app.WindowManagement.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/engine/Library/ExtJs/components/Enlight.form.mixin.HelpSupportElements.js b/engine/Library/ExtJs/components/Enlight.form.mixin.HelpSupportElements.js index c2d95ad322c..2a6e54d814f 100644 --- a/engine/Library/ExtJs/components/Enlight.form.mixin.HelpSupportElements.js +++ b/engine/Library/ExtJs/components/Enlight.form.mixin.HelpSupportElements.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/engine/Library/ExtJs/components/Ext.util.FileUpload.js b/engine/Library/ExtJs/components/Ext.util.FileUpload.js index e5d52c81ba2..ac1c5296908 100644 --- a/engine/Library/ExtJs/components/Ext.util.FileUpload.js +++ b/engine/Library/ExtJs/components/Ext.util.FileUpload.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/engine/Library/ExtJs/overrides/Ext.Ajax.js b/engine/Library/ExtJs/overrides/Ext.Ajax.js index 261cb6aed7f..bb71e72c09c 100644 --- a/engine/Library/ExtJs/overrides/Ext.Ajax.js +++ b/engine/Library/ExtJs/overrides/Ext.Ajax.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="extjs/overrides/ajax"} @@ -160,4 +159,4 @@ Ext.CSRFService = (function() { return me; })(); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.Base.js b/engine/Library/ExtJs/overrides/Ext.Base.js index 64401c7fcd2..0ab3835485d 100644 --- a/engine/Library/ExtJs/overrides/Ext.Base.js +++ b/engine/Library/ExtJs/overrides/Ext.Base.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** @@ -163,4 +162,4 @@ Ext.onReady(function () { }); } }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.ClassManager.js b/engine/Library/ExtJs/overrides/Ext.ClassManager.js index 2a095f6e0e6..c24237196d8 100644 --- a/engine/Library/ExtJs/overrides/Ext.ClassManager.js +++ b/engine/Library/ExtJs/overrides/Ext.ClassManager.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="extjs/overrides/classManager"} diff --git a/engine/Library/ExtJs/overrides/Ext.LoadMask.js b/engine/Library/ExtJs/overrides/Ext.LoadMask.js index 0012fbf5334..18f74f31c01 100644 --- a/engine/Library/ExtJs/overrides/Ext.LoadMask.js +++ b/engine/Library/ExtJs/overrides/Ext.LoadMask.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** @@ -146,4 +145,4 @@ Ext.define('Ext.LoadMask-Shopware', { return this.callParent(arguments); } }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.Loader.js b/engine/Library/ExtJs/overrides/Ext.Loader.js index 14a43cd02e3..7b3796d3a90 100644 --- a/engine/Library/ExtJs/overrides/Ext.Loader.js +++ b/engine/Library/ExtJs/overrides/Ext.Loader.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** @@ -421,4 +420,4 @@ return this; }; })(); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.MessageBox.js b/engine/Library/ExtJs/overrides/Ext.MessageBox.js index adf30b15911..255ae9e0637 100644 --- a/engine/Library/ExtJs/overrides/Ext.MessageBox.js +++ b/engine/Library/ExtJs/overrides/Ext.MessageBox.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="extjs/overrides/messageBox"} @@ -48,4 +47,4 @@ Ext.override(Ext.MessageBox, { me.callParent(arguments); } }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.String.js b/engine/Library/ExtJs/overrides/Ext.String.js index a2c1d202530..fec0c426157 100644 --- a/engine/Library/ExtJs/overrides/Ext.String.js +++ b/engine/Library/ExtJs/overrides/Ext.String.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** @lends Ext.String */ @@ -80,4 +79,4 @@ Ext.override(Ext.String, { return ret; } }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.Template.js b/engine/Library/ExtJs/overrides/Ext.Template.js index d038293c8a5..1633789ec7d 100644 --- a/engine/Library/ExtJs/overrides/Ext.Template.js +++ b/engine/Library/ExtJs/overrides/Ext.Template.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** @@ -39,4 +38,4 @@ Ext.override(Ext.String, { } }); //{/literal} -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.Timeout.js b/engine/Library/ExtJs/overrides/Ext.Timeout.js index 5b689d3ed67..2e3a5c7fb1f 100644 --- a/engine/Library/ExtJs/overrides/Ext.Timeout.js +++ b/engine/Library/ExtJs/overrides/Ext.Timeout.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="extjs/overrides/timeout"} @@ -37,4 +36,4 @@ if (ajaxTimeout >= 6) { { timeout: Ext.Ajax.timeout } ); } -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.app.Application.js b/engine/Library/ExtJs/overrides/Ext.app.Application.js index 83707fe1239..6259b33ec0f 100644 --- a/engine/Library/ExtJs/overrides/Ext.app.Application.js +++ b/engine/Library/ExtJs/overrides/Ext.app.Application.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/index/controller/main"} diff --git a/engine/Library/ExtJs/overrides/Ext.app.Controller.js b/engine/Library/ExtJs/overrides/Ext.app.Controller.js index 4068a420d19..8f6160ae50d 100644 --- a/engine/Library/ExtJs/overrides/Ext.app.Controller.js +++ b/engine/Library/ExtJs/overrides/Ext.app.Controller.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** @@ -222,4 +221,4 @@ Ext.override(Ext.app.Controller, { return returnRef; } }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.app.EventBus.js b/engine/Library/ExtJs/overrides/Ext.app.EventBus.js index 1534db1b41d..7b0cba5ae93 100644 --- a/engine/Library/ExtJs/overrides/Ext.app.EventBus.js +++ b/engine/Library/ExtJs/overrides/Ext.app.EventBus.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** * Ext.app.Eventbus - Override @@ -146,4 +145,4 @@ Ext.override(Ext.app.EventBus, { }); } }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.button.Button.js b/engine/Library/ExtJs/overrides/Ext.button.Button.js index 591524b0f29..f5ef485c0da 100644 --- a/engine/Library/ExtJs/overrides/Ext.button.Button.js +++ b/engine/Library/ExtJs/overrides/Ext.button.Button.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** @@ -119,4 +118,4 @@ Ext.override(Ext.button.Button, { return me; } }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.container.DockingContainer.js b/engine/Library/ExtJs/overrides/Ext.container.DockingContainer.js index 72801cfec26..0a71fb87a36 100644 --- a/engine/Library/ExtJs/overrides/Ext.container.DockingContainer.js +++ b/engine/Library/ExtJs/overrides/Ext.container.DockingContainer.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="extjs/overrides/dockingContainer"} diff --git a/engine/Library/ExtJs/overrides/Ext.data.proxy.Server.js b/engine/Library/ExtJs/overrides/Ext.data.proxy.Server.js index 482d0ade088..cc4bfd34fab 100644 --- a/engine/Library/ExtJs/overrides/Ext.data.proxy.Server.js +++ b/engine/Library/ExtJs/overrides/Ext.data.proxy.Server.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="extjs/overrides/server"} @@ -99,4 +98,4 @@ Ext.define('Ext.data.proxy.Server-Shopware', { return this.applyEncoding(min); } }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.form.Field.js b/engine/Library/ExtJs/overrides/Ext.form.Field.js index cef46508fa1..48a63470fde 100644 --- a/engine/Library/ExtJs/overrides/Ext.form.Field.js +++ b/engine/Library/ExtJs/overrides/Ext.form.Field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/engine/Library/ExtJs/overrides/Ext.form.field.ComboBox.js b/engine/Library/ExtJs/overrides/Ext.form.field.ComboBox.js index cc117dcf92a..d5cb8487834 100644 --- a/engine/Library/ExtJs/overrides/Ext.form.field.ComboBox.js +++ b/engine/Library/ExtJs/overrides/Ext.form.field.ComboBox.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** @@ -66,4 +65,4 @@ Ext.override(Ext.form.field.ComboBox, } } }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.form.field.Display.js b/engine/Library/ExtJs/overrides/Ext.form.field.Display.js index 8be4964800b..1d2d0a7b9e7 100644 --- a/engine/Library/ExtJs/overrides/Ext.form.field.Display.js +++ b/engine/Library/ExtJs/overrides/Ext.form.field.Display.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="extjs/overrides/display"} @@ -44,4 +43,4 @@ Ext.override(Ext.form.field.Display, { return value; } }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.form.field.HtmlEditor.js b/engine/Library/ExtJs/overrides/Ext.form.field.HtmlEditor.js index 6c93e64e566..3cf0da95e78 100644 --- a/engine/Library/ExtJs/overrides/Ext.form.field.HtmlEditor.js +++ b/engine/Library/ExtJs/overrides/Ext.form.field.HtmlEditor.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** @@ -43,4 +42,4 @@ Ext.define('Enlight.form.field.HtmlEditor', { }, function() { Ext.form.field.HtmlEditor.mixin('helpSupportElems', Enlight.form.mixin.HelpSupportElements); -}); \ No newline at end of file +}); diff --git a/engine/Library/ExtJs/overrides/Ext.form.field.Number.js b/engine/Library/ExtJs/overrides/Ext.form.field.Number.js index 2cd74b960c5..3e130b5219a 100644 --- a/engine/Library/ExtJs/overrides/Ext.form.field.Number.js +++ b/engine/Library/ExtJs/overrides/Ext.form.field.Number.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="extjs/overrides/number"} @@ -27,4 +26,4 @@ Ext.override(Ext.form.field.Number, { submitLocaleSeparator: false }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.form.field.Time.js b/engine/Library/ExtJs/overrides/Ext.form.field.Time.js index 4a724d1861f..0e3239d5f8c 100644 --- a/engine/Library/ExtJs/overrides/Ext.form.field.Time.js +++ b/engine/Library/ExtJs/overrides/Ext.form.field.Time.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** @@ -66,4 +65,4 @@ Ext.override(Ext.form.field.Time, return result; } }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.grid.RowEditor.js b/engine/Library/ExtJs/overrides/Ext.grid.RowEditor.js index bf5611131ce..20c1dc8f56a 100644 --- a/engine/Library/ExtJs/overrides/Ext.grid.RowEditor.js +++ b/engine/Library/ExtJs/overrides/Ext.grid.RowEditor.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="extjs/overrides/rowEditor"} @@ -123,4 +122,4 @@ Ext.override(Ext.grid.RowEditor, { } } }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.grid.column.Action.js b/engine/Library/ExtJs/overrides/Ext.grid.column.Action.js index 1d3342716bc..5992b6e97de 100644 --- a/engine/Library/ExtJs/overrides/Ext.grid.column.Action.js +++ b/engine/Library/ExtJs/overrides/Ext.grid.column.Action.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** @@ -73,4 +72,4 @@ Ext.override(Ext.grid.column.Action, { }; } }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.grid.header.Container.js b/engine/Library/ExtJs/overrides/Ext.grid.header.Container.js index 504591965eb..a1751575d72 100644 --- a/engine/Library/ExtJs/overrides/Ext.grid.header.Container.js +++ b/engine/Library/ExtJs/overrides/Ext.grid.header.Container.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** @lends Ext.grid.header.Container# */ @@ -92,4 +91,4 @@ Ext.override(Ext.grid.header.Container, { return obj; } }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.menu.Menu.js b/engine/Library/ExtJs/overrides/Ext.menu.Menu.js index 091d12754ba..4299201269b 100644 --- a/engine/Library/ExtJs/overrides/Ext.menu.Menu.js +++ b/engine/Library/ExtJs/overrides/Ext.menu.Menu.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="extjs/overrides/menu"} @@ -41,4 +40,4 @@ Ext.override(Ext.menu.Menu, { this.callParent([ev]); } }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.panel.Panel.js b/engine/Library/ExtJs/overrides/Ext.panel.Panel.js index 26a5928d506..898ce5b9fd5 100644 --- a/engine/Library/ExtJs/overrides/Ext.panel.Panel.js +++ b/engine/Library/ExtJs/overrides/Ext.panel.Panel.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** @@ -120,4 +119,4 @@ Ext.override(Ext.panel.Panel, { me.ghostPanel.el.hide(); }, }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.picker.Date.js b/engine/Library/ExtJs/overrides/Ext.picker.Date.js index efacb4efa6a..f5290d412c8 100644 --- a/engine/Library/ExtJs/overrides/Ext.picker.Date.js +++ b/engine/Library/ExtJs/overrides/Ext.picker.Date.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="extjs/overrides/date"} @@ -39,4 +38,4 @@ Ext.override(Ext.picker.Date, { } } }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.tab.Tab.js b/engine/Library/ExtJs/overrides/Ext.tab.Tab.js index 02fa35005ea..b8a9d23a834 100644 --- a/engine/Library/ExtJs/overrides/Ext.tab.Tab.js +++ b/engine/Library/ExtJs/overrides/Ext.tab.Tab.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** @@ -42,4 +41,4 @@ Ext.override(Ext.tab.Tab, { } } }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.toolbar.Paging.js b/engine/Library/ExtJs/overrides/Ext.toolbar.Paging.js index d4053c714c2..bd172a5c6fd 100644 --- a/engine/Library/ExtJs/overrides/Ext.toolbar.Paging.js +++ b/engine/Library/ExtJs/overrides/Ext.toolbar.Paging.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** @@ -121,4 +120,4 @@ Ext.override(Ext.toolbar.Paging, { } } }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.tree.Panel.js b/engine/Library/ExtJs/overrides/Ext.tree.Panel.js index f1e36b8551e..1ce21f5d460 100644 --- a/engine/Library/ExtJs/overrides/Ext.tree.Panel.js +++ b/engine/Library/ExtJs/overrides/Ext.tree.Panel.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** @@ -43,4 +42,4 @@ Ext.override(Ext.tree.Panel, { me.callOverridden(arguments); } }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.view.BoundList.js b/engine/Library/ExtJs/overrides/Ext.view.BoundList.js index 36e4b362a12..6a3e4f8b05f 100644 --- a/engine/Library/ExtJs/overrides/Ext.view.BoundList.js +++ b/engine/Library/ExtJs/overrides/Ext.view.BoundList.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** @@ -62,4 +61,4 @@ Ext.override(Ext.view.BoundList, } } }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Library/ExtJs/overrides/Ext.view.Table.js b/engine/Library/ExtJs/overrides/Ext.view.Table.js index 30b700cfeff..33e1998bb9c 100644 --- a/engine/Library/ExtJs/overrides/Ext.view.Table.js +++ b/engine/Library/ExtJs/overrides/Ext.view.Table.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** @@ -115,4 +114,4 @@ Ext.override(Ext.view.Table, { } } }); -//{/block} \ No newline at end of file +//{/block} diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/index/view/swag_update_menu.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/index/view/swag_update_menu.js index 1f48e9c91ca..f6d3c5f1771 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/index/view/swag_update_menu.js +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/index/view/swag_update_menu.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {namespace name="backend/swag_update/main"} diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/app.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/app.js index 235b5926efe..272eab18ca4 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/app.js +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ Ext.define('Shopware.apps.SwagUpdate', { extend: 'Enlight.app.SubApplication', diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/controller/main.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/controller/main.js index 0a47f828218..880c447c4d3 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/controller/main.js +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {namespace name="backend/swag_update/main"} diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/controller/progress.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/controller/progress.js index 58afff9c643..4de78df285c 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/controller/progress.js +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/controller/progress.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {namespace name="backend/swag_update/main"} diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/changelog.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/changelog.js index 95baabc6d20..d7fa8be321b 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/changelog.js +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/changelog.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ Ext.define('Shopware.apps.SwagUpdate.model.Changelog', { diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/plugins.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/plugins.js index e66f86dcc8d..ea018121366 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/plugins.js +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/plugins.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ Ext.define('Shopware.apps.SwagUpdate.model.Plugins', { diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/requirement.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/requirement.js index 40c7f271a84..2326fc4f710 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/requirement.js +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/requirement.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ Ext.define('Shopware.apps.SwagUpdate.model.Requirement', { diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/changelog.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/changelog.js index 82d956d54d4..12499cfb833 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/changelog.js +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/changelog.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ Ext.define('Shopware.apps.SwagUpdate.store.Changelog', { diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/plugins.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/plugins.js index 113afc39cb6..050bf70ea15 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/plugins.js +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/plugins.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ Ext.define('Shopware.apps.SwagUpdate.store.Plugins', { diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/requirements.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/requirements.js index 0cd4989a12f..3929db502da 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/requirements.js +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/requirements.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ Ext.define('Shopware.apps.SwagUpdate.store.Requirements', { extend: 'Ext.data.Store', diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/no_update.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/no_update.js index 2a5a62b55dc..9f1991582ba 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/no_update.js +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/no_update.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/swag_update/main"} diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/progress.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/progress.js index 56d15ba38a7..ddc5475ec06 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/progress.js +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/progress.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/swag_update/main"} diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/security_update_window.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/security_update_window.js index 35a2f6d5959..6591841d1cf 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/security_update_window.js +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/security_update_window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {namespace name="backend/swag_update/main"} diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/window.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/window.js index 725075852fb..86eb6944ba0 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/window.js +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {namespace name="backend/swag_update/main"} diff --git a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Views/emotion/backend/customer/payment_methods/controller/detail.js b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Views/emotion/backend/customer/payment_methods/controller/detail.js index 7cab42fca99..d2803df5e65 100644 --- a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Views/emotion/backend/customer/payment_methods/controller/detail.js +++ b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Views/emotion/backend/customer/payment_methods/controller/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Views/emotion/backend/order/payment_methods/controller/detail.js b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Views/emotion/backend/order/payment_methods/controller/detail.js index 18584b4e24f..17b4bf05414 100644 --- a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Views/emotion/backend/order/payment_methods/controller/detail.js +++ b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Views/emotion/backend/order/payment_methods/controller/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/_resources/resources/css/core-icon-set-new.css b/themes/Backend/ExtJs/backend/_resources/resources/css/core-icon-set-new.css index 1f782340380..9c98e9fbe8f 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/css/core-icon-set-new.css +++ b/themes/Backend/ExtJs/backend/_resources/resources/css/core-icon-set-new.css @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ .min-all,.close-all,.sprite-application--arrow,.settings--plugin-manager,.contents--blog,.contents--forms,.sprite-application-search-result,.sprite-application-text,.sprite-arrow-045-small,.sprite-arrow-225-small,.sprite-arrow-circle-315,.contents--import-export,.sprite-arrow-circle-double,.sprite-balloon--pencil,.article--ratings,.misc--help--board,.settings--performance,.sprite-block,.sprite-blue-document--minus,.sprite-blue-document--plus,.sprite-blue-document-copy,.sprite-blue-document-pdf-text,.sprite-blue-document-template,.sprite-blue-folder--exclamation,.sprite-blue-folder--minus,.sprite-blue-folder--plus,.sprite-blue-folder,.article--categories,.settings--system-info,.sprite-box,.misc--send-feedback,.sprite-btn_taskbar_cap_fenster_tooltip_ico1,.sprite-btn_taskbar_cap_fenster_tooltip_ico2,.sprite-btn_taskbar_cap_fenster_tooltip_ico3,.sprite-btn_taskbar_cap_fenster_tooltip_ico4,.sprite-calendar-month,.sprite-calendar-select-days,.sprite-calendar-select-week,.sprite-camera-lens,.settings--logfile,.sprite-category,.marketing--analyses--abort-analyses,.sprite-chart-pie-separate,.sprite-chart-up-color,.marketing--analyses,.sprite-clock--minus,.sprite-clock,.sprite-construction,.settings--payment-methods,.sprite-cross-circle,.sprite-cross-small,.sprite-cross,.sprite-disk-return-black,.sprite-disk,.sprite-document-pdf,.sprite-document-template,.sprite-documents-stack,.contents--shopsites,.sprite-drive-download,.sprite-drive-upload,.settings--performance--cache,.sprite-edit,.settings--delivery-charges,.sprite-exclamation-diamond,.sprite-exclamation,.sprite-eye,.sprite-films,.marketing--product-exports,.settings--riskmanagement,.sprite-gear--arrow,.sprite-gear,.sprite-globe--arrow,.sprite-globe-green,.sprite-globe,.sprite-grid,.sprite-hard-hat,.sprite-icon_taskbar_cap_fenster,.sprite-icon_taskbar_cap_fenster_active,.sprite-icon_taskbar_cap_logout,.sprite-icon_taskbar_cap_logout_active,.sprite-icon_taskbar_top_artikel,.sprite-icon_taskbar_top_artikel_active,.sprite-icon_taskbar_top_einstellungen,.sprite-icon_taskbar_top_einstellungen_active,.sprite-icon_taskbar_top_hilfe,.sprite-icon_taskbar_top_hilfe_active,.sprite-icon_taskbar_top_inhalte,.sprite-icon_taskbar_top_inhalte_active,.sprite-icon_taskbar_top_kunden,.sprite-icon_taskbar_top_kunden_active,.sprite-icon_taskbar_top_marketing,.sprite-icon_taskbar_top_marketing_active,.sprite-image--exclamation,.marketing--banner,.sprite-images-stack,.sprite-images,.article--add-article,.sprite-inbox-document-music,.sprite-inbox-document-text,.sprite-inbox-download,.sprite-inbox-film,.contents--media-manager,.sprite-inbox-upload,.sprite-inbox,.sprite-information,.sprite-key,.sprite-key--arrow,.sprite-key--pencil,.misc--shortcuts,.sprite-layer-select,.sprite-layout-header-3-mix,.sprite-layout-header,.sprite-layout-hf-3-mix,.sprite-leaf,.sprite-license-key,.misc--help,.sprite-lightning,.sprite-locale,.sprite-mail--minus,.settings--mail-presets,.sprite-mail--plus,.marketing--vouchers,.sprite-mail-send,.sprite-mails-stack,.sprite-megaphone,.sprite-minus-circle-frame,.sprite-minus-circle,.sprite-money--arrow,.sprite-money-coin,.sprite-moneys,.sprite-music-beam,.sprite-newspapers,.marketing--newsletters,.sprite-pencil,.sprite-photo-album--minus,.sprite-photo-album--plus,.sprite-picture--arrow,.sprite-picture--minus,.sprite-picture,.sprite-pictures,.marketing--shopping-worlds,.sprite-plus-circle-frame,.sprite-plus-circle,.sprite-property-blue,.sprite-puzzle--minus,.sprite-puzzle--plus,.marketing--analyses--overview,.sprite-sd-memory-card,.misc--about-shopware,.sprite-star-empty,.sprite-star-half,.marketing--premium-items,.sprite-sticky-note--pencil,.customers--orders,.sprite-store,.sprite-table,.sprite-target,.sprite-tick-circle,.sprite-tick-small,.sprite-tick,.sprite-ticket--pencil,.sprite-toolbox,.sprite-truck-box-label,.article--manufacturers,.customers--customer-list,.sprite-ui-scroll-pane-horizontal,.article--overview,.sprite-user--arrow,.sprite-user--pencil,.customers--add-customer,.settings--user-management,.sprite-user,.sprite-users,.settings--basic-settings,.marketing--partner-program,.marketing--analyses--email-notification,.misc--software-update,.settings--theme-manager,.article--properties,.settings--snippets,.misc--help--online-help,.marketing--analyses--stats-charts,.sprite-bin-metal-full,.sprite-inbox-image,.sprite-application-table,.sprite-application-icon-large,.sprite-star,.sprite-inbox--minus,.sprite-color--pencil,.sprite-mail,.sprite-chart,.sprite-application-home,.sprite-xfn-colleague,.sprite-magnifier,.sprite-media-player-phone,.sprite-user-silhouette-question,.sprite-inbox-document-text,.sprite-inbox--plus,.sprite-sticky-notes-pin,.sprite-imac,.sprite-ipad--portrait,.sprite-ipad--landscape,.sprite-iphone--portrait,.sprite-iphone--landscape,.sprite-document-copy,.sprite-arrow-circle-135,.sprite-application--plus,.sprite-arrow-circle-225-left,.sprite-inbox-select,.sprite-duplicate-article,.sprite-inbox-document-image,.sprite-inbox-document-folder,.sprite-user--list,.sprite-arrow-circle-double-135,.sprite-chart-impressions,.sprite-article-sales,.sprite-duplicate-grid,.sprite-duplicate-template,.sprite-partner-stats,.sprite-ui-split-panel,.sprite-application,.sprite-filter,.sprite-baggage-cart-box-label,.sprite-view-as,.sprite-multi-edit,.sprite-magnifier--arrow,.sprite-application-dock,.sprite-application-dock-180,.sprite-chain-small,.sprite-blue-document-text,.sprite-mail--pencil,.sprite-ui-check-box, .sprite-ui-check-box-uncheck,.sprite-google,.sprite-attributes,.sprite-mousepointer-click,.sprite-import,.sprite-emotion-presets,.sprite-customer-streams, .sprite-product-streams, .sprite-benchmark { background: url("../themes/images/icons/core-icon-set-new.png") no-repeat !important; diff --git a/themes/Backend/ExtJs/backend/_resources/resources/css/core-icon-set.css b/themes/Backend/ExtJs/backend/_resources/resources/css/core-icon-set.css index 0164d6bcf88..3db9bd7a208 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/css/core-icon-set.css +++ b/themes/Backend/ExtJs/backend/_resources/resources/css/core-icon-set.css @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ .min-all,.close-all,.sprite-application--arrow,.sprite-application-block,.sprite-application-blog,.sprite-application-form,.sprite-application-search-result,.sprite-application-text,.sprite-arrow-045-small,.sprite-arrow-225-small,.sprite-arrow-circle-315,.sprite-arrow-circle-double-135,.sprite-arrow-circle-double,.sprite-balloon--pencil,.sprite-balloon,.sprite-balloons-box,.sprite-bin-full,.sprite-block,.sprite-blue-document--minus,.sprite-blue-document--plus,.sprite-blue-document-copy,.sprite-blue-document-pdf-text,.sprite-blue-document-template,.sprite-blue-folder--exclamation,.sprite-blue-folder--minus,.sprite-blue-folder--plus,.sprite-blue-folder,.sprite-blue-folders-stack,.sprite-blueprint,.sprite-box,.sprite-briefcase--arrow,.sprite-btn_taskbar_cap_fenster_tooltip_ico1,.sprite-btn_taskbar_cap_fenster_tooltip_ico2,.sprite-btn_taskbar_cap_fenster_tooltip_ico3,.sprite-btn_taskbar_cap_fenster_tooltip_ico4,.sprite-calendar-month,.sprite-calendar-select-days,.sprite-calendar-select-week,.sprite-camera-lens,.sprite-cards-stack,.sprite-category,.sprite-chart-down-color,.sprite-chart-pie-separate,.sprite-chart-up-color,.sprite-chart,.sprite-clock--minus,.sprite-clock,.sprite-construction,.sprite-credit-cards,.sprite-cross-circle,.sprite-cross-small,.sprite-cross,.sprite-disk-return-black,.sprite-disk,.sprite-document-pdf,.sprite-document-template,.sprite-documents-stack,.sprite-documents,.sprite-drive-download,.sprite-drive-upload,.sprite-edit-shade,.sprite-edit,.sprite-envelope--arrow,.sprite-exclamation-diamond,.sprite-exclamation,.sprite-eye,.sprite-films,.sprite-folder-export,.sprite-funnel--exclamation,.sprite-gear--arrow,.sprite-gear,.sprite-globe--arrow,.sprite-globe-green,.sprite-globe,.sprite-grid,.sprite-hard-hat,.sprite-icon_taskbar_cap_fenster,.sprite-icon_taskbar_cap_fenster_active,.sprite-icon_taskbar_cap_logout,.sprite-icon_taskbar_cap_logout_active,.sprite-icon_taskbar_top_artikel,.sprite-icon_taskbar_top_artikel_active,.sprite-icon_taskbar_top_einstellungen,.sprite-icon_taskbar_top_einstellungen_active,.sprite-icon_taskbar_top_hilfe,.sprite-icon_taskbar_top_hilfe_active,.sprite-icon_taskbar_top_inhalte,.sprite-icon_taskbar_top_inhalte_active,.sprite-icon_taskbar_top_kunden,.sprite-icon_taskbar_top_kunden_active,.sprite-icon_taskbar_top_marketing,.sprite-icon_taskbar_top_marketing_active,.sprite-image--exclamation,.sprite-image-medium,.sprite-images-stack,.sprite-images,.sprite-inbox--plus,.sprite-inbox-document-music,.sprite-inbox-document-text,.sprite-inbox-download,.sprite-inbox-film,.sprite-inbox-image,.sprite-inbox-upload,.sprite-inbox,.sprite-information,.sprite-key--arrow,.sprite-key--pencil,.sprite-keyboard-command,.sprite-layer-select,.sprite-layout-header-3-mix,.sprite-layout-header,.sprite-layout-hf-3-mix,.sprite-leaf,.sprite-license-key,.sprite-lifebuoy,.sprite-lightning,.sprite-locale,.sprite-magnifier,.sprite-mail--minus,.sprite-mail--pencil,.sprite-mail--plus,.sprite-mail-open-image,.sprite-mail-send,.sprite-mails-stack,.sprite-megaphone,.sprite-minus-circle-frame,.sprite-minus-circle,.sprite-money--arrow,.sprite-money-coin,.sprite-moneys,.sprite-music-beam,.sprite-newspapers,.sprite-paper-plane,.sprite-pencil,.sprite-photo-album--minus,.sprite-photo-album--plus,.sprite-picture--arrow,.sprite-picture--minus,.sprite-picture,.sprite-pictures,.sprite-pin,.sprite-plus-circle-frame,.sprite-plus-circle,.sprite-property-blue,.sprite-puzzle--minus,.sprite-puzzle--plus,.sprite-report-paper,.sprite-sd-memory-card,.sprite-shopware-logo,.sprite-star-empty,.sprite-star-half,.sprite-star,.sprite-sticky-note--pencil,.sprite-sticky-notes-pin,.sprite-store,.sprite-table,.sprite-target,.sprite-tick-circle,.sprite-tick-small,.sprite-tick,.sprite-ticket--pencil,.sprite-toolbox,.sprite-truck-box-label,.sprite-truck,.sprite-ui-scroll-pane-detail,.sprite-ui-scroll-pane-horizontal,.sprite-ui-scroll-pane-list,.sprite-user--arrow,.sprite-user--pencil,.sprite-user--plus,.sprite-user-silhouette,.sprite-user,.sprite-users,.sprite-wrench-screwdriver,.sprite-xfn-colleague, .x-btn-default-toolbar-small .package_green, diff --git a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-01.css b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-01.css index 07b9a1ccfbb..2514d0abd38 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-01.css +++ b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-01.css @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ .sprite-abacus,.sprite-acorn,.sprite-address-book--arrow,.sprite-address-book--exclamation,.sprite-address-book--minus,.sprite-address-book--pencil,.sprite-address-book--plus,.sprite-address-book-blue,.sprite-address-book-open,.sprite-address-book,.sprite-alarm-clock--arrow,.sprite-alarm-clock--exclamation,.sprite-alarm-clock--minus,.sprite-alarm-clock--pencil,.sprite-alarm-clock--plus,.sprite-alarm-clock-blue,.sprite-alarm-clock-select-remain,.sprite-alarm-clock-select,.sprite-alarm-clock,.sprite-anchor,.sprite-android,.sprite-animal-dog,.sprite-animal-monkey-sulky,.sprite-animal-monkey,.sprite-animal-penguin,.sprite-animal,.sprite-application--exclamation,.sprite-application--minus,.sprite-application--pencil,.sprite-application--plus,.sprite-application-ab,.sprite-application-blue,.sprite-application-browser,.sprite-application-cloud,.sprite-application-detail,.sprite-application-dialog,.sprite-application-dock-090,.sprite-application-dock-180,.sprite-application-dock-270,.sprite-application-dock-tab,.sprite-application-dock,.sprite-application-document,.sprite-application-documents,.sprite-application-export,.sprite-application-home,.sprite-application-icon-large,.sprite-application-icon,.sprite-application-image,.sprite-application-import,.sprite-application-list,.sprite-application-medium,.sprite-application-monitor,.sprite-application-network,.sprite-application-plus-black,.sprite-application-plus-red,.sprite-application-plus,.sprite-application-rename,.sprite-application-resize-actual,.sprite-application-resize-full,.sprite-application-resize,.sprite-application-run,.sprite-application-share,.sprite-application-sidebar-collapse,.sprite-application-sidebar-expand,.sprite-application-sidebar-list,.sprite-application-sidebar,.sprite-application-small-blue,.sprite-application-small-list-blue,.sprite-application-small-list,.sprite-application-small,.sprite-application-split-tile,.sprite-application-split-vertical,.sprite-application-split,.sprite-application-sub,.sprite-application-table,.sprite-application-task,.sprite-application-terminal,.sprite-application-text-image,.sprite-application-tile-horizontal,.sprite-application-tile-vertical,.sprite-application-tile,.sprite-application-tree,.sprite-application-wave,.sprite-application,.sprite-applications-blue,.sprite-applications-stack,.sprite-applications,.sprite-arrow-000-medium,.sprite-arrow-000-small,.sprite-arrow-045-medium,.sprite-arrow-045,.sprite-arrow-090-medium,.sprite-arrow-090-small,.sprite-arrow-090,.sprite-arrow-135-medium,.sprite-arrow-135-small,.sprite-arrow-135,.sprite-arrow-180-medium,.sprite-arrow-180-small,.sprite-arrow-180,.sprite-arrow-225-medium,.sprite-arrow-225,.sprite-arrow-270-medium,.sprite-arrow-270-small,.sprite-arrow-270,.sprite-arrow-315-medium,.sprite-arrow-315-small,.sprite-arrow-315,.sprite-arrow-branch-000-left,.sprite-arrow-branch-090-left,.sprite-arrow-branch-090,.sprite-arrow-branch-180-left,.sprite-arrow-branch-180,.sprite-arrow-branch-270-left,.sprite-arrow-branch-270,.sprite-arrow-branch,.sprite-arrow-circle-045-left,.sprite-arrow-circle-135-left,.sprite-arrow-circle-135,.sprite-arrow-circle-225-left,.sprite-arrow-circle-225,.sprite-arrow-circle-315-left,.sprite-arrow-circle,.sprite-arrow-continue-000-top,.sprite-arrow-continue-090-left,.sprite-arrow-continue-090,.sprite-arrow-continue-180-top,.sprite-arrow-continue-180,.sprite-arrow-continue-270-left,.sprite-arrow-continue-270,.sprite-arrow-continue,.sprite-arrow-curve-000-double,.sprite-arrow-curve-000-left,.sprite-arrow-curve-090-left,.sprite-arrow-curve-090,.sprite-arrow-curve-180-double,.sprite-arrow-curve-180-left,.sprite-arrow-curve-180,.sprite-arrow-curve-270-left,.sprite-arrow-curve-270,.sprite-arrow-curve,.sprite-arrow-in-out,.sprite-arrow-in,.sprite-arrow-join-090,.sprite-arrow-join-180,.sprite-arrow-join-270,.sprite-arrow-join,.sprite-arrow-merge-000-left,.sprite-arrow-merge-090-left,.sprite-arrow-merge-090,.sprite-arrow-merge-180-left,.sprite-arrow-merge-180,.sprite-arrow-merge-270-left,.sprite-arrow-merge-270,.sprite-arrow-merge,.sprite-arrow-move,.sprite-arrow-out,.sprite-arrow-repeat-once,.sprite-arrow-repeat,.sprite-arrow-resize-045,.sprite-arrow-resize-090,.sprite-arrow-resize-135,.sprite-arrow-resize,.sprite-arrow-return-000-left,.sprite-arrow-return-090-left,.sprite-arrow-return-090,.sprite-arrow-return-180-left,.sprite-arrow-return-180,.sprite-arrow-return-270-left,.sprite-arrow-return-270,.sprite-arrow-return,.sprite-arrow-retweet,.sprite-arrow-skip-090,.sprite-arrow-skip-180,.sprite-arrow-skip-270,.sprite-arrow-skip,.sprite-arrow-split-090,.sprite-arrow-split-180,.sprite-arrow-split-270,.sprite-arrow-split,.sprite-arrow-step-out,.sprite-arrow-step-over,.sprite-arrow-step,.sprite-arrow-stop-090,.sprite-arrow-stop-180,.sprite-arrow-stop-270,.sprite-arrow-stop,.sprite-arrow-switch-090,.sprite-arrow-switch-180,.sprite-arrow-switch-270,.sprite-arrow-switch,.sprite-arrow-transition-090,.sprite-arrow-transition-180,.sprite-arrow-transition-270,.sprite-arrow-transition,.sprite-arrow-turn-000-left,.sprite-arrow-turn-090-left,.sprite-arrow-turn-090,.sprite-arrow-turn-180-left,.sprite-arrow-turn-180,.sprite-arrow-turn-270-left,.sprite-arrow-turn-270,.sprite-arrow-turn,.sprite-arrow,.sprite-asterisk-small-yellow,.sprite-asterisk-small,.sprite-asterisk-yellow,.sprite-asterisk,.sprite-at-sign-balloon,.sprite-at-sign-document,.sprite-at-sign-small,.sprite-at-sign,.sprite-auction-hammer--arrow,.sprite-auction-hammer--exclamation,.sprite-auction-hammer--minus,.sprite-auction-hammer--pencil,.sprite-auction-hammer--plus,.sprite-auction-hammer-gavel,.sprite-auction-hammer,.sprite-baggage-cart-box-label,.sprite-baggage-cart-box,.sprite-baggage-cart,.sprite-balance--arrow,.sprite-balance--exclamation,.sprite-balance--minus,.sprite-balance--pencil,.sprite-balance--plus,.sprite-balance-unbalance,.sprite-balance,.sprite-balloon--arrow,.sprite-balloon--exclamation,.sprite-balloon--minus,.sprite-balloon--plus,.sprite-balloon-box-left,.sprite-balloon-box,.sprite-balloon-buzz-left,.sprite-balloon-buzz,.sprite-balloon-ellipsis,.sprite-balloon-facebook-left,.sprite-balloon-facebook,.sprite-balloon-left,.sprite-balloon-prohibition,.sprite-balloon-quotation,.sprite-balloon-small-left,.sprite-balloon-small,.sprite-balloon-smiley-sad,.sprite-balloon-smiley,.sprite-balloon-sound,.sprite-balloon-twitter-left,.sprite-balloon-twitter-retweet,.sprite-balloon-twitter,.sprite-balloon-white-left,.sprite-balloon-white,.sprite-balloons-facebook-box,.sprite-balloons-facebook,.sprite-balloons-twitter-box,.sprite-balloons-twitter,.sprite-balloons-white,.sprite-balloons,.sprite-bamboo,.sprite-bamboos,.sprite-bandaid--arrow,.sprite-bandaid--exclamation,.sprite-bandaid--minus,.sprite-bandaid--pencil,.sprite-bandaid--plus,.sprite-bandaid-small,.sprite-bandaid,.sprite-bank--arrow,.sprite-bank--exclamation,.sprite-bank--minus,.sprite-bank--pencil,.sprite-bank--plus,.sprite-bank,.sprite-barcode-2d,.sprite-barcode,.sprite-battery--arrow,.sprite-battery--exclamation,.sprite-battery--minus,.sprite-battery--pencil,.sprite-battery--plus,.sprite-battery-charge,.sprite-battery-empty,.sprite-battery-full,.sprite-battery-low,.sprite-battery-plug,.sprite-battery,.sprite-bauble,.sprite-beaker--arrow,.sprite-beaker--exclamation,.sprite-beaker--minus,.sprite-beaker--pencil,.sprite-beaker--plus,.sprite-beaker-empty,.sprite-beaker,.sprite-bean--arrow,.sprite-bean--exclamation,.sprite-bean--minus,.sprite-bean--pencil,.sprite-bean--plus,.sprite-bean-green,.sprite-bean-small-green,.sprite-bean-small,.sprite-bean,.sprite-beans,.sprite-beer,.sprite-bell--arrow,.sprite-bell--exclamation,.sprite-bell--minus,.sprite-bell--pencil,.sprite-bell--plus,.sprite-bell-small,.sprite-bell,.sprite-billboard-empty,.sprite-billboard-red,.sprite-billboard,.sprite-bin--arrow,.sprite-bin--exclamation,.sprite-bin--minus,.sprite-bin--pencil,.sprite-bin--plus,.sprite-bin-metal-full,.sprite-bin-metal,.sprite-bin,.sprite-binocular--arrow,.sprite-binocular--exclamation,.sprite-binocular--minus,.sprite-binocular--pencil,.sprite-binocular--plus,.sprite-binocular-small,.sprite-binocular,.sprite-block--arrow,.sprite-block--exclamation,.sprite-block--minus,.sprite-block--pencil,.sprite-block--plus,.sprite-block-share,.sprite-block-small,.sprite-blog--arrow,.sprite-blog--exclamation,.sprite-blog--minus,.sprite-blog--pencil,.sprite-blog--plus,.sprite-blog-blue,.sprite-blog-medium,.sprite-blog-posterous,.sprite-blog-tumblr,.sprite-blog,.sprite-blogs-stack,.sprite-blogs,.sprite-blue-document--arrow,.sprite-blue-document--exclamation,.sprite-blue-document--pencil,.sprite-blue-document-access,.sprite-blue-document-attribute-b,.sprite-blue-document-attribute-c,.sprite-blue-document-attribute-d,.sprite-blue-document-attribute-e,.sprite-blue-document-attribute-f,.sprite-blue-document-attribute-g,.sprite-blue-document-attribute-h,.sprite-blue-document-attribute-i,.sprite-blue-document-attribute-j,.sprite-blue-document-attribute-k,.sprite-blue-document-attribute-l,.sprite-blue-document-attribute-m,.sprite-blue-document-attribute-n,.sprite-blue-document-attribute-o,.sprite-blue-document-attribute-p,.sprite-blue-document-attribute-q,.sprite-blue-document-attribute-r,.sprite-blue-document-attribute-s,.sprite-blue-document-attribute-t,.sprite-blue-document-attribute-u,.sprite-blue-document-attribute-v,.sprite-blue-document-attribute-w,.sprite-blue-document-attribute-x,.sprite-blue-document-attribute-y,.sprite-blue-document-attribute-z,.sprite-blue-document-attribute,.sprite-blue-document-binary,.sprite-blue-document-block,.sprite-blue-document-bookmark,.sprite-blue-document-break,.sprite-blue-document-broken,.sprite-blue-document-clock,.sprite-blue-document-code,.sprite-blue-document-convert,.sprite-blue-document-epub-text,.sprite-blue-document-epub,.sprite-blue-document-excel-csv,.sprite-blue-document-excel-table,.sprite-blue-document-excel,.sprite-blue-document-export,.sprite-blue-document-film,.sprite-blue-document-flash-movie,.sprite-blue-document-flash,.sprite-blue-document-globe,.sprite-blue-document-hf-delete-footer,.sprite-blue-document-hf-delete,.sprite-blue-document-hf-insert-footer,.sprite-blue-document-hf-insert,.sprite-blue-document-hf-select-footer,.sprite-blue-document-hf-select,.sprite-blue-document-hf,.sprite-blue-document-horizontal-text,.sprite-blue-document-horizontal,.sprite-blue-document-illustrator,.sprite-blue-document-image,.sprite-blue-document-import,.sprite-blue-document-insert,.sprite-blue-document-invoice,.sprite-blue-document-list,.sprite-blue-document-medium,.sprite-blue-document-mobi-text,.sprite-blue-document-mobi,.sprite-blue-document-music-playlist,.sprite-blue-document-music,.sprite-blue-document-node,.sprite-blue-document-number-0,.sprite-blue-document-number-1,.sprite-blue-document-number-2,.sprite-blue-document-number-3,.sprite-blue-document-number-4,.sprite-blue-document-number-5 { diff --git a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-02.css b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-02.css index afdf6434e55..e3e0f3c4ead 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-02.css +++ b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-02.css @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ .sprite-blue-document-number-6,.sprite-blue-document-number-7,.sprite-blue-document-number-8,.sprite-blue-document-number-9,.sprite-blue-document-number,.sprite-blue-document-office-text,.sprite-blue-document-office,.sprite-blue-document-outlook,.sprite-blue-document-page-last,.sprite-blue-document-page-next,.sprite-blue-document-page-previous,.sprite-blue-document-page,.sprite-blue-document-pdf,.sprite-blue-document-photoshop-image,.sprite-blue-document-photoshop,.sprite-blue-document-php,.sprite-blue-document-powerpoint,.sprite-blue-document-rename,.sprite-blue-document-resize-actual,.sprite-blue-document-resize,.sprite-blue-document-search-result,.sprite-blue-document-share,.sprite-blue-document-shred,.sprite-blue-document-small-list,.sprite-blue-document-small,.sprite-blue-document-smiley-sad,.sprite-blue-document-smiley,.sprite-blue-document-snippet,.sprite-blue-document-stamp,.sprite-blue-document-stand,.sprite-blue-document-sticky-note,.sprite-blue-document-sub,.sprite-blue-document-table,.sprite-blue-document-tag,.sprite-blue-document-task,.sprite-blue-document-tex,.sprite-blue-document-text-image,.sprite-blue-document-text,.sprite-blue-document-tree,.sprite-blue-document-view-book,.sprite-blue-document-view-thumbnail,.sprite-blue-document-view,.sprite-blue-document-visual-studio,.sprite-blue-document-word-text,.sprite-blue-document-word-tick,.sprite-blue-document-word,.sprite-blue-document-xaml,.sprite-blue-document-zipper,.sprite-blue-document,.sprite-blue-documents-stack,.sprite-blue-documents-text,.sprite-blue-documents,.sprite-blue-folder--arrow,.sprite-blue-folder--pencil,.sprite-blue-folder-bookmark,.sprite-blue-folder-broken,.sprite-blue-folder-export,.sprite-blue-folder-horizontal-open,.sprite-blue-folder-horizontal,.sprite-blue-folder-import,.sprite-blue-folder-medium,.sprite-blue-folder-network-horizontal-open,.sprite-blue-folder-network-horizontal,.sprite-blue-folder-network,.sprite-blue-folder-open-document-music-playlist,.sprite-blue-folder-open-document-music,.sprite-blue-folder-open-document-text,.sprite-blue-folder-open-document,.sprite-blue-folder-open-feed,.sprite-blue-folder-open-film,.sprite-blue-folder-open-image,.sprite-blue-folder-open-slide,.sprite-blue-folder-open-table,.sprite-blue-folder-open,.sprite-blue-folder-rename,.sprite-blue-folder-search-result,.sprite-blue-folder-share,.sprite-blue-folder-shred,.sprite-blue-folder-small-horizontal,.sprite-blue-folder-small,.sprite-blue-folder-smiley-sad,.sprite-blue-folder-smiley,.sprite-blue-folder-stamp,.sprite-blue-folder-stand,.sprite-blue-folder-sticky-note,.sprite-blue-folder-tree,.sprite-blue-folder-zipper,.sprite-blue-folders,.sprite-blueprint--arrow,.sprite-blueprint--exclamation,.sprite-blueprint--minus,.sprite-blueprint--pencil,.sprite-blueprint--plus,.sprite-blueprint-horizontal,.sprite-blueprint-medium,.sprite-blueprints,.sprite-bluetooth,.sprite-board-game-go,.sprite-board-game,.sprite-bomb,.sprite-book--arrow,.sprite-book--exclamation,.sprite-book--minus,.sprite-book--pencil,.sprite-book--plus,.sprite-book-bookmark,.sprite-book-brown,.sprite-book-open-bookmark,.sprite-book-open-list,.sprite-book-open-next,.sprite-book-open-previous,.sprite-book-open-text-image,.sprite-book-open-text,.sprite-book-open,.sprite-book-question,.sprite-book-small-brown,.sprite-book-small,.sprite-book,.sprite-bookmark--arrow,.sprite-bookmark--exclamation,.sprite-bookmark--minus,.sprite-bookmark--pencil,.sprite-bookmark--plus,.sprite-bookmark-export,.sprite-bookmark-import,.sprite-bookmark-small,.sprite-bookmark,.sprite-bookmarks,.sprite-books-brown,.sprite-books-stack,.sprite-books,.sprite-border-all,.sprite-border-bottom-double,.sprite-border-bottom-thick,.sprite-border-bottom,.sprite-border-color,.sprite-border-dash,.sprite-border-down,.sprite-border-draw,.sprite-border-horizontal-all,.sprite-border-horizontal,.sprite-border-inside,.sprite-border-left,.sprite-border-outside-thick,.sprite-border-outside,.sprite-border-right,.sprite-border-top-bottom-double,.sprite-border-top-bottom-thick,.sprite-border-top-bottom,.sprite-border-top,.sprite-border-up,.sprite-border-vertical-all,.sprite-border-vertical,.sprite-border-weight,.sprite-border,.sprite-box--arrow,.sprite-box--exclamation,.sprite-box--minus,.sprite-box--pencil,.sprite-box--plus,.sprite-box-document,.sprite-box-label,.sprite-box-medium,.sprite-box-resize-actual,.sprite-box-resize,.sprite-box-search-result,.sprite-box-share,.sprite-box-small,.sprite-box-zipper,.sprite-brain--arrow,.sprite-brain--exclamation,.sprite-brain--minus,.sprite-brain--pencil,.sprite-brain--plus,.sprite-brain-empty,.sprite-brain,.sprite-bread,.sprite-breads,.sprite-briefcase--exclamation,.sprite-briefcase--minus,.sprite-briefcase--pencil,.sprite-briefcase--plus,.sprite-briefcase-small,.sprite-briefcase,.sprite-brightness-control-up,.sprite-brightness-control,.sprite-brightness-low,.sprite-brightness-small-low,.sprite-brightness-small,.sprite-brightness,.sprite-broom--arrow,.sprite-broom--exclamation,.sprite-broom--minus,.sprite-broom--pencil,.sprite-broom--plus,.sprite-broom-code,.sprite-broom,.sprite-bug--arrow,.sprite-bug--exclamation,.sprite-bug--minus,.sprite-bug--pencil,.sprite-bug--plus,.sprite-bug,.sprite-building--arrow,.sprite-building--exclamation,.sprite-building--minus,.sprite-building--pencil,.sprite-building--plus,.sprite-building-hedge,.sprite-building-low,.sprite-building-medium,.sprite-building-network,.sprite-building-old,.sprite-building-small,.sprite-building,.sprite-burn--arrow,.sprite-burn--exclamation,.sprite-burn--minus,.sprite-burn--pencil,.sprite-burn--plus,.sprite-burn-small,.sprite-burn,.sprite-cactus,.sprite-cake--arrow,.sprite-cake--exclamation,.sprite-cake--minus,.sprite-cake--pencil,.sprite-cake--plus,.sprite-cake-plain,.sprite-cake,.sprite-calculator--arrow,.sprite-calculator--exclamation,.sprite-calculator--minus,.sprite-calculator--pencil,.sprite-calculator--plus,.sprite-calculator-gray,.sprite-calculator-scientific,.sprite-calculator,.sprite-calendar--arrow,.sprite-calendar--exclamation,.sprite-calendar--minus,.sprite-calendar--pencil,.sprite-calendar--plus,.sprite-calendar-blue,.sprite-calendar-day,.sprite-calendar-delete,.sprite-calendar-empty,.sprite-calendar-export,.sprite-calendar-import,.sprite-calendar-insert,.sprite-calendar-list,.sprite-calendar-medium,.sprite-calendar-next,.sprite-calendar-previous,.sprite-calendar-property,.sprite-calendar-relation,.sprite-calendar-search-result,.sprite-calendar-select-days-span,.sprite-calendar-select-month,.sprite-calendar-select,.sprite-calendar-share,.sprite-calendar-small-month,.sprite-calendar-small,.sprite-calendar-task,.sprite-calendar,.sprite-camcorder--arrow,.sprite-camcorder--exclamation,.sprite-camcorder--minus,.sprite-camcorder--pencil,.sprite-camcorder--plus,.sprite-camcorder-image,.sprite-camcorder,.sprite-camera--arrow,.sprite-camera--exclamation,.sprite-camera--minus,.sprite-camera--pencil,.sprite-camera--plus,.sprite-camera-black,.sprite-camera-small-black,.sprite-camera-small,.sprite-camera,.sprite-candle-white,.sprite-candle,.sprite-candy-cane,.sprite-car--arrow,.sprite-car--exclamation,.sprite-car--minus,.sprite-car--pencil,.sprite-car--plus,.sprite-car-red,.sprite-car-taxi,.sprite-car,.sprite-card--arrow,.sprite-card--exclamation,.sprite-card--minus,.sprite-card--pencil,.sprite-card--plus,.sprite-card-address,.sprite-card-export,.sprite-card-import,.sprite-card-medium,.sprite-card-small,.sprite-card,.sprite-cards-address,.sprite-cards-bind-address,.sprite-cards-bind,.sprite-cards,.sprite-cassette--arrow,.sprite-cassette--exclamation,.sprite-cassette--minus,.sprite-cassette--pencil,.sprite-cassette--plus,.sprite-cassette-label,.sprite-cassette-small,.sprite-cassette,.sprite-categories,.sprite-category-group-select,.sprite-category-group,.sprite-category-item-select,.sprite-category-item,.sprite-caution-board-prohibition,.sprite-caution-board,.sprite-certificate,.sprite-chain--arrow,.sprite-chain--exclamation,.sprite-chain--minus,.sprite-chain--pencil,.sprite-chain--plus,.sprite-chain-small,.sprite-chain-unchain,.sprite-chain,.sprite-chair--arrow,.sprite-chair--exclamation,.sprite-chair--minus,.sprite-chair--pencil,.sprite-chair--plus,.sprite-chair,.sprite-chalkboard-text,.sprite-chalkboard,.sprite-chart--arrow,.sprite-chart--exclamation,.sprite-chart--minus,.sprite-chart--pencil,.sprite-chart--plus,.sprite-chart-down,.sprite-chart-medium,.sprite-chart-pie,.sprite-chart-up,.sprite-checkerboard,.sprite-cheese-hole,.sprite-cheese,.sprite-cheque--arrow,.sprite-cheque--exclamation,.sprite-cheque--minus,.sprite-cheque--plus,.sprite-cheque-pen,.sprite-cheque-sign,.sprite-cheque,.sprite-chevron-expand,.sprite-chevron-small-expand,.sprite-chevron-small,.sprite-chevron,.sprite-chocolate-bite,.sprite-chocolate-heart-milk,.sprite-chocolate-heart,.sprite-chocolate-milk,.sprite-chocolate,.sprite-church,.sprite-cigarette-prohibition,.sprite-cigarette,.sprite-clapperboard--arrow,.sprite-clapperboard--exclamation,.sprite-clapperboard--minus,.sprite-clapperboard--pencil,.sprite-clapperboard--plus,.sprite-clapperboard,.sprite-clipboard--arrow,.sprite-clipboard--exclamation,.sprite-clipboard--minus,.sprite-clipboard--pencil,.sprite-clipboard--plus,.sprite-clipboard-block,.sprite-clipboard-empty,.sprite-clipboard-invoice,.sprite-clipboard-list,.sprite-clipboard-paste-document-text,.sprite-clipboard-paste-image,.sprite-clipboard-paste-word,.sprite-clipboard-paste,.sprite-clipboard-search-result,.sprite-clipboard-sign-out,.sprite-clipboard-sign,.sprite-clipboard-task,.sprite-clipboard-text,.sprite-clipboard,.sprite-clock--arrow,.sprite-clock--exclamation,.sprite-clock--pencil,.sprite-clock--plus,.sprite-clock-frame,.sprite-clock-history-frame,.sprite-clock-history,.sprite-clock-moon-phase,.sprite-clock-network,.sprite-clock-select-remain,.sprite-clock-select,.sprite-clock-small,.sprite-co2,.sprite-color--arrow,.sprite-color--exclamation,.sprite-color--minus,.sprite-color--pencil,.sprite-color--plus,.sprite-color-adjustment-green,.sprite-color-adjustment-red,.sprite-color-adjustment,.sprite-color-small,.sprite-color-swatch-small,.sprite-color-swatch,.sprite-color-swatches,.sprite-color,.sprite-compass--arrow,.sprite-compass--exclamation,.sprite-compass--minus,.sprite-compass--pencil { background: url("../themes/images/icons/extra-icon-set-02.png") no-repeat !important; diff --git a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-03.css b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-03.css index 6dbfcd929ea..bb53b952000 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-03.css +++ b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-03.css @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ .sprite-compass--plus,.sprite-compass,.sprite-compile-error,.sprite-compile-warning,.sprite-compile,.sprite-computer--arrow,.sprite-computer--exclamation,.sprite-computer--minus,.sprite-computer--pencil,.sprite-computer--plus,.sprite-computer-cloud,.sprite-computer-network,.sprite-computer-off,.sprite-computer,.sprite-contrast-control-up,.sprite-contrast-control,.sprite-contrast-low,.sprite-contrast-small-low,.sprite-contrast-small,.sprite-contrast,.sprite-control-000-small,.sprite-control-090-small,.sprite-control-090,.sprite-control-180-small,.sprite-control-180,.sprite-control-270-small,.sprite-control-270,.sprite-control-cursor,.sprite-control-double-000-small,.sprite-control-double-090-small,.sprite-control-double-090,.sprite-control-double-180-small,.sprite-control-double-180,.sprite-control-double-270-small,.sprite-control-double-270,.sprite-control-double,.sprite-control-eject-small,.sprite-control-eject,.sprite-control-pause-record-small,.sprite-control-pause-record,.sprite-control-pause-small,.sprite-control-pause,.sprite-control-power-small,.sprite-control-power,.sprite-control-record-small,.sprite-control-record,.sprite-control-skip-000-small,.sprite-control-skip-090-small,.sprite-control-skip-090,.sprite-control-skip-180-small,.sprite-control-skip-180,.sprite-control-skip-270-small,.sprite-control-skip-270,.sprite-control-skip,.sprite-control-stop-000-small,.sprite-control-stop-090-small,.sprite-control-stop-090,.sprite-control-stop-180-small,.sprite-control-stop-180,.sprite-control-stop-270-small,.sprite-control-stop-270,.sprite-control-stop-square-small,.sprite-control-stop-square,.sprite-control-stop,.sprite-control,.sprite-controller-d-pad,.sprite-controller,.sprite-cookie--arrow,.sprite-cookie--exclamation,.sprite-cookie--minus,.sprite-cookie--pencil,.sprite-cookie--plus,.sprite-cookie-bite,.sprite-cookie-chocolate-sprinkles,.sprite-cookie-chocolate,.sprite-cookie-heart-chocolate-sprinkles,.sprite-cookie-heart-chocolate,.sprite-cookie-heart,.sprite-cookie-medium,.sprite-cookie,.sprite-cookies,.sprite-counter-count-up,.sprite-counter-count,.sprite-counter-reset,.sprite-counter-stop,.sprite-counter,.sprite-creative-commons,.sprite-credit-card--arrow,.sprite-credit-card--exclamation,.sprite-credit-card--minus,.sprite-credit-card--pencil,.sprite-credit-card--plus,.sprite-credit-card-green,.sprite-credit-card-medium,.sprite-credit-card,.sprite-cross-button,.sprite-cross-circle-frame,.sprite-cross-octagon-frame,.sprite-cross-octagon,.sprite-cross-script,.sprite-cross-shield,.sprite-cross-small-circle,.sprite-cross-small-white,.sprite-cross-white,.sprite-crown--arrow,.sprite-crown--exclamation,.sprite-crown--minus,.sprite-crown--pencil,.sprite-crown--plus,.sprite-crown-bronze,.sprite-crown-silver,.sprite-crown,.sprite-cup--arrow,.sprite-cup--exclamation,.sprite-cup--minus,.sprite-cup--pencil,.sprite-cup--plus,.sprite-cup-empty,.sprite-cup-tea,.sprite-cup,.sprite-currency-dollar-aud,.sprite-currency-dollar-cad,.sprite-currency-dollar-nzd,.sprite-currency-dollar-usd,.sprite-currency-euro,.sprite-currency-pound,.sprite-currency-ruble,.sprite-currency-yen,.sprite-currency,.sprite-cursor-lifebuoy,.sprite-cursor-question,.sprite-cursor-small,.sprite-cursor,.sprite-curtain,.sprite-cushion-gray,.sprite-cushion,.sprite-cutleries,.sprite-cutlery-fork,.sprite-cutlery-knife,.sprite-cutlery-spoon,.sprite-cutlery,.sprite-cutter--arrow,.sprite-cutter--exclamation,.sprite-cutter--minus,.sprite-cutter--pencil,.sprite-cutter--plus,.sprite-cutter,.sprite-dashboard--arrow,.sprite-dashboard--exclamation,.sprite-dashboard--minus,.sprite-dashboard--pencil,.sprite-dashboard--plus,.sprite-dashboard-network,.sprite-dashboard,.sprite-database--arrow,.sprite-database--exclamation,.sprite-database--minus,.sprite-database--pencil,.sprite-database--plus,.sprite-database-cloud,.sprite-database-delete,.sprite-database-export,.sprite-database-import,.sprite-database-insert,.sprite-database-medium,.sprite-database-network,.sprite-database-property,.sprite-database-share,.sprite-database-small,.sprite-database-sql,.sprite-database,.sprite-databases-relation,.sprite-databases,.sprite-desktop-empty,.sprite-desktop-image,.sprite-desktop-network,.sprite-desktop-share,.sprite-desktop,.sprite-diamond,.sprite-direction--arrow,.sprite-direction--exclamation,.sprite-direction--minus,.sprite-direction--pencil,.sprite-direction--plus,.sprite-direction,.sprite-disc--arrow,.sprite-disc--exclamation,.sprite-disc--minus,.sprite-disc--pencil,.sprite-disc--plus,.sprite-disc-blue,.sprite-disc-case-label,.sprite-disc-case,.sprite-disc-label,.sprite-disc-rename,.sprite-disc-share,.sprite-disc-small,.sprite-disc,.sprite-discs,.sprite-disk--arrow,.sprite-disk--exclamation,.sprite-disk--minus,.sprite-disk--pencil,.sprite-disk--plus,.sprite-disk-black,.sprite-disk-rename,.sprite-disk-return,.sprite-disk-share,.sprite-disk-small-black,.sprite-disk-small,.sprite-disks-black,.sprite-disks,.sprite-do-not-disturb-sign-prohibition,.sprite-do-not-disturb-sign,.sprite-document--arrow,.sprite-document--exclamation,.sprite-document--minus,.sprite-document--pencil,.sprite-document--plus,.sprite-document-access,.sprite-document-attribute-b,.sprite-document-attribute-c,.sprite-document-attribute-d,.sprite-document-attribute-e,.sprite-document-attribute-f,.sprite-document-attribute-g,.sprite-document-attribute-h,.sprite-document-attribute-i,.sprite-document-attribute-j,.sprite-document-attribute-k,.sprite-document-attribute-l,.sprite-document-attribute-m,.sprite-document-attribute-n,.sprite-document-attribute-o,.sprite-document-attribute-p,.sprite-document-attribute-q,.sprite-document-attribute-r,.sprite-document-attribute-s,.sprite-document-attribute-t,.sprite-document-attribute-u,.sprite-document-attribute-v,.sprite-document-attribute-w,.sprite-document-attribute-x,.sprite-document-attribute-y,.sprite-document-attribute-z,.sprite-document-attribute,.sprite-document-binary,.sprite-document-block,.sprite-document-bookmark,.sprite-document-braille,.sprite-document-break,.sprite-document-broken,.sprite-document-clock,.sprite-document-code,.sprite-document-convert,.sprite-document-copy,.sprite-document-epub-text,.sprite-document-epub,.sprite-document-excel-csv,.sprite-document-excel-table,.sprite-document-excel,.sprite-document-export,.sprite-document-film,.sprite-document-flash-movie,.sprite-document-flash,.sprite-document-globe,.sprite-document-hf-delete-footer,.sprite-document-hf-delete,.sprite-document-hf-insert-footer,.sprite-document-hf-insert,.sprite-document-hf-select-footer,.sprite-document-hf-select,.sprite-document-hf,.sprite-document-horizontal-text,.sprite-document-horizontal,.sprite-document-illustrator,.sprite-document-image,.sprite-document-import,.sprite-document-insert,.sprite-document-invoice,.sprite-document-list,.sprite-document-medium,.sprite-document-mobi-text,.sprite-document-mobi,.sprite-document-music-playlist,.sprite-document-music,.sprite-document-node,.sprite-document-number-0,.sprite-document-number-1,.sprite-document-number-2,.sprite-document-number-3,.sprite-document-number-4,.sprite-document-number-5,.sprite-document-number-6,.sprite-document-number-7,.sprite-document-number-8,.sprite-document-number-9,.sprite-document-number,.sprite-document-office-text,.sprite-document-office,.sprite-document-outlook,.sprite-document-page-last,.sprite-document-page-next,.sprite-document-page-previous,.sprite-document-page,.sprite-document-pdf-text,.sprite-document-photoshop-image,.sprite-document-photoshop,.sprite-document-php,.sprite-document-powerpoint,.sprite-document-rename,.sprite-document-resize-actual,.sprite-document-resize,.sprite-document-search-result,.sprite-document-share,.sprite-document-shred,.sprite-document-small-list,.sprite-document-small,.sprite-document-smiley-sad,.sprite-document-smiley,.sprite-document-snippet,.sprite-document-stamp,.sprite-document-stand,.sprite-document-sticky-note,.sprite-document-sub,.sprite-document-table,.sprite-document-tag,.sprite-document-task,.sprite-document-tex,.sprite-document-text-image,.sprite-document-text,.sprite-document-tree,.sprite-document-view-book,.sprite-document-view-thumbnail,.sprite-document-view,.sprite-document-visual-studio,.sprite-document-word-text,.sprite-document-word-tick,.sprite-document-word,.sprite-document-xaml,.sprite-document-zipper,.sprite-document,.sprite-documents-text,.sprite-door--arrow,.sprite-door--exclamation,.sprite-door--minus,.sprite-door--pencil,.sprite-door--plus,.sprite-door-open-in,.sprite-door-open-out,.sprite-door-open,.sprite-door,.sprite-download-cloud,.sprite-download-linux,.sprite-download-mac-os,.sprite-download,.sprite-drawer--arrow,.sprite-drawer--exclamation,.sprite-drawer--minus,.sprite-drawer--pencil,.sprite-drawer--plus,.sprite-drawer-open,.sprite-drawer,.sprite-dress,.sprite-drill--arrow,.sprite-drill--exclamation,.sprite-drill--minus,.sprite-drill--pencil,.sprite-drill--plus,.sprite-drill,.sprite-drive--arrow,.sprite-drive--exclamation,.sprite-drive--minus,.sprite-drive--pencil,.sprite-drive--plus,.sprite-drive-disc-blue,.sprite-drive-disc,.sprite-drive-globe,.sprite-drive-medium,.sprite-drive-network,.sprite-drive-rename,.sprite-drive-share,.sprite-drive-small,.sprite-drive,.sprite-dummy-happy,.sprite-dummy-sad,.sprite-dummy-small,.sprite-dummy,.sprite-e-book-reader-black,.sprite-e-book-reader-white,.sprite-e-book-reader,.sprite-ear--arrow,.sprite-ear--exclamation,.sprite-ear--minus,.sprite-ear--pencil,.sprite-ear--plus,.sprite-ear-listen,.sprite-ear-right,.sprite-ear,.sprite-edit-alignment-center,.sprite-edit-alignment-justify-distribute,.sprite-edit-alignment-justify,.sprite-edit-alignment-right,.sprite-edit-alignment,.sprite-edit-all-caps,.sprite-edit-bold,.sprite-edit-code-division,.sprite-edit-code,.sprite-edit-color,.sprite-edit-column,.sprite-edit-comma,.sprite-edit-decimal-decrease,.sprite-edit-decimal,.sprite-edit-diff,.sprite-edit-direction-rtl,.sprite-edit-direction,.sprite-edit-drop-cap,.sprite-edit-family,.sprite-edit-heading-1,.sprite-edit-heading-2,.sprite-edit-heading-3,.sprite-edit-heading-4,.sprite-edit-heading-5,.sprite-edit-heading-6,.sprite-edit-heading { background: url("../themes/images/icons/extra-icon-set-03.png") !important; diff --git a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-04.css b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-04.css index 82c3c57f1d9..03631246e74 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-04.css +++ b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-04.css @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ .sprite-edit-hyphenation,.sprite-edit-image-center,.sprite-edit-image-right,.sprite-edit-image,.sprite-edit-indent-rtl,.sprite-edit-indent,.sprite-edit-italic,.sprite-edit-kerning,.sprite-edit-language,.sprite-edit-letter-spacing,.sprite-edit-line-spacing,.sprite-edit-lipsum,.sprite-edit-list-order-rtl,.sprite-edit-list-order,.sprite-edit-list-rtl,.sprite-edit-list,.sprite-edit-lowercase,.sprite-edit-mathematics,.sprite-edit-number,.sprite-edit-outdent-rtl,.sprite-edit-outdent,.sprite-edit-outline,.sprite-edit-overline,.sprite-edit-padding-left,.sprite-edit-padding-right,.sprite-edit-padding-top,.sprite-edit-padding,.sprite-edit-percent,.sprite-edit-pilcrow,.sprite-edit-quotation,.sprite-edit-replace,.sprite-edit-rotate,.sprite-edit-rule,.sprite-edit-scale-vertical,.sprite-edit-scale,.sprite-edit-shadow,.sprite-edit-signiture,.sprite-edit-size-down,.sprite-edit-size-up,.sprite-edit-size,.sprite-edit-small-caps,.sprite-edit-space,.sprite-edit-strike-double,.sprite-edit-strike,.sprite-edit-style,.sprite-edit-subscript,.sprite-edit-superscript,.sprite-edit-symbol,.sprite-edit-underline-double,.sprite-edit-underline,.sprite-edit-uppercase,.sprite-edit-vertical-alignment-middle,.sprite-edit-vertical-alignment-top,.sprite-edit-vertical-alignment,.sprite-edit-writing-mode-tbrl,.sprite-edit-writing-mode,.sprite-envelope--exclamation,.sprite-envelope--minus,.sprite-envelope--pencil,.sprite-envelope--plus,.sprite-envelope-at-sign,.sprite-envelope-label,.sprite-envelope-share,.sprite-envelope-string,.sprite-envelope,.sprite-equalizer--arrow,.sprite-equalizer--exclamation,.sprite-equalizer--minus,.sprite-equalizer--pencil,.sprite-equalizer--plus,.sprite-equalizer-flat,.sprite-equalizer-high,.sprite-equalizer-low,.sprite-equalizer,.sprite-eraser--arrow,.sprite-eraser--exclamation,.sprite-eraser--minus,.sprite-eraser--pencil,.sprite-eraser--plus,.sprite-eraser-small,.sprite-eraser,.sprite-exclamation--frame,.sprite-exclamation-button,.sprite-exclamation-circle-frame,.sprite-exclamation-circle,.sprite-exclamation-diamond-frame,.sprite-exclamation-octagon-frame,.sprite-exclamation-octagon,.sprite-exclamation-red-frame,.sprite-exclamation-red,.sprite-exclamation-shield-frame,.sprite-exclamation-shield,.sprite-exclamation-small-red,.sprite-exclamation-small-white,.sprite-exclamation-small,.sprite-exclamation-white,.sprite-external-small,.sprite-external,.sprite-eye--arrow,.sprite-eye--exclamation,.sprite-eye--minus,.sprite-eye--pencil,.sprite-eye--plus,.sprite-eye-close,.sprite-eye-half,.sprite-eye-red,.sprite-feed--arrow,.sprite-feed--exclamation,.sprite-feed--minus,.sprite-feed--pencil,.sprite-feed--plus,.sprite-feed-balloon,.sprite-feed-document,.sprite-feed-small,.sprite-feed,.sprite-fill-090,.sprite-fill-180,.sprite-fill-270,.sprite-fill-medium-090,.sprite-fill-medium-180,.sprite-fill-medium-270,.sprite-fill-medium,.sprite-fill,.sprite-film--arrow,.sprite-film--exclamation,.sprite-film--minus,.sprite-film--pencil,.sprite-film--plus,.sprite-film-cast,.sprite-film-medium,.sprite-film-small,.sprite-film-timeline,.sprite-film-youtube,.sprite-film,.sprite-fingerprint-recognition-fail,.sprite-fingerprint-recognition,.sprite-fingerprint,.sprite-fire--arrow,.sprite-fire--exclamation,.sprite-fire--minus,.sprite-fire--pencil,.sprite-fire--plus,.sprite-fire-big,.sprite-fire-small,.sprite-fire,.sprite-flag--arrow,.sprite-flag--exclamation,.sprite-flag--minus,.sprite-flag--pencil,.sprite-flag--plus,.sprite-flag-black,.sprite-flag-blue,.sprite-flag-checker,.sprite-flag-gray,.sprite-flag-green,.sprite-flag-pink,.sprite-flag-purple,.sprite-flag-small,.sprite-flag-white,.sprite-flag-yellow,.sprite-flag,.sprite-flashlight--arrow,.sprite-flashlight--exclamation,.sprite-flashlight--minus,.sprite-flashlight--pencil,.sprite-flashlight--plus,.sprite-flashlight-shine,.sprite-flashlight,.sprite-flask--arrow,.sprite-flask--exclamation,.sprite-flask--minus,.sprite-flask--pencil,.sprite-flask--plus,.sprite-flask-empty,.sprite-flask,.sprite-flower-face,.sprite-flower-pluck,.sprite-flower,.sprite-foaf,.sprite-folder--arrow,.sprite-folder--exclamation,.sprite-folder--minus,.sprite-folder--pencil,.sprite-folder--plus,.sprite-folder-bookmark,.sprite-folder-broken,.sprite-folder-horizontal-open,.sprite-folder-horizontal,.sprite-folder-import,.sprite-folder-medium,.sprite-folder-network-horizontal-open,.sprite-folder-network-horizontal,.sprite-folder-network,.sprite-folder-open-document-music-playlist,.sprite-folder-open-document-music,.sprite-folder-open-document-text,.sprite-folder-open-document,.sprite-folder-open-feed,.sprite-folder-open-film,.sprite-folder-open-image,.sprite-folder-open-slide,.sprite-folder-open-table,.sprite-folder-open,.sprite-folder-rename,.sprite-folder-search-result,.sprite-folder-share,.sprite-folder-shred,.sprite-folder-small-horizontal,.sprite-folder-small,.sprite-folder-smiley-sad,.sprite-folder-smiley,.sprite-folder-stamp,.sprite-folder-stand,.sprite-folder-sticky-note,.sprite-folder-tree,.sprite-folder-zipper,.sprite-folder,.sprite-folders-stack,.sprite-folders,.sprite-folding-fan,.sprite-footprint,.sprite-footprints,.sprite-fruit-apple-half,.sprite-fruit-grape,.sprite-fruit-lime,.sprite-fruit-orange,.sprite-fruit,.sprite-function,.sprite-funnel--arrow,.sprite-funnel--minus,.sprite-funnel--pencil,.sprite-funnel--plus,.sprite-funnel-small,.sprite-funnel,.sprite-futon,.sprite-game-monitor,.sprite-game,.sprite-gear--exclamation,.sprite-gear--minus,.sprite-gear--pencil,.sprite-gear--plus,.sprite-gear-small,.sprite-gender-female,.sprite-gender,.sprite-geolocation-small,.sprite-geolocation,.sprite-geotag-balloon,.sprite-geotag-document,.sprite-geotag-small,.sprite-geotag,.sprite-ghost-small,.sprite-ghost,.sprite-gingerbread-man-chocolate,.sprite-gingerbread-man,.sprite-git-small,.sprite-git,.sprite-glass--arrow,.sprite-glass--exclamation,.sprite-glass--minus,.sprite-glass--pencil,.sprite-glass--plus,.sprite-glass-empty,.sprite-glass-narrow,.sprite-glass-wide,.sprite-glass,.sprite-globe--exclamation,.sprite-globe--minus,.sprite-globe--pencil,.sprite-globe--plus,.sprite-globe-medium-green,.sprite-globe-medium,.sprite-globe-model,.sprite-globe-network-ethernet,.sprite-globe-network,.sprite-globe-place,.sprite-globe-share,.sprite-globe-small-green,.sprite-globe-small,.sprite-gradient-small,.sprite-gradient,.sprite-graduation-hat,.sprite-graphic-card,.sprite-grid-dot,.sprite-grid-small-dot,.sprite-grid-small,.sprite-grid-snap-dot,.sprite-grid-snap,.sprite-guide-snap,.sprite-guide,.sprite-guitar--arrow,.sprite-guitar--exclamation,.sprite-guitar--minus,.sprite-guitar--pencil,.sprite-guitar--plus,.sprite-guitar,.sprite-haiku-wide,.sprite-haiku,.sprite-hamburger,.sprite-hammer--arrow,.sprite-hammer--exclamation,.sprite-hammer--minus,.sprite-hammer--pencil,.sprite-hammer--plus,.sprite-hammer-left,.sprite-hammer-screwdriver,.sprite-hammer,.sprite-hand-finger,.sprite-hand-horns,.sprite-hand-ily,.sprite-hand-pinky,.sprite-hand-point-090,.sprite-hand-point-180,.sprite-hand-point-270,.sprite-hand-point,.sprite-hand-property,.sprite-hand-red-string-of-fate,.sprite-hand-shake,.sprite-hand-share,.sprite-hand,.sprite-hard-hat--arrow,.sprite-hard-hat--exclamation,.sprite-hard-hat--minus,.sprite-hard-hat--pencil,.sprite-hard-hat--plus,.sprite-hard-hat-military-camouflage,.sprite-hard-hat-military,.sprite-hard-hat-mine,.sprite-headphone--arrow,.sprite-headphone--exclamation,.sprite-headphone--minus,.sprite-headphone--pencil,.sprite-headphone--plus,.sprite-headphone-microphone,.sprite-headphone,.sprite-headstone-cross,.sprite-headstone-rip,.sprite-headstone,.sprite-heart--arrow,.sprite-heart--exclamation,.sprite-heart--minus,.sprite-heart--pencil,.sprite-heart--plus,.sprite-heart-break,.sprite-heart-empty,.sprite-heart-half,.sprite-heart-small-empty,.sprite-heart-small-half,.sprite-heart-small,.sprite-heart,.sprite-highlighter--arrow,.sprite-highlighter--exclamation,.sprite-highlighter--minus,.sprite-highlighter--plus,.sprite-highlighter-color,.sprite-highlighter-small,.sprite-highlighter-text,.sprite-highlighter,.sprite-holly,.sprite-home--arrow,.sprite-home--exclamation,.sprite-home--minus,.sprite-home--pencil,.sprite-home--plus,.sprite-home-for-sale-sign-blue,.sprite-home-for-sale-sign-red,.sprite-home-for-sale-sign,.sprite-home-medium,.sprite-home-network,.sprite-home-share,.sprite-home-small,.sprite-home,.sprite-hourglass--arrow,.sprite-hourglass--exclamation,.sprite-hourglass--minus,.sprite-hourglass--pencil,.sprite-hourglass--plus,.sprite-hourglass-select-remain,.sprite-hourglass-select,.sprite-hourglass,.sprite-ice--arrow,.sprite-ice--exclamation,.sprite-ice--minus,.sprite-ice--pencil,.sprite-ice--plus,.sprite-ice-cream-blue-moon,.sprite-ice-cream-chocolate,.sprite-ice-cream-empty,.sprite-ice-cream-sprinkles-blue-moon,.sprite-ice-cream-sprinkles-chocolate,.sprite-ice-cream-sprinkles,.sprite-ice-cream,.sprite-ice,.sprite-image--arrow,.sprite-image--minus,.sprite-image--pencil,.sprite-image--plus,.sprite-image-balloon,.sprite-image-blur,.sprite-image-cast,.sprite-image-crop,.sprite-image-empty,.sprite-image-export,.sprite-image-import,.sprite-image-instagram-frame,.sprite-image-instagram,.sprite-image-map,.sprite-image-reflection,.sprite-image-resize-actual,.sprite-image-resize,.sprite-image-saturation-up,.sprite-image-saturation,.sprite-image-select,.sprite-image-share,.sprite-image-sharpen,.sprite-image-small-sunset,.sprite-image-small,.sprite-image-sunset,.sprite-image-vertical-sunset,.sprite-image-vertical,.sprite-image,.sprite-images-flickr,.sprite-inbox--arrow,.sprite-inbox--exclamation,.sprite-inbox--minus,.sprite-inbox--pencil { background: url("../themes/images/icons/extra-icon-set-04.png") no-repeat !important; diff --git a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-05.css b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-05.css index 8fbfe460e00..070b5a195a1 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-05.css +++ b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-05.css @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ .sprite-inbox-document-music-playlist,.sprite-inbox-document,.sprite-inbox-slide,.sprite-inbox-table,.sprite-infocard-small,.sprite-infocard,.sprite-information-balloon,.sprite-information-button,.sprite-information-frame,.sprite-information-italic,.sprite-information-octagon-frame,.sprite-information-octagon,.sprite-information-shield,.sprite-information-small-white,.sprite-information-small,.sprite-information-white,.sprite-jar--arrow,.sprite-jar--exclamation,.sprite-jar--minus,.sprite-jar--pencil,.sprite-jar--plus,.sprite-jar-empty,.sprite-jar-label,.sprite-jar-open,.sprite-jar,.sprite-joystick,.sprite-json,.sprite-key--exclamation,.sprite-key--minus,.sprite-key--plus,.sprite-key-solid,.sprite-key,.sprite-keyboard--arrow,.sprite-keyboard--exclamation,.sprite-keyboard--minus,.sprite-keyboard--pencil,.sprite-keyboard--plus,.sprite-keyboard-enter,.sprite-keyboard-full-wireless,.sprite-keyboard-full,.sprite-keyboard-small,.sprite-keyboard-smiley,.sprite-keyboard-space,.sprite-keyboard,.sprite-keyboards-combination,.sprite-keyboards,.sprite-language-balloon,.sprite-language-document,.sprite-language-small,.sprite-language,.sprite-layer--arrow,.sprite-layer--exclamation,.sprite-layer--minus,.sprite-layer--pencil,.sprite-layer--plus,.sprite-layer-flip-vertical,.sprite-layer-flip,.sprite-layer-mask,.sprite-layer-resize-actual,.sprite-layer-resize-replicate-vertical,.sprite-layer-resize-replicate,.sprite-layer-resize,.sprite-layer-rotate-left,.sprite-layer-rotate,.sprite-layer-select-point,.sprite-layer-shade,.sprite-layer-shape-curve,.sprite-layer-shape-ellipse,.sprite-layer-shape-line,.sprite-layer-shape-polygon,.sprite-layer-shape-polyline,.sprite-layer-shape-round,.sprite-layer-shape-text,.sprite-layer-shape,.sprite-layer-shred,.sprite-layer-small,.sprite-layer-transparent,.sprite-layer-vector,.sprite-layer,.sprite-layers-alignment-bottom,.sprite-layers-alignment-center,.sprite-layers-alignment-left,.sprite-layers-alignment-middle,.sprite-layers-alignment-right,.sprite-layers-alignment,.sprite-layers-arrange-back,.sprite-layers-arrange,.sprite-layers-group,.sprite-layers-small,.sprite-layers-stack-arrange-back,.sprite-layers-stack-arrange,.sprite-layers-stack,.sprite-layers-ungroup,.sprite-layers,.sprite-layout-2-equal,.sprite-layout-2,.sprite-layout-3-mix,.sprite-layout-3,.sprite-layout-4,.sprite-layout-6,.sprite-layout-design,.sprite-layout-header-2-equal,.sprite-layout-header-2,.sprite-layout-header-3,.sprite-layout-hf-2-equal,.sprite-layout-hf-2,.sprite-layout-hf-3,.sprite-layout-hf,.sprite-layout-join-vertical,.sprite-layout-join,.sprite-layout-select-content,.sprite-layout-select-footer,.sprite-layout-select-sidebar,.sprite-layout-select,.sprite-layout-split-vertical,.sprite-layout-split,.sprite-layout,.sprite-leaf--arrow,.sprite-leaf--exclamation,.sprite-leaf--minus,.sprite-leaf--pencil,.sprite-leaf--plus,.sprite-leaf-plant,.sprite-leaf-red,.sprite-leaf-wormhole,.sprite-leaf-yellow,.sprite-lifebuoy--arrow,.sprite-lifebuoy--exclamation,.sprite-lifebuoy--minus,.sprite-lifebuoy--pencil,.sprite-lifebuoy--plus,.sprite-lifebuoy-medium,.sprite-lifebuoy-small,.sprite-light-bulb--arrow,.sprite-light-bulb--exclamation,.sprite-light-bulb--minus,.sprite-light-bulb--pencil,.sprite-light-bulb--plus,.sprite-light-bulb-code,.sprite-light-bulb-off,.sprite-light-bulb-small-off,.sprite-light-bulb-small,.sprite-light-bulb,.sprite-lighthouse-shine,.sprite-lighthouse,.sprite-lightning--arrow,.sprite-lightning--exclamation,.sprite-lightning--minus,.sprite-lightning--pencil,.sprite-lightning--plus,.sprite-lightning-small,.sprite-locale-alternate,.sprite-lock--arrow,.sprite-lock--exclamation,.sprite-lock--minus,.sprite-lock--pencil,.sprite-lock--plus,.sprite-lock-small,.sprite-lock-ssl,.sprite-lock-unlock,.sprite-lock-warning,.sprite-lock,.sprite-lollipop,.sprite-luggage--arrow,.sprite-luggage--exclamation,.sprite-luggage--minus,.sprite-luggage--pencil,.sprite-luggage--plus,.sprite-luggage-tag,.sprite-luggage,.sprite-mac-os,.sprite-magnet--arrow,.sprite-magnet--exclamation,.sprite-magnet--minus,.sprite-magnet--pencil,.sprite-magnet--plus,.sprite-magnet-blue,.sprite-magnet-small,.sprite-magnet,.sprite-magnifier--arrow,.sprite-magnifier--exclamation,.sprite-magnifier--minus,.sprite-magnifier--pencil,.sprite-magnifier--plus,.sprite-magnifier-history-left,.sprite-magnifier-history,.sprite-magnifier-left,.sprite-magnifier-medium-left,.sprite-magnifier-medium,.sprite-magnifier-small,.sprite-magnifier-zoom-actual-equal,.sprite-magnifier-zoom-actual,.sprite-magnifier-zoom-fit,.sprite-magnifier-zoom-in,.sprite-magnifier-zoom-out,.sprite-magnifier-zoom,.sprite-mahjong--arrow,.sprite-mahjong--exclamation,.sprite-mahjong--minus,.sprite-mahjong--pencil,.sprite-mahjong--plus,.sprite-mahjong-white,.sprite-mahjong,.sprite-mail--arrow,.sprite-mail--exclamation,.sprite-mail-air,.sprite-mail-at-sign,.sprite-mail-forward-all,.sprite-mail-forward,.sprite-mail-medium,.sprite-mail-open-document-music-playlist,.sprite-mail-open-document-music,.sprite-mail-open-document-text,.sprite-mail-open-document,.sprite-mail-open-film,.sprite-mail-open-table,.sprite-mail-open,.sprite-mail-receive,.sprite-mail-reply-all,.sprite-mail-reply,.sprite-mail-send-receive,.sprite-mail-share,.sprite-mail-small,.sprite-mail,.sprite-mails,.sprite-map--arrow,.sprite-map--exclamation,.sprite-map--minus,.sprite-map--pencil,.sprite-map--plus,.sprite-map-medium,.sprite-map-pin,.sprite-map-resize-actual,.sprite-map-resize,.sprite-map-share,.sprite-map,.sprite-maps-stack,.sprite-maps,.sprite-marker--arrow,.sprite-marker--exclamation,.sprite-marker--minus,.sprite-marker--pencil,.sprite-marker--plus,.sprite-marker-small,.sprite-marker,.sprite-mask,.sprite-medal--arrow,.sprite-medal--exclamation,.sprite-medal--minus,.sprite-medal--pencil,.sprite-medal--plus,.sprite-medal-bronze-premium,.sprite-medal-bronze-red-premium,.sprite-medal-bronze-red,.sprite-medal-bronze,.sprite-medal-premium,.sprite-medal-red-premium,.sprite-medal-red,.sprite-medal-silver-premium,.sprite-medal-silver-red-premium,.sprite-medal-silver-red,.sprite-medal-silver,.sprite-medal,.sprite-media-player--arrow,.sprite-media-player--exclamation,.sprite-media-player--minus,.sprite-media-player--pencil,.sprite-media-player--plus,.sprite-media-player-black,.sprite-media-player-cast,.sprite-media-player-medium-black,.sprite-media-player-medium-blue,.sprite-media-player-medium-green,.sprite-media-player-medium-orange,.sprite-media-player-medium-pink,.sprite-media-player-medium-purple,.sprite-media-player-medium-red,.sprite-media-player-medium-yellow,.sprite-media-player-medium,.sprite-media-player-phone-horizontal,.sprite-media-player-phone-protector,.sprite-media-player-phone,.sprite-media-player-protector,.sprite-media-player-small-blue,.sprite-media-player-small-green,.sprite-media-player-small-pink,.sprite-media-player-small-red,.sprite-media-player-small,.sprite-media-player-xsmall-black,.sprite-media-player-xsmall-blue,.sprite-media-player-xsmall-green,.sprite-media-player-xsmall-pink,.sprite-media-player-xsmall-polish,.sprite-media-player-xsmall,.sprite-media-player,.sprite-media-players,.sprite-megaphone--arrow,.sprite-megaphone--exclamation,.sprite-megaphone--minus,.sprite-megaphone--pencil,.sprite-megaphone--plus,.sprite-memory,.sprite-metronome--arrow,.sprite-metronome--exclamation,.sprite-metronome--minus,.sprite-metronome--pencil,.sprite-metronome--plus,.sprite-metronome,.sprite-microformats,.sprite-microphone--arrow,.sprite-microphone--exclamation,.sprite-microphone--minus,.sprite-microphone--pencil,.sprite-microphone--plus,.sprite-microphone,.sprite-milestone-calendar,.sprite-milestone,.sprite-milk-label,.sprite-milk,.sprite-minus-button,.sprite-minus-octagon-frame,.sprite-minus-octagon,.sprite-minus-shield,.sprite-minus-small-circle,.sprite-minus-small-white,.sprite-minus-small,.sprite-minus-white,.sprite-minus,.sprite-mizuhiki-paper-cord-alternate,.sprite-mizuhiki-paper-cord,.sprite-mobile-phone--arrow,.sprite-mobile-phone--exclamation,.sprite-mobile-phone--minus,.sprite-mobile-phone--pencil,.sprite-mobile-phone--plus,.sprite-mobile-phone-cast,.sprite-mobile-phone-medium,.sprite-mobile-phone-off,.sprite-mobile-phone-protector,.sprite-mobile-phone,.sprite-molecule,.sprite-money--exclamation,.sprite-money--minus,.sprite-money--pencil,.sprite-money--plus,.sprite-money-medium,.sprite-money,.sprite-monitor--arrow,.sprite-monitor--exclamation,.sprite-monitor--minus,.sprite-monitor--pencil,.sprite-monitor--plus,.sprite-monitor-blue,.sprite-monitor-cast,.sprite-monitor-cloud,.sprite-monitor-image,.sprite-monitor-medium,.sprite-monitor-network,.sprite-monitor-off,.sprite-monitor-protector,.sprite-monitor-screensaver,.sprite-monitor-sidebar,.sprite-monitor-wallpaper,.sprite-monitor-window-3d,.sprite-monitor-window-flow,.sprite-monitor-window,.sprite-monitor,.sprite-mouse--arrow,.sprite-mouse--exclamation,.sprite-mouse--minus,.sprite-mouse--pencil,.sprite-mouse--plus,.sprite-mouse-select-right,.sprite-mouse-select-wheel,.sprite-mouse-select,.sprite-mouse,.sprite-mushroom,.sprite-music--arrow,.sprite-music--exclamation,.sprite-music--minus,.sprite-music--pencil,.sprite-music--plus,.sprite-music-beam-16,.sprite-music-small,.sprite-music,.sprite-mustache,.sprite-na,.sprite-navigation-000-button-white,.sprite-navigation-000-button,.sprite-navigation-000-frame,.sprite-navigation-000-white,.sprite-navigation-090-button-white,.sprite-navigation-090-button,.sprite-navigation-090-frame,.sprite-navigation-090-white,.sprite-navigation-090,.sprite-navigation-180-button-white,.sprite-navigation-180-button,.sprite-navigation-180-frame,.sprite-navigation-180-white,.sprite-navigation-180,.sprite-navigation-270-button-white,.sprite-navigation-270-button,.sprite-navigation-270-frame,.sprite-navigation-270-white,.sprite-navigation-270,.sprite-navigation,.sprite-network-cloud,.sprite-network-clouds,.sprite-network-ethernet,.sprite-network-firewall,.sprite-network-hub,.sprite-network-ip-local,.sprite-network-ip,.sprite-network-status-away,.sprite-network-status-busy,.sprite-network-status-offline,.sprite-network-status,.sprite-network-wireless,.sprite-network,.sprite-new-text,.sprite-new,.sprite-newspaper--arrow,.sprite-newspaper--exclamation,.sprite-newspaper--minus { background: url("../themes/images/icons/extra-icon-set-05.png") no-repeat !important; diff --git a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-06.css b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-06.css index 3446e91e821..79fc494edd4 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-06.css +++ b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-06.css @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ .sprite-inbox-document-music-playlist,.sprite-inbox-document,.sprite-inbox-slide,.sprite-inbox-table,.sprite-infocard-small,.sprite-infocard,.sprite-information-balloon,.sprite-information-button,.sprite-information-frame,.sprite-information-italic,.sprite-information-octagon-frame,.sprite-information-octagon,.sprite-information-shield,.sprite-information-small-white,.sprite-information-small,.sprite-information-white,.sprite-jar--arrow,.sprite-jar--exclamation,.sprite-jar--minus,.sprite-jar--pencil,.sprite-jar--plus,.sprite-jar-empty,.sprite-jar-label,.sprite-jar-open,.sprite-jar,.sprite-joystick,.sprite-json,.sprite-key--exclamation,.sprite-key--minus,.sprite-key--plus,.sprite-key-solid,.sprite-key,.sprite-keyboard--arrow,.sprite-keyboard--exclamation,.sprite-keyboard--minus,.sprite-keyboard--pencil,.sprite-keyboard--plus,.sprite-keyboard-enter,.sprite-keyboard-full-wireless,.sprite-keyboard-full,.sprite-keyboard-small,.sprite-keyboard-smiley,.sprite-keyboard-space,.sprite-keyboard,.sprite-keyboards-combination,.sprite-keyboards,.sprite-language-balloon,.sprite-language-document,.sprite-language-small,.sprite-language,.sprite-layer--arrow,.sprite-layer--exclamation,.sprite-layer--minus,.sprite-layer--pencil,.sprite-layer--plus,.sprite-layer-flip-vertical,.sprite-layer-flip,.sprite-layer-mask,.sprite-layer-resize-actual,.sprite-layer-resize-replicate-vertical,.sprite-layer-resize-replicate,.sprite-layer-resize,.sprite-layer-rotate-left,.sprite-layer-rotate,.sprite-layer-select-point,.sprite-layer-shade,.sprite-layer-shape-curve,.sprite-layer-shape-ellipse,.sprite-layer-shape-line,.sprite-layer-shape-polygon,.sprite-layer-shape-polyline,.sprite-layer-shape-round,.sprite-layer-shape-text,.sprite-layer-shape,.sprite-layer-shred,.sprite-layer-small,.sprite-layer-transparent,.sprite-layer-vector,.sprite-layer,.sprite-layers-alignment-bottom,.sprite-layers-alignment-center,.sprite-layers-alignment-left,.sprite-layers-alignment-middle,.sprite-layers-alignment-right,.sprite-layers-alignment,.sprite-layers-arrange-back,.sprite-layers-arrange,.sprite-layers-group,.sprite-layers-small,.sprite-layers-stack-arrange-back,.sprite-layers-stack-arrange,.sprite-layers-stack,.sprite-layers-ungroup,.sprite-layers,.sprite-layout-2-equal,.sprite-layout-2,.sprite-layout-3-mix,.sprite-layout-3,.sprite-layout-4,.sprite-layout-6,.sprite-layout-design,.sprite-layout-header-2-equal,.sprite-layout-header-2,.sprite-layout-header-3,.sprite-layout-hf-2-equal,.sprite-layout-hf-2,.sprite-layout-hf-3,.sprite-layout-hf,.sprite-layout-join-vertical,.sprite-layout-join,.sprite-layout-select-content,.sprite-layout-select-footer,.sprite-layout-select-sidebar,.sprite-layout-select,.sprite-layout-split-vertical,.sprite-layout-split,.sprite-layout,.sprite-leaf--arrow,.sprite-leaf--exclamation,.sprite-leaf--minus,.sprite-leaf--pencil,.sprite-leaf--plus,.sprite-leaf-plant,.sprite-leaf-red,.sprite-leaf-wormhole,.sprite-leaf-yellow,.sprite-lifebuoy--arrow,.sprite-lifebuoy--exclamation,.sprite-lifebuoy--minus,.sprite-lifebuoy--pencil,.sprite-lifebuoy--plus,.sprite-lifebuoy-medium,.sprite-lifebuoy-small,.sprite-light-bulb--arrow,.sprite-light-bulb--exclamation,.sprite-light-bulb--minus,.sprite-light-bulb--pencil,.sprite-light-bulb--plus,.sprite-light-bulb-code,.sprite-light-bulb-off,.sprite-light-bulb-small-off,.sprite-light-bulb-small,.sprite-light-bulb,.sprite-lighthouse-shine,.sprite-lighthouse,.sprite-lightning--arrow,.sprite-lightning--exclamation,.sprite-lightning--minus,.sprite-lightning--pencil,.sprite-lightning--plus,.sprite-lightning-small,.sprite-locale-alternate,.sprite-lock--arrow,.sprite-lock--exclamation,.sprite-lock--minus,.sprite-lock--pencil,.sprite-lock--plus,.sprite-lock-small,.sprite-lock-ssl,.sprite-lock-unlock,.sprite-lock-warning,.sprite-lock,.sprite-lollipop,.sprite-luggage--arrow,.sprite-luggage--exclamation,.sprite-luggage--minus,.sprite-luggage--pencil,.sprite-luggage--plus,.sprite-luggage-tag,.sprite-luggage,.sprite-mac-os,.sprite-magnet--arrow,.sprite-magnet--exclamation,.sprite-magnet--minus,.sprite-magnet--pencil,.sprite-magnet--plus,.sprite-magnet-blue,.sprite-magnet-small,.sprite-magnet,.sprite-magnifier--arrow,.sprite-magnifier--exclamation,.sprite-magnifier--minus,.sprite-magnifier--pencil,.sprite-magnifier--plus,.sprite-magnifier-history-left,.sprite-magnifier-history,.sprite-magnifier-left,.sprite-magnifier-medium-left,.sprite-magnifier-medium,.sprite-magnifier-small,.sprite-magnifier-zoom-actual-equal,.sprite-magnifier-zoom-actual,.sprite-magnifier-zoom-fit,.sprite-magnifier-zoom-in,.sprite-magnifier-zoom-out,.sprite-magnifier-zoom,.sprite-mahjong--arrow,.sprite-mahjong--exclamation,.sprite-mahjong--minus,.sprite-mahjong--pencil,.sprite-mahjong--plus,.sprite-mahjong-white,.sprite-mahjong,.sprite-mail--arrow,.sprite-mail--exclamation,.sprite-mail-air,.sprite-mail-at-sign,.sprite-mail-forward-all,.sprite-mail-forward,.sprite-mail-medium,.sprite-mail-open-document-music-playlist,.sprite-mail-open-document-music,.sprite-mail-open-document-text,.sprite-mail-open-document,.sprite-mail-open-film,.sprite-mail-open-table,.sprite-mail-open,.sprite-mail-receive,.sprite-mail-reply-all,.sprite-mail-reply,.sprite-mail-send-receive,.sprite-mail-share,.sprite-mail-small,.sprite-mail,.sprite-mails,.sprite-map--arrow,.sprite-map--exclamation,.sprite-map--minus,.sprite-map--pencil,.sprite-map--plus,.sprite-map-medium,.sprite-map-pin,.sprite-map-resize-actual,.sprite-map-resize,.sprite-map-share,.sprite-map,.sprite-maps-stack,.sprite-maps,.sprite-marker--arrow,.sprite-marker--exclamation,.sprite-marker--minus,.sprite-marker--pencil,.sprite-marker--plus,.sprite-marker-small,.sprite-marker,.sprite-mask,.sprite-medal--arrow,.sprite-medal--exclamation,.sprite-medal--minus,.sprite-medal--pencil,.sprite-medal--plus,.sprite-medal-bronze-premium,.sprite-medal-bronze-red-premium,.sprite-medal-bronze-red,.sprite-medal-bronze,.sprite-medal-premium,.sprite-medal-red-premium,.sprite-medal-red,.sprite-medal-silver-premium,.sprite-medal-silver-red-premium,.sprite-medal-silver-red,.sprite-medal-silver,.sprite-medal,.sprite-media-player--arrow,.sprite-media-player--exclamation,.sprite-media-player--minus,.sprite-media-player--pencil,.sprite-media-player--plus,.sprite-media-player-black,.sprite-media-player-cast,.sprite-media-player-medium-black,.sprite-media-player-medium-blue,.sprite-media-player-medium-green,.sprite-media-player-medium-orange,.sprite-media-player-medium-pink,.sprite-media-player-medium-purple,.sprite-media-player-medium-red,.sprite-media-player-medium-yellow,.sprite-media-player-medium,.sprite-media-player-phone-horizontal,.sprite-media-player-phone-protector,.sprite-media-player-phone,.sprite-media-player-protector,.sprite-media-player-small-blue,.sprite-media-player-small-green,.sprite-media-player-small-pink,.sprite-media-player-small-red,.sprite-media-player-small,.sprite-media-player-xsmall-black,.sprite-media-player-xsmall-blue,.sprite-media-player-xsmall-green,.sprite-media-player-xsmall-pink,.sprite-media-player-xsmall-polish,.sprite-media-player-xsmall,.sprite-media-player,.sprite-media-players,.sprite-megaphone--arrow,.sprite-megaphone--exclamation,.sprite-megaphone--minus,.sprite-megaphone--pencil,.sprite-megaphone--plus,.sprite-memory,.sprite-metronome--arrow,.sprite-metronome--exclamation,.sprite-metronome--minus,.sprite-metronome--pencil,.sprite-metronome--plus,.sprite-metronome,.sprite-microformats,.sprite-microphone--arrow,.sprite-microphone--exclamation,.sprite-microphone--minus,.sprite-microphone--pencil,.sprite-microphone--plus,.sprite-microphone,.sprite-milestone-calendar,.sprite-milestone,.sprite-milk-label,.sprite-milk,.sprite-minus-button,.sprite-minus-octagon-frame,.sprite-minus-octagon,.sprite-minus-shield,.sprite-minus-small-circle,.sprite-minus-small-white,.sprite-minus-small,.sprite-minus-white,.sprite-minus,.sprite-mizuhiki-paper-cord-alternate,.sprite-mizuhiki-paper-cord,.sprite-mobile-phone--arrow,.sprite-mobile-phone--exclamation,.sprite-mobile-phone--minus,.sprite-mobile-phone--pencil,.sprite-mobile-phone--plus,.sprite-mobile-phone-cast,.sprite-mobile-phone-medium,.sprite-mobile-phone-off,.sprite-mobile-phone-protector,.sprite-mobile-phone,.sprite-molecule,.sprite-money--exclamation,.sprite-money--minus,.sprite-money--pencil,.sprite-money--plus,.sprite-money-medium,.sprite-money,.sprite-monitor--arrow,.sprite-monitor--exclamation,.sprite-monitor--minus,.sprite-monitor--pencil,.sprite-monitor--plus,.sprite-monitor-blue,.sprite-monitor-cast,.sprite-monitor-cloud,.sprite-monitor-image,.sprite-monitor-medium,.sprite-monitor-network,.sprite-monitor-off,.sprite-monitor-protector,.sprite-monitor-screensaver,.sprite-monitor-sidebar,.sprite-monitor-wallpaper,.sprite-monitor-window-3d,.sprite-monitor-window-flow,.sprite-monitor-window,.sprite-monitor,.sprite-mouse--arrow,.sprite-mouse--exclamation,.sprite-mouse--minus,.sprite-mouse--pencil,.sprite-mouse--plus,.sprite-mouse-select-right,.sprite-mouse-select-wheel,.sprite-mouse-select,.sprite-mouse,.sprite-mushroom,.sprite-music--arrow,.sprite-music--exclamation,.sprite-music--minus,.sprite-music--pencil,.sprite-music--plus,.sprite-music-beam-16,.sprite-music-small,.sprite-music,.sprite-mustache,.sprite-na,.sprite-navigation-000-button-white,.sprite-navigation-000-button,.sprite-navigation-000-frame,.sprite-navigation-000-white,.sprite-navigation-090-button-white,.sprite-navigation-090-button,.sprite-navigation-090-frame,.sprite-navigation-090-white,.sprite-navigation-090,.sprite-navigation-180-button-white,.sprite-navigation-180-button,.sprite-navigation-180-frame,.sprite-navigation-180-white,.sprite-navigation-180,.sprite-navigation-270-button-white,.sprite-navigation-270-button,.sprite-navigation-270-frame,.sprite-navigation-270-white,.sprite-navigation-270,.sprite-navigation,.sprite-network-cloud,.sprite-network-clouds,.sprite-network-ethernet,.sprite-network-firewall,.sprite-network-hub,.sprite-network-ip-local,.sprite-network-ip,.sprite-network-status-away,.sprite-network-status-busy,.sprite-network-status-offline,.sprite-network-status,.sprite-network-wireless,.sprite-network,.sprite-new-text,.sprite-new,.sprite-newspaper--arrow,.sprite-newspaper--exclamation,.sprite-newspaper--minus { background: url("../themes/images/icons/extra-icon-set-06.png") no-repeat !important diff --git a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-07.css b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-07.css index ca3c0755469..d44721739c9 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-07.css +++ b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-07.css @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ .sprite-script-attribute-f,.sprite-script-attribute-g,.sprite-script-attribute-h,.sprite-script-attribute-i,.sprite-script-attribute-j,.sprite-script-attribute-k,.sprite-script-attribute-l,.sprite-script-attribute-m,.sprite-script-attribute-n,.sprite-script-attribute-o,.sprite-script-attribute-p,.sprite-script-attribute-q,.sprite-script-attribute-r,.sprite-script-attribute-s,.sprite-script-attribute-t,.sprite-script-attribute-u,.sprite-script-attribute-v,.sprite-script-attribute-w,.sprite-script-attribute-x,.sprite-script-attribute-y,.sprite-script-attribute-z,.sprite-script-attribute,.sprite-script-binary,.sprite-script-block,.sprite-script-code,.sprite-script-excel,.sprite-script-export,.sprite-script-flash,.sprite-script-globe,.sprite-script-import,.sprite-script-medium,.sprite-script-office,.sprite-script-php,.sprite-script-smiley-sad,.sprite-script-smiley,.sprite-script-stamp,.sprite-script-text,.sprite-script-visual-studio,.sprite-script-word,.sprite-script,.sprite-scripts-text,.sprite-scripts,.sprite-sealing-wax,.sprite-selection-input,.sprite-selection-resize-actual,.sprite-selection-resize,.sprite-selection-select-input,.sprite-selection-select,.sprite-selection,.sprite-server--arrow,.sprite-server--exclamation,.sprite-server--minus,.sprite-server--pencil,.sprite-server--plus,.sprite-server-cast,.sprite-server-cloud,.sprite-server-medium,.sprite-server-network,.sprite-server-property,.sprite-server,.sprite-servers-network,.sprite-servers,.sprite-service-bell--arrow,.sprite-service-bell--exclamation,.sprite-service-bell--minus,.sprite-service-bell--pencil,.sprite-service-bell--plus,.sprite-service-bell,.sprite-share-balloon,.sprite-share-document,.sprite-share-small,.sprite-share,.sprite-shield--arrow,.sprite-shield--exclamation,.sprite-shield--minus,.sprite-shield--pencil,.sprite-shield--plus,.sprite-shield,.sprite-shoe--arrow,.sprite-shoe--exclamation,.sprite-shoe--minus,.sprite-shoe--pencil,.sprite-shoe--plus,.sprite-shoe-high,.sprite-shoe,.sprite-shopping-basket--arrow,.sprite-shopping-basket--exclamation,.sprite-shopping-basket--minus,.sprite-shopping-basket--pencil,.sprite-shopping-basket--plus,.sprite-shopping-basket,.sprite-shortcut-small,.sprite-shortcut,.sprite-shovel,.sprite-shuriken,.sprite-sitemap-application-blue,.sprite-sitemap-application,.sprite-sitemap-image,.sprite-sitemap,.sprite-skull-happy,.sprite-skull-mad,.sprite-skull-old,.sprite-skull-sad,.sprite-skull,.sprite-slide--arrow,.sprite-slide--exclamation,.sprite-slide--minus,.sprite-slide--pencil,.sprite-slide--plus,.sprite-slide-medium,.sprite-slide-powerpoint,.sprite-slide-resize-actual,.sprite-slide-resize,.sprite-slide,.sprite-slides-stack,.sprite-slides,.sprite-smiley-angel,.sprite-smiley-confuse,.sprite-smiley-cool,.sprite-smiley-cry,.sprite-smiley-draw,.sprite-smiley-eek-blue,.sprite-smiley-eek,.sprite-smiley-evil,.sprite-smiley-fat,.sprite-smiley-grin,.sprite-smiley-kiss,.sprite-smiley-kitty,.sprite-smiley-lol,.sprite-smiley-mad,.sprite-smiley-medium,.sprite-smiley-money,.sprite-smiley-mr-green,.sprite-smiley-nerd,.sprite-smiley-neutral,.sprite-smiley-razz,.sprite-smiley-red,.sprite-smiley-roll-blue,.sprite-smiley-roll-sweat,.sprite-smiley-roll,.sprite-smiley-sad-blue,.sprite-smiley-sad,.sprite-smiley-sleep,.sprite-smiley-slim,.sprite-smiley-small,.sprite-smiley-surprise,.sprite-smiley-sweat,.sprite-smiley-twist,.sprite-smiley-wink,.sprite-smiley-yell,.sprite-smiley-zipper,.sprite-smiley,.sprite-snowman-hat,.sprite-snowman,.sprite-soap-body,.sprite-soap-header,.sprite-soap,.sprite-socket--arrow,.sprite-socket--exclamation,.sprite-socket--minus,.sprite-socket--pencil,.sprite-socket--plus,.sprite-socket,.sprite-sockets,.sprite-sofa--arrow,.sprite-sofa--exclamation,.sprite-sofa--minus,.sprite-sofa--pencil,.sprite-sofa--plus,.sprite-sofa,.sprite-solar-panel,.sprite-sort--arrow,.sprite-sort--exclamation,.sprite-sort--minus,.sprite-sort--pencil,.sprite-sort--plus,.sprite-sort-alphabet-column,.sprite-sort-alphabet-descending,.sprite-sort-alphabet,.sprite-sort-date-descending,.sprite-sort-date,.sprite-sort-number-column,.sprite-sort-number-descending,.sprite-sort-number,.sprite-sort-price-descending,.sprite-sort-price,.sprite-sort-quantity-descending,.sprite-sort-quantity,.sprite-sort-rating-descending,.sprite-sort-rating,.sprite-sort-small,.sprite-sort,.sprite-speaker--arrow,.sprite-speaker--exclamation,.sprite-speaker--minus,.sprite-speaker--pencil,.sprite-speaker--plus,.sprite-speaker-network,.sprite-speaker-volume-control-mute,.sprite-speaker-volume-control-up,.sprite-speaker-volume-control,.sprite-speaker-volume-low,.sprite-speaker-volume-none,.sprite-speaker-volume,.sprite-speaker,.sprite-spectacle-3d,.sprite-spectacle-lorgnette,.sprite-spectacle-small,.sprite-spectacle-sunglass,.sprite-spectacle,.sprite-spectrum-absorption,.sprite-spectrum-emission,.sprite-spectrum-small,.sprite-spectrum,.sprite-spell-check-error,.sprite-spell-check,.sprite-sport-basketball,.sprite-sport-cricket,.sprite-sport-football,.sprite-sport-golf,.sprite-sport-soccer,.sprite-sport-tennis,.sprite-sport,.sprite-sports,.sprite-spray--arrow,.sprite-spray--exclamation,.sprite-spray--minus,.sprite-spray--pencil,.sprite-spray--plus,.sprite-spray-color,.sprite-spray-medium,.sprite-spray,.sprite-sql-join-inner,.sprite-sql-join-left-exclude,.sprite-sql-join-left,.sprite-sql-join-outer-exclude,.sprite-sql-join-outer,.sprite-sql-join-right-exclude,.sprite-sql-join-right,.sprite-sql-join,.sprite-sql,.sprite-stairs,.sprite-stamp--arrow,.sprite-stamp--exclamation,.sprite-stamp--minus,.sprite-stamp--pencil,.sprite-stamp--plus,.sprite-stamp-medium,.sprite-stamp-pattern,.sprite-stamp,.sprite-star--arrow,.sprite-star--exclamation,.sprite-star--minus,.sprite-star--pencil,.sprite-star--plus,.sprite-star-small-empty,.sprite-star-small-half,.sprite-star-small,.sprite-status-away,.sprite-status-busy,.sprite-status-offline,.sprite-status,.sprite-stickman-run-dash,.sprite-stickman-run,.sprite-stickman-smiley-angry,.sprite-stickman-smiley-empty,.sprite-stickman-smiley-love,.sprite-stickman-smiley-question,.sprite-stickman-smiley,.sprite-stickman,.sprite-sticky-note--arrow,.sprite-sticky-note--exclamation,.sprite-sticky-note--minus,.sprite-sticky-note--plus,.sprite-sticky-note-medium,.sprite-sticky-note-pin,.sprite-sticky-note-shred,.sprite-sticky-note-small-pin,.sprite-sticky-note-small,.sprite-sticky-note-text,.sprite-sticky-note,.sprite-sticky-notes-stack,.sprite-sticky-notes-text,.sprite-sticky-notes,.sprite-store--arrow,.sprite-store--exclamation,.sprite-store--minus,.sprite-store--pencil,.sprite-store--plus,.sprite-store-label,.sprite-store-market-stall,.sprite-store-medium,.sprite-store-network,.sprite-store-open,.sprite-store-share,.sprite-store-small,.sprite-subversion-small,.sprite-subversion,.sprite-sum,.sprite-sushi,.sprite-switch--arrow,.sprite-switch--exclamation,.sprite-switch--minus,.sprite-switch--pencil,.sprite-switch--plus,.sprite-switch-medium,.sprite-switch-network,.sprite-switch-small,.sprite-switch,.sprite-system-monitor--arrow,.sprite-system-monitor--exclamation,.sprite-system-monitor--minus,.sprite-system-monitor--pencil,.sprite-system-monitor--plus,.sprite-system-monitor-medium,.sprite-system-monitor-network,.sprite-system-monitor-protector,.sprite-system-monitor,.sprite-t-shirt-gray,.sprite-t-shirt-print-gray,.sprite-t-shirt-print,.sprite-t-shirt,.sprite-table--arrow,.sprite-table--exclamation,.sprite-table--minus,.sprite-table--pencil,.sprite-table--plus,.sprite-table-delete-column,.sprite-table-delete-row,.sprite-table-delete,.sprite-table-draw,.sprite-table-excel,.sprite-table-export,.sprite-table-heatmap,.sprite-table-import,.sprite-table-insert-column,.sprite-table-insert-row,.sprite-table-insert,.sprite-table-join-column,.sprite-table-join-row,.sprite-table-join,.sprite-table-medium,.sprite-table-money,.sprite-table-paint-can,.sprite-table-resize-actual,.sprite-table-resize,.sprite-table-rotate,.sprite-table-select-all,.sprite-table-select-cells,.sprite-table-select-column,.sprite-table-select-row,.sprite-table-select,.sprite-table-share,.sprite-table-sheet,.sprite-table-small,.sprite-table-split-column,.sprite-table-split-row,.sprite-table-split,.sprite-table-sum,.sprite-tables-relation,.sprite-tables-stacks,.sprite-tables,.sprite-tag--arrow,.sprite-tag--exclamation,.sprite-tag--minus,.sprite-tag--pencil,.sprite-tag--plus,.sprite-tag-cloud,.sprite-tag-export,.sprite-tag-hash,.sprite-tag-import,.sprite-tag-label-black,.sprite-tag-label-gray,.sprite-tag-label-green,.sprite-tag-label-pink,.sprite-tag-label-purple,.sprite-tag-label-red,.sprite-tag-label-yellow,.sprite-tag-label,.sprite-tag-medium,.sprite-tag-share,.sprite-tag-small,.sprite-tag,.sprite-tags-label,.sprite-tags,.sprite-target--arrow,.sprite-target--exclamation,.sprite-target--minus,.sprite-target--pencil,.sprite-target--plus,.sprite-task--arrow,.sprite-task--exclamation,.sprite-task--minus,.sprite-task--pencil,.sprite-task--plus,.sprite-task-select-first,.sprite-task-select-last,.sprite-task-select,.sprite-task,.sprite-telephone--arrow,.sprite-telephone--exclamation,.sprite-telephone--minus,.sprite-telephone--pencil,.sprite-telephone--plus,.sprite-telephone-fax,.sprite-telephone-handset-prohibition,.sprite-telephone-handset-wire,.sprite-telephone-handset,.sprite-telephone-medium,.sprite-telephone-network,.sprite-telephone-off,.sprite-telephone-share,.sprite-telephone,.sprite-television--arrow,.sprite-television--exclamation,.sprite-television--minus,.sprite-television--pencil,.sprite-television--plus,.sprite-television-image,.sprite-television-medium,.sprite-television-off,.sprite-television-protector,.sprite-television-test,.sprite-television,.sprite-terminal--arrow { background: url("../themes/images/icons/extra-icon-set-07.png") no-repeat !important; diff --git a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-08.css b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-08.css index cc856bf45de..6323240117b 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-08.css +++ b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-08.css @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ .sprite-terminal--exclamation,.sprite-terminal--minus,.sprite-terminal--pencil,.sprite-terminal--plus,.sprite-terminal-medium,.sprite-terminal-network,.sprite-terminal-protector,.sprite-terminal,.sprite-thermometer--arrow,.sprite-thermometer--exclamation,.sprite-thermometer--minus,.sprite-thermometer--pencil,.sprite-thermometer--plus,.sprite-thermometer-high,.sprite-thermometer-low,.sprite-thermometer,.sprite-thumb-small-up,.sprite-thumb-small,.sprite-thumb-up,.sprite-thumb,.sprite-tick-button,.sprite-tick-circle-frame,.sprite-tick-octagon-frame,.sprite-tick-octagon,.sprite-tick-red,.sprite-tick-shield,.sprite-tick-small-circle,.sprite-tick-small-red,.sprite-tick-small-white,.sprite-tick-white,.sprite-ticket--arrow,.sprite-ticket--exclamation,.sprite-ticket--minus,.sprite-ticket--plus,.sprite-ticket-small,.sprite-ticket-stub,.sprite-ticket,.sprite-tie-warm,.sprite-tie,.sprite-toggle-expand,.sprite-toggle-small-expand,.sprite-toggle-small,.sprite-toggle,.sprite-toilet-female,.sprite-toilet-male,.sprite-toilet,.sprite-toolbox--arrow,.sprite-toolbox--exclamation,.sprite-toolbox--minus,.sprite-toolbox--pencil,.sprite-toolbox--plus,.sprite-traffic-cone--arrow,.sprite-traffic-cone--exclamation,.sprite-traffic-cone--minus,.sprite-traffic-cone--pencil,.sprite-traffic-cone--plus,.sprite-traffic-cone,.sprite-traffic-light--arrow,.sprite-traffic-light--exclamation,.sprite-traffic-light--minus,.sprite-traffic-light--pencil,.sprite-traffic-light--plus,.sprite-traffic-light-green,.sprite-traffic-light-off,.sprite-traffic-light-red,.sprite-traffic-light-single,.sprite-traffic-light-yellow,.sprite-traffic-light,.sprite-train--arrow,.sprite-train--exclamation,.sprite-train--minus,.sprite-train--pencil,.sprite-train--plus,.sprite-train-metro,.sprite-train,.sprite-transmitter,.sprite-tree--arrow,.sprite-tree--exclamation,.sprite-tree--minus,.sprite-tree--pencil,.sprite-tree--plus,.sprite-tree-red,.sprite-tree-yellow,.sprite-tree,.sprite-trophy--arrow,.sprite-trophy--exclamation,.sprite-trophy--minus,.sprite-trophy--pencil,.sprite-trophy--plus,.sprite-trophy-bronze,.sprite-trophy-silver,.sprite-trophy,.sprite-truck--arrow,.sprite-truck--exclamation,.sprite-truck--minus,.sprite-truck--pencil,.sprite-truck--plus,.sprite-truck-box,.sprite-truck-empty,.sprite-ui-accordion,.sprite-ui-address-bar-green,.sprite-ui-address-bar-lock,.sprite-ui-address-bar-red,.sprite-ui-address-bar-yellow,.sprite-ui-address-bar,.sprite-ui-breadcrumb-bread,.sprite-ui-breadcrumb-select-current,.sprite-ui-breadcrumb-select-parent,.sprite-ui-breadcrumb-select,.sprite-ui-breadcrumb,.sprite-ui-button-default,.sprite-ui-button-image,.sprite-ui-button-navigation-back,.sprite-ui-button-navigation,.sprite-ui-button-toggle,.sprite-ui-button,.sprite-ui-buttons,.sprite-ui-check-box-mix,.sprite-ui-check-box-uncheck,.sprite-ui-check-box,.sprite-ui-check-boxes-list,.sprite-ui-check-boxes-series,.sprite-ui-check-boxes,.sprite-ui-color-picker-default,.sprite-ui-color-picker-switch,.sprite-ui-color-picker-transparent,.sprite-ui-color-picker,.sprite-ui-combo-box-blue,.sprite-ui-combo-box-calendar,.sprite-ui-combo-box-edit,.sprite-ui-combo-box,.sprite-ui-combo-boxes,.sprite-ui-flow,.sprite-ui-group-box,.sprite-ui-label-link,.sprite-ui-label,.sprite-ui-labels,.sprite-ui-layered-pane,.sprite-ui-layout-panel,.sprite-ui-list-box-blue,.sprite-ui-list-box,.sprite-ui-menu-blue,.sprite-ui-menu,.sprite-ui-paginator,.sprite-ui-panel-resize-actual,.sprite-ui-panel-resize,.sprite-ui-panel,.sprite-ui-progress-bar-indeterminate,.sprite-ui-progress-bar,.sprite-ui-radio-button-uncheck,.sprite-ui-radio-button,.sprite-ui-radio-buttons-list,.sprite-ui-radio-buttons,.sprite-ui-ruler,.sprite-ui-scroll-bar-horizontal,.sprite-ui-scroll-bar,.sprite-ui-scroll-pane-block,.sprite-ui-scroll-pane-blog,.sprite-ui-scroll-pane-both,.sprite-ui-scroll-pane-form,.sprite-ui-scroll-pane-icon,.sprite-ui-scroll-pane-image,.sprite-ui-scroll-pane-table,.sprite-ui-scroll-pane-text-image,.sprite-ui-scroll-pane-text,.sprite-ui-scroll-pane-tree,.sprite-ui-scroll-pane,.sprite-ui-search-field,.sprite-ui-seek-bar-050,.sprite-ui-seek-bar-100,.sprite-ui-seek-bar,.sprite-ui-separator-label,.sprite-ui-separator,.sprite-ui-slider-050,.sprite-ui-slider-100,.sprite-ui-slider-vertical-050,.sprite-ui-slider-vertical-100,.sprite-ui-slider-vertical,.sprite-ui-slider,.sprite-ui-spacer,.sprite-ui-spin,.sprite-ui-split-panel-vertical,.sprite-ui-split-panel,.sprite-ui-splitter-horizontal,.sprite-ui-splitter,.sprite-ui-status-bar-blue,.sprite-ui-status-bar,.sprite-ui-tab--arrow,.sprite-ui-tab--exclamation,.sprite-ui-tab--minus,.sprite-ui-tab--pencil,.sprite-ui-tab--plus,.sprite-ui-tab-bottom,.sprite-ui-tab-content-vertical,.sprite-ui-tab-content,.sprite-ui-tab-side,.sprite-ui-tab,.sprite-ui-text-area,.sprite-ui-text-field-clear-button,.sprite-ui-text-field-clear,.sprite-ui-text-field-format,.sprite-ui-text-field-hidden,.sprite-ui-text-field-medium-select,.sprite-ui-text-field-medium,.sprite-ui-text-field-password-green,.sprite-ui-text-field-password-red,.sprite-ui-text-field-password-yellow,.sprite-ui-text-field-password,.sprite-ui-text-field-select,.sprite-ui-text-field-small-select,.sprite-ui-text-field-small,.sprite-ui-text-field-suggestion,.sprite-ui-text-field,.sprite-ui-toolbar--arrow,.sprite-ui-toolbar--exclamation,.sprite-ui-toolbar--minus,.sprite-ui-toolbar--pencil,.sprite-ui-toolbar--plus,.sprite-ui-toolbar-bookmark,.sprite-ui-toolbar,.sprite-ui-tooltip--arrow,.sprite-ui-tooltip--exclamation,.sprite-ui-tooltip--minus,.sprite-ui-tooltip--pencil,.sprite-ui-tooltip--plus,.sprite-ui-tooltip-balloon-bottom,.sprite-ui-tooltip-balloon,.sprite-ui-tooltip,.sprite-umbrella--arrow,.sprite-umbrella--exclamation,.sprite-umbrella--minus,.sprite-umbrella--pencil,.sprite-umbrella--plus,.sprite-umbrella,.sprite-universal,.sprite-upload-cloud,.sprite-upload-linux,.sprite-upload-mac-os,.sprite-upload,.sprite-usb-flash-drive--arrow,.sprite-usb-flash-drive--exclamation,.sprite-usb-flash-drive--minus,.sprite-usb-flash-drive--pencil,.sprite-usb-flash-drive--plus,.sprite-usb-flash-drive-logo,.sprite-usb-flash-drive,.sprite-user--exclamation,.sprite-user--minus,.sprite-user-black-female,.sprite-user-black,.sprite-user-business-boss,.sprite-user-business-gray-boss,.sprite-user-business-gray,.sprite-user-business,.sprite-user-detective-gray,.sprite-user-detective,.sprite-user-female,.sprite-user-gray-female,.sprite-user-gray,.sprite-user-green-female,.sprite-user-green,.sprite-user-medical-female,.sprite-user-medical,.sprite-user-medium-female,.sprite-user-medium-silhouette,.sprite-user-medium,.sprite-user-nude-female,.sprite-user-nude,.sprite-user-red-female,.sprite-user-red,.sprite-user-share,.sprite-user-silhouette-question,.sprite-user-small-female,.sprite-user-small,.sprite-user-thief-baldie,.sprite-user-thief-female,.sprite-user-thief,.sprite-user-white-female,.sprite-user-white,.sprite-user-worker-boss,.sprite-user-worker,.sprite-user-yellow-female,.sprite-user-yellow,.sprite-validation-document,.sprite-validation-invalid-document,.sprite-validation-invalid,.sprite-validation-label-html,.sprite-validation-label,.sprite-validation-valid-document,.sprite-validation-valid,.sprite-validation,.sprite-vase-ear-double,.sprite-vase-ear,.sprite-vase,.sprite-vise-drawer,.sprite-vise,.sprite-wafer-gold,.sprite-wafer,.sprite-wall--arrow,.sprite-wall--exclamation,.sprite-wall--minus,.sprite-wall--pencil,.sprite-wall--plus,.sprite-wall-break,.sprite-wall-brick,.sprite-wall-small-brick,.sprite-wall-small,.sprite-wall,.sprite-wallet--arrow,.sprite-wallet--exclamation,.sprite-wallet--minus,.sprite-wallet--pencil,.sprite-wallet--plus,.sprite-wallet,.sprite-wand--arrow,.sprite-wand--exclamation,.sprite-wand--minus,.sprite-wand--pencil,.sprite-wand--plus,.sprite-wand-hat,.sprite-wand-magic,.sprite-wand-small,.sprite-wand,.sprite-water--arrow,.sprite-water--exclamation,.sprite-water--minus,.sprite-water--pencil,.sprite-water--plus,.sprite-water,.sprite-weather-cloud-small,.sprite-weather-cloud,.sprite-weather-clouds,.sprite-weather-cloudy,.sprite-weather-fog,.sprite-weather-lightning,.sprite-weather-moon-clouds,.sprite-weather-moon-fog,.sprite-weather-moon-half,.sprite-weather-moon,.sprite-weather-rain-little,.sprite-weather-rain,.sprite-weather-snow-little,.sprite-weather-snow,.sprite-weather-tornado,.sprite-weather-wind,.sprite-weather,.sprite-web-slice-balloon,.sprite-web-slice-document,.sprite-web-slice-small,.sprite-web-slice,.sprite-webcam--arrow,.sprite-webcam--exclamation,.sprite-webcam--minus,.sprite-webcam--pencil,.sprite-webcam--plus,.sprite-webcam-medium,.sprite-webcam-network,.sprite-webcam-share,.sprite-webcam,.sprite-weight--arrow,.sprite-weight--exclamation,.sprite-weight--minus,.sprite-weight--pencil,.sprite-weight--plus,.sprite-weight,.sprite-wheel,.sprite-wi-fi-zone,.sprite-wi-fi,.sprite-windows,.sprite-wooden-box--arrow,.sprite-wooden-box--exclamation,.sprite-wooden-box--minus,.sprite-wooden-box--pencil,.sprite-wooden-box--plus,.sprite-wooden-box-label,.sprite-wooden-box,.sprite-wrap-behind,.sprite-wrap-between,.sprite-wrap-edit,.sprite-wrap-front,.sprite-wrap-option,.sprite-wrap-square,.sprite-wrap-through,.sprite-wrap-tight,.sprite-wrap,.sprite-wrench--arrow,.sprite-wrench--exclamation,.sprite-wrench--minus,.sprite-wrench--pencil,.sprite-wrench--plus,.sprite-wrench,.sprite-x-ray,.sprite-xfn-colleague-met,.sprite-xfn-friend-met,.sprite-xfn-friend,.sprite-xfn-sweetheart-met,.sprite-xfn-sweetheart,.sprite-xfn,.sprite-yin-yang,.sprite-zodiac-aries,.sprite-zodiac-cancer,.sprite-zodiac-capricorn,.sprite-zodiac-gemini,.sprite-zodiac-leo,.sprite-zodiac-libra,.sprite-zodiac-pisces,.sprite-zodiac-sagittarius,.sprite-zodiac-scorpio,.sprite-zodiac-taurus,.sprite-zodiac-virgo,.sprite-zodiac,.sprite-zone--arrow,.sprite-zone--exclamation,.sprite-zone--minus,.sprite-zone--pencil,.sprite-zone--plus,.sprite-zone-label,.sprite-zone-medium,.sprite-zone-money,.sprite-zone-resize-actual,.sprite-zone-resize,.sprite-zone-select,.sprite-zone-share,.sprite-zone,.sprite-zones-stack,.sprite-zones { background: url("../themes/images/icons/extra-icon-set-08.png") no-repeat !important; diff --git a/themes/Backend/ExtJs/backend/_resources/resources/sass/ext-all.scss b/themes/Backend/ExtJs/backend/_resources/resources/sass/ext-all.scss index d51a99823e1..07e1926999d 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/sass/ext-all.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/sass/ext-all.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_legacy.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_legacy.scss index 9c6443a2f20..19f42fc745c 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_legacy.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_legacy.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_mixins.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_mixins.scss index 6897af62356..cf59226726d 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_mixins.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_mixins.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_modules.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_modules.scss index 6b52293bcd7..2497f619e3c 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_modules.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_modules.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_widgets.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_widgets.scss index 96554689a13..ad00c9c705d 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_widgets.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_widgets.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling @@ -55,5 +54,3 @@ /** Include global form widgets */ @import 'widgets/form/all'; @import 'widgets/attribute/media_multi_selection'; - - diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_analytics.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_analytics.scss index 388a00513dc..6236fc71c85 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_analytics.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_analytics.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_article.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_article.scss index e4bc5a6af66..e8f8d10537b 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_article.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_article.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_banner.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_banner.scss index 4f53b2f8957..36f57d50711 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_banner.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_banner.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_blog.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_blog.scss index 8712170e66a..d806f55877d 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_blog.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_blog.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_customerlist.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_customerlist.scss index 2720a8fcc89..097d4f4620d 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_customerlist.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_customerlist.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_emotions.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_emotions.scss index 17b3cf06899..3a316416225 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_emotions.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_emotions.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling @@ -1366,4 +1365,4 @@ div[id^=emotion-detail-window] { } } } -} \ No newline at end of file +} diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_login.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_login.scss index b0d0a06291b..3a68580289f 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_login.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_login.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_mediamanager.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_mediamanager.scss index 2f5c6df62a8..1c68d52d86c 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_mediamanager.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_mediamanager.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_orderlist.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_orderlist.scss index a3f65dbde64..b2a56c90557 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_orderlist.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_orderlist.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_theme.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_theme.scss index 4a9dbd39f09..398b0e79eb8 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_theme.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_theme.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_widgets.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_widgets.scss index 52a0e0133d2..6dcab324747 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_widgets.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_widgets.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_button.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_button.scss index 29b1f9642d8..fbf2e9082cc 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_button.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_button.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_fieldset.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_fieldset.scss index c0d7db7486f..11404582c07 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_fieldset.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_fieldset.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_panel.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_panel.scss index be95164d55a..c0d368aae54 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_panel.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_panel.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_toolbar.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_toolbar.scss index 2aacda1f725..a3775c0b304 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_toolbar.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_toolbar.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_viewport.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_viewport.scss index 6cf062b339e..592ef2ab297 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_viewport.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_viewport.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_window.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_window.scss index 7378f072bbc..86b7f4e50d7 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_window.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_window.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_accordion.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_accordion.scss index d92f2b75c43..9346ea497df 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_accordion.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_accordion.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_article-dd.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_article-dd.scss index 4f5eac4eeba..4ae26d8070c 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_article-dd.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_article-dd.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_boundlist.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_boundlist.scss index 97e632f24f0..60cfd2c14ff 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_boundlist.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_boundlist.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_button.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_button.scss index 35929d68024..60205c9c37b 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_button.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_button.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_datepicker.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_datepicker.scss index 0f48880c1e4..afafba6b5a7 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_datepicker.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_datepicker.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_desktopswitcher.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_desktopswitcher.scss index 76fe798829d..44d110a2379 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_desktopswitcher.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_desktopswitcher.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_grid.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_grid.scss index 7333dc11629..13beebd5938 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_grid.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_grid.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_headertooltip.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_headertooltip.scss index 5c9594fd14a..704e47abcbe 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_headertooltip.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_headertooltip.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_keynav.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_keynav.scss index 5fdf3650de2..f78fd4bfee1 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_keynav.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_keynav.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_loadmask.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_loadmask.scss index 0c555d7c461..a1bab7033ec 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_loadmask.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_loadmask.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_login.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_login.scss index 6d76cac2d42..3de58abd6ca 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_login.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_login.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_mediadropzone.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_mediadropzone.scss index d93520823b8..85d0ab064af 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_mediadropzone.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_mediadropzone.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_menu.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_menu.scss index 13640786b52..b4758a1daee 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_menu.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_menu.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_notification.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_notification.scss index 9aac0fe56d1..5634f4ee643 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_notification.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_notification.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_panel.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_panel.scss index 93d5c08147f..d05b280cfa9 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_panel.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_panel.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_progressbar.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_progressbar.scss index 2b722057d2a..ff9c2f69822 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_progressbar.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_progressbar.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_rowediting.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_rowediting.scss index e4b1d081604..4c89ed65f62 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_rowediting.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_rowediting.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tab.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tab.scss index 96017e02bb3..a3f5ded5962 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tab.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tab.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_toolbar.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_toolbar.scss index b2aa495c4ad..85895fde244 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_toolbar.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_toolbar.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tooltip.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tooltip.scss index db934fa3a96..779a97278f2 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tooltip.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tooltip.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tree.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tree.scss index 039efb1a994..ad2656ba393 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tree.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tree.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_viewport.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_viewport.scss index 7ae8f506301..84d55f76d33 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_viewport.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_viewport.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_widgets.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_widgets.scss index 7a005f0f98d..58aa41df71b 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_widgets.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_widgets.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_window.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_window.scss index 5f2f8df6cf5..b8ec4b9e6cd 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_window.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_window.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_all.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_all.scss index c76317db241..70d73c51bdc 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_all.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_all.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_fieldset.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_fieldset.scss index b2133ff8a12..5a55b88c8b5 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_fieldset.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_fieldset.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling @@ -69,4 +68,3 @@ .#{$prefix}fieldset-collapsed .#{$prefix}fieldset-header .#{$prefix}tool { border-color: #dfe3e6 } - diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_panel.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_panel.scss index f3ea882c135..e9c8374024b 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_panel.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_panel.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_all.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_all.scss index 730ae103703..e0d48d8e7eb 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_all.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_all.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_boxselect.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_boxselect.scss index 11727be6588..e2b28558bc2 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_boxselect.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_boxselect.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_checkbox.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_checkbox.scss index b965bc22879..ed3f64a13b7 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_checkbox.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_checkbox.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_combobox.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_combobox.scss index eaaa2b1000d..c3bc0a3a4b8 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_combobox.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_combobox.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_datefield.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_datefield.scss index f40c9311af4..45c408af3fc 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_datefield.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_datefield.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_filefield.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_filefield.scss index b1350a4467c..dea812d4884 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_filefield.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_filefield.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_itemselector.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_itemselector.scss index 193d080d917..c904f17e3a9 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_itemselector.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_itemselector.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_livearticlesearch.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_livearticlesearch.scss index 505c7e8cf0a..26e82a242ae 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_livearticlesearch.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_livearticlesearch.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_mediaselection.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_mediaselection.scss index cb39232a44d..32c92285683 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_mediaselection.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_mediaselection.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_numberfield.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_numberfield.scss index 20899a930bb..968d7eb4eac 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_numberfield.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_numberfield.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_passwordstrength.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_passwordstrength.scss index a18fec52578..e63a3c64245 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_passwordstrength.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_passwordstrength.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_radiobox.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_radiobox.scss index 9a9a125e28b..b2c55e6c33d 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_radiobox.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_radiobox.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_slider.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_slider.scss index 4d7bd48c2f6..104edd678e1 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_slider.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_slider.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_textfield.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_textfield.scss index 27d14491eb9..12db6c7b773 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_textfield.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_textfield.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_timefield.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_timefield.scss index af0adb142f8..424a4700d7c 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_timefield.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_timefield.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_tinymce.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_tinymce.scss index a7cedd7e86b..c3bb132fb6a 100644 --- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_tinymce.scss +++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_tinymce.scss @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Styling diff --git a/themes/Backend/ExtJs/backend/analytics/app.js b/themes/Backend/ExtJs/backend/analytics/app.js index c5ab8a7ce15..ba46fbc6fd9 100644 --- a/themes/Backend/ExtJs/backend/analytics/app.js +++ b/themes/Backend/ExtJs/backend/analytics/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/controller/main.js b/themes/Backend/ExtJs/backend/analytics/controller/main.js index 7275fe5cf33..870b2cc3da2 100644 --- a/themes/Backend/ExtJs/backend/analytics/controller/main.js +++ b/themes/Backend/ExtJs/backend/analytics/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/controller/referrer_visitors.js b/themes/Backend/ExtJs/backend/analytics/controller/referrer_visitors.js index 2d004139599..2056279dd37 100644 --- a/themes/Backend/ExtJs/backend/analytics/controller/referrer_visitors.js +++ b/themes/Backend/ExtJs/backend/analytics/controller/referrer_visitors.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/model/navigation.js b/themes/Backend/ExtJs/backend/analytics/model/navigation.js index bd7993bab27..97c8f0b1052 100644 --- a/themes/Backend/ExtJs/backend/analytics/model/navigation.js +++ b/themes/Backend/ExtJs/backend/analytics/model/navigation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/data.js b/themes/Backend/ExtJs/backend/analytics/store/data.js index a1f3c172bd4..c3d18e10246 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/data.js +++ b/themes/Backend/ExtJs/backend/analytics/store/data.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation.js b/themes/Backend/ExtJs/backend/analytics/store/navigation.js index 7d1310ace9f..a59e2393b7a 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/article_impressions.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/article_impressions.js index 41d60323411..5a2f1b76177 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/article_impressions.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/article_impressions.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/article_sales.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/article_sales.js index d0f2efe746d..c0934165437 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/article_sales.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/article_sales.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/calendar_weeks.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/calendar_weeks.js index 0fd60147929..4a58b90af20 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/calendar_weeks.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/calendar_weeks.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/categories.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/categories.js index c499459bed8..8ffc1a47b31 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/categories.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/categories.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/countries.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/countries.js index 514c005efb6..24b8c900c09 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/countries.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/countries.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/customer_age.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/customer_age.js index f928aca5799..7ef58584b1d 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/customer_age.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/customer_age.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/customer_groups.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/customer_groups.js index 7fb7cf333f2..c1d50e069c0 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/customer_groups.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/customer_groups.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/customers.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/customers.js index e0d058722fc..20a6b4d660b 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/customers.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/customers.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/device_types.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/device_types.js index 7964ef34b49..a0c5080fd55 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/device_types.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/device_types.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/month.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/month.js index ec57f86759d..6045a964e94 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/month.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/month.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/overview.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/overview.js index 207b75effd2..cec3132ed95 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/overview.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/overview.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/partner_revenue.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/partner_revenue.js index 5f5a09c1ea3..6355c3f6181 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/partner_revenue.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/partner_revenue.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/payment.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/payment.js index 674ac7b5624..32e0a09ce3d 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/payment.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/payment.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/rating.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/rating.js index dce3ad414f3..45c60099c76 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/rating.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/rating.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/referrer_revenue.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/referrer_revenue.js index 67f640af12d..aebac27214d 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/referrer_revenue.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/referrer_revenue.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/referrer_visitors.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/referrer_visitors.js index 4a71e80184a..7272ad53db3 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/referrer_visitors.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/referrer_visitors.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/search.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/search.js index fd563c3f90b..3aaabe2ebac 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/search.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/search.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/search_terms.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/search_terms.js index ec7fd773854..9f6ae92957d 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/search_terms.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/search_terms.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/search_urls.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/search_urls.js index 9ddfa5c7dca..f581aea479a 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/search_urls.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/search_urls.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/shipping_methods.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/shipping_methods.js index 0fa77b68469..d69b6545f17 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/shipping_methods.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/shipping_methods.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/time.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/time.js index 614df64ad6b..dfe27277fff 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/time.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/time.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/vendors.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/vendors.js index f3d6238c3f3..144bb142c31 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/vendors.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/vendors.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/visitors.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/visitors.js index 5939f92e9de..8c6434d55e3 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/visitors.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/visitors.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/weekdays.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/weekdays.js index cd25232ac47..cf746f47cdf 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/navigation/weekdays.js +++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/weekdays.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/store/shop.js b/themes/Backend/ExtJs/backend/analytics/store/shop.js index 4925d8fcb01..2f8935eff7c 100644 --- a/themes/Backend/ExtJs/backend/analytics/store/shop.js +++ b/themes/Backend/ExtJs/backend/analytics/store/shop.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/category.js b/themes/Backend/ExtJs/backend/analytics/view/chart/category.js index be0d4a51601..e6d71c1c24f 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/chart/category.js +++ b/themes/Backend/ExtJs/backend/analytics/view/chart/category.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/country.js b/themes/Backend/ExtJs/backend/analytics/view/chart/country.js index 168bfbaed59..42ac4bef59c 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/chart/country.js +++ b/themes/Backend/ExtJs/backend/analytics/view/chart/country.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/customer_age.js b/themes/Backend/ExtJs/backend/analytics/view/chart/customer_age.js index 8fa4bc92f14..a69326eb3da 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/chart/customer_age.js +++ b/themes/Backend/ExtJs/backend/analytics/view/chart/customer_age.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/customer_group.js b/themes/Backend/ExtJs/backend/analytics/view/chart/customer_group.js index 6f8d918319c..b19a4587d33 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/chart/customer_group.js +++ b/themes/Backend/ExtJs/backend/analytics/view/chart/customer_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/customers.js b/themes/Backend/ExtJs/backend/analytics/view/chart/customers.js index 835f9ead585..cf45e1063eb 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/chart/customers.js +++ b/themes/Backend/ExtJs/backend/analytics/view/chart/customers.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/daytime.js b/themes/Backend/ExtJs/backend/analytics/view/chart/daytime.js index 37a73d6e39f..8fc45550dbc 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/chart/daytime.js +++ b/themes/Backend/ExtJs/backend/analytics/view/chart/daytime.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/device_types.js b/themes/Backend/ExtJs/backend/analytics/view/chart/device_types.js index a369a57306c..5c4d4fe28eb 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/chart/device_types.js +++ b/themes/Backend/ExtJs/backend/analytics/view/chart/device_types.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/dispatch.js b/themes/Backend/ExtJs/backend/analytics/view/chart/dispatch.js index d110ccf3726..323fcddf991 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/chart/dispatch.js +++ b/themes/Backend/ExtJs/backend/analytics/view/chart/dispatch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/month.js b/themes/Backend/ExtJs/backend/analytics/view/chart/month.js index 9cb7b5688c9..3341bd8a447 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/chart/month.js +++ b/themes/Backend/ExtJs/backend/analytics/view/chart/month.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/partner_revenue.js b/themes/Backend/ExtJs/backend/analytics/view/chart/partner_revenue.js index 1b89354f3db..301f469e99a 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/chart/partner_revenue.js +++ b/themes/Backend/ExtJs/backend/analytics/view/chart/partner_revenue.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/payment.js b/themes/Backend/ExtJs/backend/analytics/view/chart/payment.js index baf97585c99..b3adf0bd4f6 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/chart/payment.js +++ b/themes/Backend/ExtJs/backend/analytics/view/chart/payment.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/supplier.js b/themes/Backend/ExtJs/backend/analytics/view/chart/supplier.js index 3cb34866098..700005993eb 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/chart/supplier.js +++ b/themes/Backend/ExtJs/backend/analytics/view/chart/supplier.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/visitors.js b/themes/Backend/ExtJs/backend/analytics/view/chart/visitors.js index 11e1862e717..6aeb691b082 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/chart/visitors.js +++ b/themes/Backend/ExtJs/backend/analytics/view/chart/visitors.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/week.js b/themes/Backend/ExtJs/backend/analytics/view/chart/week.js index 7fca1031f98..3e80bc3349b 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/chart/week.js +++ b/themes/Backend/ExtJs/backend/analytics/view/chart/week.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/weekday.js b/themes/Backend/ExtJs/backend/analytics/view/chart/weekday.js index 214216b6d3a..3f1ffe7e2fc 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/chart/weekday.js +++ b/themes/Backend/ExtJs/backend/analytics/view/chart/weekday.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/main/chart.js b/themes/Backend/ExtJs/backend/analytics/view/main/chart.js index 8ba5b6fa3b6..3294a4923e9 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/main/chart.js +++ b/themes/Backend/ExtJs/backend/analytics/view/main/chart.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/main/navigation.js b/themes/Backend/ExtJs/backend/analytics/view/main/navigation.js index d00d3bb7a9c..16a4fe4486a 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/main/navigation.js +++ b/themes/Backend/ExtJs/backend/analytics/view/main/navigation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/main/panel.js b/themes/Backend/ExtJs/backend/analytics/view/main/panel.js index 0f60d101460..6886744eba4 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/main/panel.js +++ b/themes/Backend/ExtJs/backend/analytics/view/main/panel.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/main/table.js b/themes/Backend/ExtJs/backend/analytics/view/main/table.js index d671e63831c..b1ace0c25d5 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/main/table.js +++ b/themes/Backend/ExtJs/backend/analytics/view/main/table.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/main/toolbar.js b/themes/Backend/ExtJs/backend/analytics/view/main/toolbar.js index caddba1b6bf..27dae33489c 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/main/toolbar.js +++ b/themes/Backend/ExtJs/backend/analytics/view/main/toolbar.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/main/window.js b/themes/Backend/ExtJs/backend/analytics/view/main/window.js index c0435e3155a..2d43047e960 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/main/window.js +++ b/themes/Backend/ExtJs/backend/analytics/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/article_impression.js b/themes/Backend/ExtJs/backend/analytics/view/table/article_impression.js index 2067d7f8115..43d4bf69b2c 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/article_impression.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/article_impression.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/article_sales.js b/themes/Backend/ExtJs/backend/analytics/view/table/article_sales.js index c23786fae84..03b9965f7ba 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/article_sales.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/article_sales.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/category.js b/themes/Backend/ExtJs/backend/analytics/view/table/category.js index ff7d63e9748..4d7aeab20c9 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/category.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/category.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/country.js b/themes/Backend/ExtJs/backend/analytics/view/table/country.js index 3d0966bd269..c6d144d0030 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/country.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/country.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/customer_age.js b/themes/Backend/ExtJs/backend/analytics/view/table/customer_age.js index 769f8ba7c94..1bb3690200e 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/customer_age.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/customer_age.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/customer_group.js b/themes/Backend/ExtJs/backend/analytics/view/table/customer_group.js index f34ff0198da..a311d0d8cda 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/customer_group.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/customer_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/customers.js b/themes/Backend/ExtJs/backend/analytics/view/table/customers.js index 8a51b86d9d9..145ca2946e8 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/customers.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/customers.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/daytime.js b/themes/Backend/ExtJs/backend/analytics/view/table/daytime.js index e6cc560b3ae..098f4f487c9 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/daytime.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/daytime.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/device_types.js b/themes/Backend/ExtJs/backend/analytics/view/table/device_types.js index b10b50eaf85..dbb1b63cb27 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/device_types.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/device_types.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/dispatch.js b/themes/Backend/ExtJs/backend/analytics/view/table/dispatch.js index 96c7b485bb9..798a84c7222 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/dispatch.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/dispatch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/month.js b/themes/Backend/ExtJs/backend/analytics/view/table/month.js index a05130d0175..9dfcafdd85d 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/month.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/month.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/overview.js b/themes/Backend/ExtJs/backend/analytics/view/table/overview.js index fb6c8e798be..450bc5fd8cc 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/overview.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/overview.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/partner_revenue.js b/themes/Backend/ExtJs/backend/analytics/view/table/partner_revenue.js index 770fc656406..0cab5aafefc 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/partner_revenue.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/partner_revenue.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/payment.js b/themes/Backend/ExtJs/backend/analytics/view/table/payment.js index 9ac6833282a..7ccdcfeb17e 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/payment.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/payment.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/rating.js b/themes/Backend/ExtJs/backend/analytics/view/table/rating.js index 4eab8050e5b..790a991ed8b 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/rating.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/rating.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/referrer_revenue.js b/themes/Backend/ExtJs/backend/analytics/view/table/referrer_revenue.js index cfcf836bd15..7c9e546a2d5 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/referrer_revenue.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/referrer_revenue.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/referrer_visitors.js b/themes/Backend/ExtJs/backend/analytics/view/table/referrer_visitors.js index 5a4390bf971..1f417face7b 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/referrer_visitors.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/referrer_visitors.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/search.js b/themes/Backend/ExtJs/backend/analytics/view/table/search.js index b560c0ae60e..e8c0420d749 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/search.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/search.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/search_terms.js b/themes/Backend/ExtJs/backend/analytics/view/table/search_terms.js index 0d9d750222c..9e5afa8758e 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/search_terms.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/search_terms.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/search_urls.js b/themes/Backend/ExtJs/backend/analytics/view/table/search_urls.js index e627867c3ad..5f00e39ad39 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/search_urls.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/search_urls.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/supplier.js b/themes/Backend/ExtJs/backend/analytics/view/table/supplier.js index 18a3e3df2b9..a2e328a043a 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/supplier.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/supplier.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/visitors.js b/themes/Backend/ExtJs/backend/analytics/view/table/visitors.js index ada8c41e19c..c8150b20c40 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/visitors.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/visitors.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/week.js b/themes/Backend/ExtJs/backend/analytics/view/table/week.js index 6ebfa9dcb51..4609a57cf1f 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/week.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/week.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/weekday.js b/themes/Backend/ExtJs/backend/analytics/view/table/weekday.js index a66534708e6..de5c3083257 100644 --- a/themes/Backend/ExtJs/backend/analytics/view/table/weekday.js +++ b/themes/Backend/ExtJs/backend/analytics/view/table/weekday.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/app/growl.js b/themes/Backend/ExtJs/backend/app/growl.js index 5d3de4ce598..1fea5bacaed 100644 --- a/themes/Backend/ExtJs/backend/app/growl.js +++ b/themes/Backend/ExtJs/backend/app/growl.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package App diff --git a/themes/Backend/ExtJs/backend/article/app.js b/themes/Backend/ExtJs/backend/article/app.js index 18e8b655791..27c7bea4891 100644 --- a/themes/Backend/ExtJs/backend/article/app.js +++ b/themes/Backend/ExtJs/backend/article/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/controller/category.js b/themes/Backend/ExtJs/backend/article/controller/category.js index 5c190b8336a..e756c21ff40 100644 --- a/themes/Backend/ExtJs/backend/article/controller/category.js +++ b/themes/Backend/ExtJs/backend/article/controller/category.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/controller/crossselling.js b/themes/Backend/ExtJs/backend/article/controller/crossselling.js index 6bf90c6391a..ce9d7d1b736 100644 --- a/themes/Backend/ExtJs/backend/article/controller/crossselling.js +++ b/themes/Backend/ExtJs/backend/article/controller/crossselling.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/controller/detail.js b/themes/Backend/ExtJs/backend/article/controller/detail.js index 8fc9c925b63..36d63baa506 100644 --- a/themes/Backend/ExtJs/backend/article/controller/detail.js +++ b/themes/Backend/ExtJs/backend/article/controller/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/controller/esd.js b/themes/Backend/ExtJs/backend/article/controller/esd.js index 8edd9901546..a2366994948 100644 --- a/themes/Backend/ExtJs/backend/article/controller/esd.js +++ b/themes/Backend/ExtJs/backend/article/controller/esd.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/controller/main.js b/themes/Backend/ExtJs/backend/article/controller/main.js index b6353e11a2a..94f88610b8e 100644 --- a/themes/Backend/ExtJs/backend/article/controller/main.js +++ b/themes/Backend/ExtJs/backend/article/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/controller/media.js b/themes/Backend/ExtJs/backend/article/controller/media.js index fc3b262387c..cb93f760bc9 100644 --- a/themes/Backend/ExtJs/backend/article/controller/media.js +++ b/themes/Backend/ExtJs/backend/article/controller/media.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/controller/price_variation.js b/themes/Backend/ExtJs/backend/article/controller/price_variation.js index 59e0460e8cd..8a3e9a88d6b 100644 --- a/themes/Backend/ExtJs/backend/article/controller/price_variation.js +++ b/themes/Backend/ExtJs/backend/article/controller/price_variation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/controller/statistic.js b/themes/Backend/ExtJs/backend/article/controller/statistic.js index 630ff7bf103..2db5dc1c3b5 100644 --- a/themes/Backend/ExtJs/backend/article/controller/statistic.js +++ b/themes/Backend/ExtJs/backend/article/controller/statistic.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/controller/variant.js b/themes/Backend/ExtJs/backend/article/controller/variant.js index 84eb06245ac..621a8f7d14c 100644 --- a/themes/Backend/ExtJs/backend/article/controller/variant.js +++ b/themes/Backend/ExtJs/backend/article/controller/variant.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/accessory.js b/themes/Backend/ExtJs/backend/article/model/accessory.js index ba126f511f5..e84ca79a2ef 100644 --- a/themes/Backend/ExtJs/backend/article/model/accessory.js +++ b/themes/Backend/ExtJs/backend/article/model/accessory.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/article.js b/themes/Backend/ExtJs/backend/article/model/article.js index 8c7eb26b04b..105a9b24a35 100644 --- a/themes/Backend/ExtJs/backend/article/model/article.js +++ b/themes/Backend/ExtJs/backend/article/model/article.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/batch.js b/themes/Backend/ExtJs/backend/article/model/batch.js index 0e0cf4b60ae..a9519d2dbe4 100644 --- a/themes/Backend/ExtJs/backend/article/model/batch.js +++ b/themes/Backend/ExtJs/backend/article/model/batch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/category.js b/themes/Backend/ExtJs/backend/article/model/category.js index bee330a2e0d..fcc1a30f5af 100644 --- a/themes/Backend/ExtJs/backend/article/model/category.js +++ b/themes/Backend/ExtJs/backend/article/model/category.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/configurator.js b/themes/Backend/ExtJs/backend/article/model/configurator.js index 3a65540b4eb..57b9e4bfae6 100644 --- a/themes/Backend/ExtJs/backend/article/model/configurator.js +++ b/themes/Backend/ExtJs/backend/article/model/configurator.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/configurator_group.js b/themes/Backend/ExtJs/backend/article/model/configurator_group.js index 67439efcf0c..e69917afc81 100644 --- a/themes/Backend/ExtJs/backend/article/model/configurator_group.js +++ b/themes/Backend/ExtJs/backend/article/model/configurator_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/configurator_option.js b/themes/Backend/ExtJs/backend/article/model/configurator_option.js index 3e167319883..19b44df1f77 100644 --- a/themes/Backend/ExtJs/backend/article/model/configurator_option.js +++ b/themes/Backend/ExtJs/backend/article/model/configurator_option.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/configurator_set.js b/themes/Backend/ExtJs/backend/article/model/configurator_set.js index 038775a096e..d25916cc11f 100644 --- a/themes/Backend/ExtJs/backend/article/model/configurator_set.js +++ b/themes/Backend/ExtJs/backend/article/model/configurator_set.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/configurator_template.js b/themes/Backend/ExtJs/backend/article/model/configurator_template.js index 2b7c4c2727e..84d5c927889 100644 --- a/themes/Backend/ExtJs/backend/article/model/configurator_template.js +++ b/themes/Backend/ExtJs/backend/article/model/configurator_template.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/dependency.js b/themes/Backend/ExtJs/backend/article/model/dependency.js index a39bf49f38a..9bab708b2d3 100644 --- a/themes/Backend/ExtJs/backend/article/model/dependency.js +++ b/themes/Backend/ExtJs/backend/article/model/dependency.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/detail.js b/themes/Backend/ExtJs/backend/article/model/detail.js index bc7c06d2b79..245eb99b702 100644 --- a/themes/Backend/ExtJs/backend/article/model/detail.js +++ b/themes/Backend/ExtJs/backend/article/model/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/download.js b/themes/Backend/ExtJs/backend/article/model/download.js index d8bbd2b5ba3..ec781e403df 100644 --- a/themes/Backend/ExtJs/backend/article/model/download.js +++ b/themes/Backend/ExtJs/backend/article/model/download.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * Shopware Model - Article backend module. * diff --git a/themes/Backend/ExtJs/backend/article/model/download_attribute.js b/themes/Backend/ExtJs/backend/article/model/download_attribute.js index 08ba7ff84b0..f7dce983844 100644 --- a/themes/Backend/ExtJs/backend/article/model/download_attribute.js +++ b/themes/Backend/ExtJs/backend/article/model/download_attribute.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/esd.js b/themes/Backend/ExtJs/backend/article/model/esd.js index 21a170d50d9..1890a42c859 100644 --- a/themes/Backend/ExtJs/backend/article/model/esd.js +++ b/themes/Backend/ExtJs/backend/article/model/esd.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/esd_attribute.js b/themes/Backend/ExtJs/backend/article/model/esd_attribute.js index 8eb95c217e0..dc2169073d6 100644 --- a/themes/Backend/ExtJs/backend/article/model/esd_attribute.js +++ b/themes/Backend/ExtJs/backend/article/model/esd_attribute.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/esd_file.js b/themes/Backend/ExtJs/backend/article/model/esd_file.js index d0931577686..8e1a793fc25 100644 --- a/themes/Backend/ExtJs/backend/article/model/esd_file.js +++ b/themes/Backend/ExtJs/backend/article/model/esd_file.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/field.js b/themes/Backend/ExtJs/backend/article/model/field.js index bc63a49a1cc..9bb7ada29c3 100644 --- a/themes/Backend/ExtJs/backend/article/model/field.js +++ b/themes/Backend/ExtJs/backend/article/model/field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/link.js b/themes/Backend/ExtJs/backend/article/model/link.js index 0f8a1db29c0..7d4134b693d 100644 --- a/themes/Backend/ExtJs/backend/article/model/link.js +++ b/themes/Backend/ExtJs/backend/article/model/link.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @link http://www.shopware.de/ * @license http://www.shopware.de/license diff --git a/themes/Backend/ExtJs/backend/article/model/link_attribute.js b/themes/Backend/ExtJs/backend/article/model/link_attribute.js index c32ad7cba96..d153555e42b 100644 --- a/themes/Backend/ExtJs/backend/article/model/link_attribute.js +++ b/themes/Backend/ExtJs/backend/article/model/link_attribute.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/mapping.js b/themes/Backend/ExtJs/backend/article/model/mapping.js index da70ebbdd3f..3fb83ebd347 100644 --- a/themes/Backend/ExtJs/backend/article/model/mapping.js +++ b/themes/Backend/ExtJs/backend/article/model/mapping.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @link http://www.shopware.de/ * @license http://www.shopware.de/license diff --git a/themes/Backend/ExtJs/backend/article/model/media.js b/themes/Backend/ExtJs/backend/article/model/media.js index 6574689c1c5..983c2c13675 100644 --- a/themes/Backend/ExtJs/backend/article/model/media.js +++ b/themes/Backend/ExtJs/backend/article/model/media.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @license http://www.shopware.de/license * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/media_attribute.js b/themes/Backend/ExtJs/backend/article/model/media_attribute.js index 3882a7d22fa..b1a3a8337dc 100644 --- a/themes/Backend/ExtJs/backend/article/model/media_attribute.js +++ b/themes/Backend/ExtJs/backend/article/model/media_attribute.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/media_mapping.js b/themes/Backend/ExtJs/backend/article/model/media_mapping.js index 06da0418961..fd4d99d5f63 100644 --- a/themes/Backend/ExtJs/backend/article/model/media_mapping.js +++ b/themes/Backend/ExtJs/backend/article/model/media_mapping.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @link http://www.shopware.de/ * @license http://www.shopware.de/license diff --git a/themes/Backend/ExtJs/backend/article/model/media_mapping_rule.js b/themes/Backend/ExtJs/backend/article/model/media_mapping_rule.js index da16f743637..5aafe4f631a 100644 --- a/themes/Backend/ExtJs/backend/article/model/media_mapping_rule.js +++ b/themes/Backend/ExtJs/backend/article/model/media_mapping_rule.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @link http://www.shopware.de/ * @license http://www.shopware.de/license diff --git a/themes/Backend/ExtJs/backend/article/model/price.js b/themes/Backend/ExtJs/backend/article/model/price.js index cc7f6a56ac0..4e7bf5b92c3 100644 --- a/themes/Backend/ExtJs/backend/article/model/price.js +++ b/themes/Backend/ExtJs/backend/article/model/price.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/price_attribute.js b/themes/Backend/ExtJs/backend/article/model/price_attribute.js index d50b584813f..7f7a6a530bb 100644 --- a/themes/Backend/ExtJs/backend/article/model/price_attribute.js +++ b/themes/Backend/ExtJs/backend/article/model/price_attribute.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/price_group.js b/themes/Backend/ExtJs/backend/article/model/price_group.js index d69fc9e8960..88014296584 100644 --- a/themes/Backend/ExtJs/backend/article/model/price_group.js +++ b/themes/Backend/ExtJs/backend/article/model/price_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/price_variation.js b/themes/Backend/ExtJs/backend/article/model/price_variation.js index 62e8a151dbb..033f0dc81e6 100644 --- a/themes/Backend/ExtJs/backend/article/model/price_variation.js +++ b/themes/Backend/ExtJs/backend/article/model/price_variation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/property.js b/themes/Backend/ExtJs/backend/article/model/property.js index 9ca49908469..7e13e23e432 100644 --- a/themes/Backend/ExtJs/backend/article/model/property.js +++ b/themes/Backend/ExtJs/backend/article/model/property.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/property_group.js b/themes/Backend/ExtJs/backend/article/model/property_group.js index 3ce9cd86566..811a11f5ac8 100644 --- a/themes/Backend/ExtJs/backend/article/model/property_group.js +++ b/themes/Backend/ExtJs/backend/article/model/property_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/property_option.js b/themes/Backend/ExtJs/backend/article/model/property_option.js index 040923e9eea..ad42b24d805 100644 --- a/themes/Backend/ExtJs/backend/article/model/property_option.js +++ b/themes/Backend/ExtJs/backend/article/model/property_option.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/seo_category.js b/themes/Backend/ExtJs/backend/article/model/seo_category.js index 8a1fd304591..ae7d1d3976f 100644 --- a/themes/Backend/ExtJs/backend/article/model/seo_category.js +++ b/themes/Backend/ExtJs/backend/article/model/seo_category.js @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/serial.js b/themes/Backend/ExtJs/backend/article/model/serial.js index ddeca08a57f..ee3ebbbe134 100644 --- a/themes/Backend/ExtJs/backend/article/model/serial.js +++ b/themes/Backend/ExtJs/backend/article/model/serial.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/similar.js b/themes/Backend/ExtJs/backend/article/model/similar.js index 15c8be702fc..5fd7024f670 100644 --- a/themes/Backend/ExtJs/backend/article/model/similar.js +++ b/themes/Backend/ExtJs/backend/article/model/similar.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/statistic.js b/themes/Backend/ExtJs/backend/article/model/statistic.js index 6715bb39bde..c3dc7146aba 100644 --- a/themes/Backend/ExtJs/backend/article/model/statistic.js +++ b/themes/Backend/ExtJs/backend/article/model/statistic.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/stream.js b/themes/Backend/ExtJs/backend/article/model/stream.js index 24779ab5337..9becdaf4093 100644 --- a/themes/Backend/ExtJs/backend/article/model/stream.js +++ b/themes/Backend/ExtJs/backend/article/model/stream.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/template.js b/themes/Backend/ExtJs/backend/article/model/template.js index d2bdb75d968..f19b2b7cef1 100644 --- a/themes/Backend/ExtJs/backend/article/model/template.js +++ b/themes/Backend/ExtJs/backend/article/model/template.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/model/unit.js b/themes/Backend/ExtJs/backend/article/model/unit.js index 79456302b9c..665b39a37f6 100644 --- a/themes/Backend/ExtJs/backend/article/model/unit.js +++ b/themes/Backend/ExtJs/backend/article/model/unit.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/store/batch.js b/themes/Backend/ExtJs/backend/article/store/batch.js index 8c34fbb54a4..fc1c544770d 100644 --- a/themes/Backend/ExtJs/backend/article/store/batch.js +++ b/themes/Backend/ExtJs/backend/article/store/batch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/store/category_path.js b/themes/Backend/ExtJs/backend/article/store/category_path.js index 614d59bf1f4..4db4361458f 100644 --- a/themes/Backend/ExtJs/backend/article/store/category_path.js +++ b/themes/Backend/ExtJs/backend/article/store/category_path.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/store/category_tree.js b/themes/Backend/ExtJs/backend/article/store/category_tree.js index 1ff5fe34e82..91816a6facb 100644 --- a/themes/Backend/ExtJs/backend/article/store/category_tree.js +++ b/themes/Backend/ExtJs/backend/article/store/category_tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/store/configurator_set.js b/themes/Backend/ExtJs/backend/article/store/configurator_set.js index 91bc972b193..42ec507b94b 100644 --- a/themes/Backend/ExtJs/backend/article/store/configurator_set.js +++ b/themes/Backend/ExtJs/backend/article/store/configurator_set.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/store/dependency.js b/themes/Backend/ExtJs/backend/article/store/dependency.js index 1b482f561bd..765030ea8eb 100644 --- a/themes/Backend/ExtJs/backend/article/store/dependency.js +++ b/themes/Backend/ExtJs/backend/article/store/dependency.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/store/detail.js b/themes/Backend/ExtJs/backend/article/store/detail.js index 2fb14e21a98..2d301b33361 100644 --- a/themes/Backend/ExtJs/backend/article/store/detail.js +++ b/themes/Backend/ExtJs/backend/article/store/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/store/esd.js b/themes/Backend/ExtJs/backend/article/store/esd.js index ca3e221141d..bec4975df8a 100644 --- a/themes/Backend/ExtJs/backend/article/store/esd.js +++ b/themes/Backend/ExtJs/backend/article/store/esd.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/store/esd_file.js b/themes/Backend/ExtJs/backend/article/store/esd_file.js index e537c768533..e392e61f9c9 100644 --- a/themes/Backend/ExtJs/backend/article/store/esd_file.js +++ b/themes/Backend/ExtJs/backend/article/store/esd_file.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/store/group.js b/themes/Backend/ExtJs/backend/article/store/group.js index 66710d2b92c..738f2ee6764 100644 --- a/themes/Backend/ExtJs/backend/article/store/group.js +++ b/themes/Backend/ExtJs/backend/article/store/group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/store/media_mapping.js b/themes/Backend/ExtJs/backend/article/store/media_mapping.js index 87ba7702900..91e8f247eb1 100644 --- a/themes/Backend/ExtJs/backend/article/store/media_mapping.js +++ b/themes/Backend/ExtJs/backend/article/store/media_mapping.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/store/option.js b/themes/Backend/ExtJs/backend/article/store/option.js index c6f7eb06ba3..84bb17d8654 100644 --- a/themes/Backend/ExtJs/backend/article/store/option.js +++ b/themes/Backend/ExtJs/backend/article/store/option.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/store/property.js b/themes/Backend/ExtJs/backend/article/store/property.js index 36d932c6d37..0d97012e59a 100644 --- a/themes/Backend/ExtJs/backend/article/store/property.js +++ b/themes/Backend/ExtJs/backend/article/store/property.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/store/serial.js b/themes/Backend/ExtJs/backend/article/store/serial.js index 71cdb7c9641..53f34a2803c 100644 --- a/themes/Backend/ExtJs/backend/article/store/serial.js +++ b/themes/Backend/ExtJs/backend/article/store/serial.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/store/statistic.js b/themes/Backend/ExtJs/backend/article/store/statistic.js index 4d6c0b7d588..a34455ce752 100644 --- a/themes/Backend/ExtJs/backend/article/store/statistic.js +++ b/themes/Backend/ExtJs/backend/article/store/statistic.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/store/variant.js b/themes/Backend/ExtJs/backend/article/store/variant.js index ca6b0b03d20..db89e12e23b 100644 --- a/themes/Backend/ExtJs/backend/article/store/variant.js +++ b/themes/Backend/ExtJs/backend/article/store/variant.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/store/variation.js b/themes/Backend/ExtJs/backend/article/store/variation.js index 7513255bc7e..c31823c0e01 100644 --- a/themes/Backend/ExtJs/backend/article/store/variation.js +++ b/themes/Backend/ExtJs/backend/article/store/variation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/category/drop_zone.js b/themes/Backend/ExtJs/backend/article/view/category/drop_zone.js index 780135fe893..e3ca2e80d5a 100644 --- a/themes/Backend/ExtJs/backend/article/view/category/drop_zone.js +++ b/themes/Backend/ExtJs/backend/article/view/category/drop_zone.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/category/list.js b/themes/Backend/ExtJs/backend/article/view/category/list.js index 4a46440530a..73b767a42ac 100644 --- a/themes/Backend/ExtJs/backend/article/view/category/list.js +++ b/themes/Backend/ExtJs/backend/article/view/category/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/category/seo.js b/themes/Backend/ExtJs/backend/article/view/category/seo.js index d6db649cae2..a49897104d0 100644 --- a/themes/Backend/ExtJs/backend/article/view/category/seo.js +++ b/themes/Backend/ExtJs/backend/article/view/category/seo.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/category/tree.js b/themes/Backend/ExtJs/backend/article/view/category/tree.js index 6c812eafe03..f445c907459 100644 --- a/themes/Backend/ExtJs/backend/article/view/category/tree.js +++ b/themes/Backend/ExtJs/backend/article/view/category/tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/crossselling/base.js b/themes/Backend/ExtJs/backend/article/view/crossselling/base.js index 6819183a428..e80f84cc3e5 100644 --- a/themes/Backend/ExtJs/backend/article/view/crossselling/base.js +++ b/themes/Backend/ExtJs/backend/article/view/crossselling/base.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/crossselling/product_streams.js b/themes/Backend/ExtJs/backend/article/view/crossselling/product_streams.js index 3c7355cf60c..180486ac78c 100644 --- a/themes/Backend/ExtJs/backend/article/view/crossselling/product_streams.js +++ b/themes/Backend/ExtJs/backend/article/view/crossselling/product_streams.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/crossselling/tab.js b/themes/Backend/ExtJs/backend/article/view/crossselling/tab.js index 55c7161fb9a..f339dfbccfb 100644 --- a/themes/Backend/ExtJs/backend/article/view/crossselling/tab.js +++ b/themes/Backend/ExtJs/backend/article/view/crossselling/tab.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/detail/base.js b/themes/Backend/ExtJs/backend/article/view/detail/base.js index 732ff8cf146..d023f30f32b 100644 --- a/themes/Backend/ExtJs/backend/article/view/detail/base.js +++ b/themes/Backend/ExtJs/backend/article/view/detail/base.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/detail/prices.js b/themes/Backend/ExtJs/backend/article/view/detail/prices.js index d1b42fe849f..c5367a41eb9 100644 --- a/themes/Backend/ExtJs/backend/article/view/detail/prices.js +++ b/themes/Backend/ExtJs/backend/article/view/detail/prices.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/detail/properties.js b/themes/Backend/ExtJs/backend/article/view/detail/properties.js index 26bc219eb87..25b91343126 100644 --- a/themes/Backend/ExtJs/backend/article/view/detail/properties.js +++ b/themes/Backend/ExtJs/backend/article/view/detail/properties.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/detail/settings.js b/themes/Backend/ExtJs/backend/article/view/detail/settings.js index 57a2f2f971a..17a7b32f524 100644 --- a/themes/Backend/ExtJs/backend/article/view/detail/settings.js +++ b/themes/Backend/ExtJs/backend/article/view/detail/settings.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/detail/toolbar.js b/themes/Backend/ExtJs/backend/article/view/detail/toolbar.js index 2ef7ecf9ac5..a20bbeb1906 100644 --- a/themes/Backend/ExtJs/backend/article/view/detail/toolbar.js +++ b/themes/Backend/ExtJs/backend/article/view/detail/toolbar.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/detail/window.js b/themes/Backend/ExtJs/backend/article/view/detail/window.js index e6110010337..a18273f2054 100644 --- a/themes/Backend/ExtJs/backend/article/view/detail/window.js +++ b/themes/Backend/ExtJs/backend/article/view/detail/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/esd/detail.js b/themes/Backend/ExtJs/backend/article/view/esd/detail.js index 2165c5d2a7c..891c0fdc202 100644 --- a/themes/Backend/ExtJs/backend/article/view/esd/detail.js +++ b/themes/Backend/ExtJs/backend/article/view/esd/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/esd/list.js b/themes/Backend/ExtJs/backend/article/view/esd/list.js index c32647f3bde..26828bb8db1 100644 --- a/themes/Backend/ExtJs/backend/article/view/esd/list.js +++ b/themes/Backend/ExtJs/backend/article/view/esd/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/esd/serials.js b/themes/Backend/ExtJs/backend/article/view/esd/serials.js index af604aeb737..179005d442f 100644 --- a/themes/Backend/ExtJs/backend/article/view/esd/serials.js +++ b/themes/Backend/ExtJs/backend/article/view/esd/serials.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/image/data_view.js b/themes/Backend/ExtJs/backend/article/view/image/data_view.js index fccccc8c25d..a15e78519cb 100644 --- a/themes/Backend/ExtJs/backend/article/view/image/data_view.js +++ b/themes/Backend/ExtJs/backend/article/view/image/data_view.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/image/drop_zone.js b/themes/Backend/ExtJs/backend/article/view/image/drop_zone.js index dfef188fc3f..a7e392a0e8d 100644 --- a/themes/Backend/ExtJs/backend/article/view/image/drop_zone.js +++ b/themes/Backend/ExtJs/backend/article/view/image/drop_zone.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/image/info.js b/themes/Backend/ExtJs/backend/article/view/image/info.js index 6b418ad6a7c..cdddaa0de4b 100644 --- a/themes/Backend/ExtJs/backend/article/view/image/info.js +++ b/themes/Backend/ExtJs/backend/article/view/image/info.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/image/list.js b/themes/Backend/ExtJs/backend/article/view/image/list.js index f08d106ee9f..32a6cb68908 100644 --- a/themes/Backend/ExtJs/backend/article/view/image/list.js +++ b/themes/Backend/ExtJs/backend/article/view/image/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/image/mapping.js b/themes/Backend/ExtJs/backend/article/view/image/mapping.js index 271efa91796..03554c06c79 100644 --- a/themes/Backend/ExtJs/backend/article/view/image/mapping.js +++ b/themes/Backend/ExtJs/backend/article/view/image/mapping.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/image/new_rule.js b/themes/Backend/ExtJs/backend/article/view/image/new_rule.js index eed735a35ec..494ba559414 100644 --- a/themes/Backend/ExtJs/backend/article/view/image/new_rule.js +++ b/themes/Backend/ExtJs/backend/article/view/image/new_rule.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/image/progress.js b/themes/Backend/ExtJs/backend/article/view/image/progress.js index 46f3fb086dd..da3f92ef8b1 100644 --- a/themes/Backend/ExtJs/backend/article/view/image/progress.js +++ b/themes/Backend/ExtJs/backend/article/view/image/progress.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/resources/downloads.js b/themes/Backend/ExtJs/backend/article/view/resources/downloads.js index 8e825e82d5c..af89d5f6cf2 100644 --- a/themes/Backend/ExtJs/backend/article/view/resources/downloads.js +++ b/themes/Backend/ExtJs/backend/article/view/resources/downloads.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/resources/links.js b/themes/Backend/ExtJs/backend/article/view/resources/links.js index 1d1e2a4fca4..5dd688e465a 100644 --- a/themes/Backend/ExtJs/backend/article/view/resources/links.js +++ b/themes/Backend/ExtJs/backend/article/view/resources/links.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/statistics/chart.js b/themes/Backend/ExtJs/backend/article/view/statistics/chart.js index b980fa58f66..524dc3b7aba 100644 --- a/themes/Backend/ExtJs/backend/article/view/statistics/chart.js +++ b/themes/Backend/ExtJs/backend/article/view/statistics/chart.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/statistics/list.js b/themes/Backend/ExtJs/backend/article/view/statistics/list.js index 085ad15aa3a..91c7ec0cd40 100644 --- a/themes/Backend/ExtJs/backend/article/view/statistics/list.js +++ b/themes/Backend/ExtJs/backend/article/view/statistics/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/variant/configurator.js b/themes/Backend/ExtJs/backend/article/view/variant/configurator.js index ffb2ce81b14..6592b94b878 100644 --- a/themes/Backend/ExtJs/backend/article/view/variant/configurator.js +++ b/themes/Backend/ExtJs/backend/article/view/variant/configurator.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/variant/configurator/dependency.js b/themes/Backend/ExtJs/backend/article/view/variant/configurator/dependency.js index 9a96c2c4708..7998a35f807 100644 --- a/themes/Backend/ExtJs/backend/article/view/variant/configurator/dependency.js +++ b/themes/Backend/ExtJs/backend/article/view/variant/configurator/dependency.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/variant/configurator/group_edit.js b/themes/Backend/ExtJs/backend/article/view/variant/configurator/group_edit.js index c9ad28615b9..a03ecf76463 100644 --- a/themes/Backend/ExtJs/backend/article/view/variant/configurator/group_edit.js +++ b/themes/Backend/ExtJs/backend/article/view/variant/configurator/group_edit.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/variant/configurator/mapping.js b/themes/Backend/ExtJs/backend/article/view/variant/configurator/mapping.js index 74372b08617..c89ef28139e 100644 --- a/themes/Backend/ExtJs/backend/article/view/variant/configurator/mapping.js +++ b/themes/Backend/ExtJs/backend/article/view/variant/configurator/mapping.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/variant/configurator/option_edit.js b/themes/Backend/ExtJs/backend/article/view/variant/configurator/option_edit.js index cd0fbcb76ee..f307ea7a772 100644 --- a/themes/Backend/ExtJs/backend/article/view/variant/configurator/option_edit.js +++ b/themes/Backend/ExtJs/backend/article/view/variant/configurator/option_edit.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/variant/configurator/price_variation.js b/themes/Backend/ExtJs/backend/article/view/variant/configurator/price_variation.js index 5be236a424d..ce5ac27bbb5 100644 --- a/themes/Backend/ExtJs/backend/article/view/variant/configurator/price_variation.js +++ b/themes/Backend/ExtJs/backend/article/view/variant/configurator/price_variation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/variant/configurator/price_variation_rule.js b/themes/Backend/ExtJs/backend/article/view/variant/configurator/price_variation_rule.js index 7a387fb7996..fd820473e4c 100644 --- a/themes/Backend/ExtJs/backend/article/view/variant/configurator/price_variation_rule.js +++ b/themes/Backend/ExtJs/backend/article/view/variant/configurator/price_variation_rule.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/variant/configurator/sets.js b/themes/Backend/ExtJs/backend/article/view/variant/configurator/sets.js index 175aa20507d..297cb2d0b40 100644 --- a/themes/Backend/ExtJs/backend/article/view/variant/configurator/sets.js +++ b/themes/Backend/ExtJs/backend/article/view/variant/configurator/sets.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/variant/configurator/template.js b/themes/Backend/ExtJs/backend/article/view/variant/configurator/template.js index 38547747053..92606389aca 100644 --- a/themes/Backend/ExtJs/backend/article/view/variant/configurator/template.js +++ b/themes/Backend/ExtJs/backend/article/view/variant/configurator/template.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/variant/detail.js b/themes/Backend/ExtJs/backend/article/view/variant/detail.js index 9222481f6c2..7bcf330beea 100644 --- a/themes/Backend/ExtJs/backend/article/view/variant/detail.js +++ b/themes/Backend/ExtJs/backend/article/view/variant/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/variant/image_relation_process.js b/themes/Backend/ExtJs/backend/article/view/variant/image_relation_process.js index 4bba35011c7..1b401a72b82 100644 --- a/themes/Backend/ExtJs/backend/article/view/variant/image_relation_process.js +++ b/themes/Backend/ExtJs/backend/article/view/variant/image_relation_process.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/article/view/main"} diff --git a/themes/Backend/ExtJs/backend/article/view/variant/list.js b/themes/Backend/ExtJs/backend/article/view/variant/list.js index ce603e3b457..b44f353f70c 100644 --- a/themes/Backend/ExtJs/backend/article/view/variant/list.js +++ b/themes/Backend/ExtJs/backend/article/view/variant/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article/view/variant/number_progress.js b/themes/Backend/ExtJs/backend/article/view/variant/number_progress.js index 27753843b2b..237be83b78f 100644 --- a/themes/Backend/ExtJs/backend/article/view/variant/number_progress.js +++ b/themes/Backend/ExtJs/backend/article/view/variant/number_progress.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/article/view/main"} diff --git a/themes/Backend/ExtJs/backend/article/view/variant/progress.js b/themes/Backend/ExtJs/backend/article/view/variant/progress.js index b1d0d40adc1..3e0bc602ddc 100644 --- a/themes/Backend/ExtJs/backend/article/view/variant/progress.js +++ b/themes/Backend/ExtJs/backend/article/view/variant/progress.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/article_list/app.js b/themes/Backend/ExtJs/backend/article_list/app.js index cb178df85f2..df5d9fa66d1 100644 --- a/themes/Backend/ExtJs/backend/article_list/app.js +++ b/themes/Backend/ExtJs/backend/article_list/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/article_list/app"} diff --git a/themes/Backend/ExtJs/backend/article_list/controller/article_crud.js b/themes/Backend/ExtJs/backend/article_list/controller/article_crud.js index 4286d997e27..be960618c55 100644 --- a/themes/Backend/ExtJs/backend/article_list/controller/article_crud.js +++ b/themes/Backend/ExtJs/backend/article_list/controller/article_crud.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/controller/backup.js b/themes/Backend/ExtJs/backend/article_list/controller/backup.js index 3a80fe441d1..99bdfa036ba 100644 --- a/themes/Backend/ExtJs/backend/article_list/controller/backup.js +++ b/themes/Backend/ExtJs/backend/article_list/controller/backup.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/controller/batch_process.js b/themes/Backend/ExtJs/backend/article_list/controller/batch_process.js index 40654053b44..3fcee8fad56 100644 --- a/themes/Backend/ExtJs/backend/article_list/controller/batch_process.js +++ b/themes/Backend/ExtJs/backend/article_list/controller/batch_process.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/controller/category_filter.js b/themes/Backend/ExtJs/backend/article_list/controller/category_filter.js index 81c6c7bddca..1366582c52e 100644 --- a/themes/Backend/ExtJs/backend/article_list/controller/category_filter.js +++ b/themes/Backend/ExtJs/backend/article_list/controller/category_filter.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/controller/filter.js b/themes/Backend/ExtJs/backend/article_list/controller/filter.js index 70f7fe04382..0e286a18b67 100644 --- a/themes/Backend/ExtJs/backend/article_list/controller/filter.js +++ b/themes/Backend/ExtJs/backend/article_list/controller/filter.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/controller/list.js b/themes/Backend/ExtJs/backend/article_list/controller/list.js index 01f9197d360..464f7dd5f82 100644 --- a/themes/Backend/ExtJs/backend/article_list/controller/list.js +++ b/themes/Backend/ExtJs/backend/article_list/controller/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/controller/main.js b/themes/Backend/ExtJs/backend/article_list/controller/main.js index ff8ba264ae1..6364ff8fb15 100644 --- a/themes/Backend/ExtJs/backend/article_list/controller/main.js +++ b/themes/Backend/ExtJs/backend/article_list/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/controller/split_view.js b/themes/Backend/ExtJs/backend/article_list/controller/split_view.js index 5cf89a2372c..882f54ebe47 100644 --- a/themes/Backend/ExtJs/backend/article_list/controller/split_view.js +++ b/themes/Backend/ExtJs/backend/article_list/controller/split_view.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/controller/suggest.js b/themes/Backend/ExtJs/backend/article_list/controller/suggest.js index 784aa164793..d2e46c7289b 100644 --- a/themes/Backend/ExtJs/backend/article_list/controller/suggest.js +++ b/themes/Backend/ExtJs/backend/article_list/controller/suggest.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/article_list/main"} diff --git a/themes/Backend/ExtJs/backend/article_list/model/backup.js b/themes/Backend/ExtJs/backend/article_list/model/backup.js index fd50fc4ddd8..fd8475ae60e 100644 --- a/themes/Backend/ExtJs/backend/article_list/model/backup.js +++ b/themes/Backend/ExtJs/backend/article_list/model/backup.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/model/detail.js b/themes/Backend/ExtJs/backend/article_list/model/detail.js index 0a9a220055f..1bb84c0ddbe 100644 --- a/themes/Backend/ExtJs/backend/article_list/model/detail.js +++ b/themes/Backend/ExtJs/backend/article_list/model/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/model/editable_column.js b/themes/Backend/ExtJs/backend/article_list/model/editable_column.js index a8127fceffd..12fcc835914 100644 --- a/themes/Backend/ExtJs/backend/article_list/model/editable_column.js +++ b/themes/Backend/ExtJs/backend/article_list/model/editable_column.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/model/filter.js b/themes/Backend/ExtJs/backend/article_list/model/filter.js index 3db7c7a13f0..b3cfd2f7c4f 100644 --- a/themes/Backend/ExtJs/backend/article_list/model/filter.js +++ b/themes/Backend/ExtJs/backend/article_list/model/filter.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/model/operation.js b/themes/Backend/ExtJs/backend/article_list/model/operation.js index c511958f53a..a98972148e0 100644 --- a/themes/Backend/ExtJs/backend/article_list/model/operation.js +++ b/themes/Backend/ExtJs/backend/article_list/model/operation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/model/operator.js b/themes/Backend/ExtJs/backend/article_list/model/operator.js index 4b6ae228e1c..43f865f3eb1 100644 --- a/themes/Backend/ExtJs/backend/article_list/model/operator.js +++ b/themes/Backend/ExtJs/backend/article_list/model/operator.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/resource/lexer.js b/themes/Backend/ExtJs/backend/article_list/resource/lexer.js index e7beb595af4..b9b18976b43 100644 --- a/themes/Backend/ExtJs/backend/article_list/resource/lexer.js +++ b/themes/Backend/ExtJs/backend/article_list/resource/lexer.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/resource/parser.js b/themes/Backend/ExtJs/backend/article_list/resource/parser.js index b6237d8fe75..e8d6c770305 100644 --- a/themes/Backend/ExtJs/backend/article_list/resource/parser.js +++ b/themes/Backend/ExtJs/backend/article_list/resource/parser.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/resource/tokenizer.js b/themes/Backend/ExtJs/backend/article_list/resource/tokenizer.js index e490f59d8fa..a462352c877 100644 --- a/themes/Backend/ExtJs/backend/article_list/resource/tokenizer.js +++ b/themes/Backend/ExtJs/backend/article_list/resource/tokenizer.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/store/backup.js b/themes/Backend/ExtJs/backend/article_list/store/backup.js index 5990b7cb078..1d8590e518d 100644 --- a/themes/Backend/ExtJs/backend/article_list/store/backup.js +++ b/themes/Backend/ExtJs/backend/article_list/store/backup.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/store/detail.js b/themes/Backend/ExtJs/backend/article_list/store/detail.js index cd83c8f39a2..0c232bfae58 100644 --- a/themes/Backend/ExtJs/backend/article_list/store/detail.js +++ b/themes/Backend/ExtJs/backend/article_list/store/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/store/editable_columns.js b/themes/Backend/ExtJs/backend/article_list/store/editable_columns.js index c2fdd65725d..c2b3c5d2fc2 100644 --- a/themes/Backend/ExtJs/backend/article_list/store/editable_columns.js +++ b/themes/Backend/ExtJs/backend/article_list/store/editable_columns.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/store/filter.js b/themes/Backend/ExtJs/backend/article_list/store/filter.js index d5b489e9d13..39023b86ceb 100644 --- a/themes/Backend/ExtJs/backend/article_list/store/filter.js +++ b/themes/Backend/ExtJs/backend/article_list/store/filter.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/store/operation.js b/themes/Backend/ExtJs/backend/article_list/store/operation.js index 73777b3012e..bd590167a93 100644 --- a/themes/Backend/ExtJs/backend/article_list/store/operation.js +++ b/themes/Backend/ExtJs/backend/article_list/store/operation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/store/operator.js b/themes/Backend/ExtJs/backend/article_list/store/operator.js index 871aa3db169..1d244f32008 100644 --- a/themes/Backend/ExtJs/backend/article_list/store/operator.js +++ b/themes/Backend/ExtJs/backend/article_list/store/operator.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** * Shopware Store - Operator store diff --git a/themes/Backend/ExtJs/backend/article_list/view/add_filter/grid.js b/themes/Backend/ExtJs/backend/article_list/view/add_filter/grid.js index cdd8b339082..a30c6dbb3d2 100644 --- a/themes/Backend/ExtJs/backend/article_list/view/add_filter/grid.js +++ b/themes/Backend/ExtJs/backend/article_list/view/add_filter/grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/article_list/main"} diff --git a/themes/Backend/ExtJs/backend/article_list/view/add_filter/window.js b/themes/Backend/ExtJs/backend/article_list/view/add_filter/window.js index 54ef7647edf..323c838cd03 100644 --- a/themes/Backend/ExtJs/backend/article_list/view/add_filter/window.js +++ b/themes/Backend/ExtJs/backend/article_list/view/add_filter/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/article_list/main"} diff --git a/themes/Backend/ExtJs/backend/article_list/view/backup/grid.js b/themes/Backend/ExtJs/backend/article_list/view/backup/grid.js index e553268d5c5..2ba246c0207 100644 --- a/themes/Backend/ExtJs/backend/article_list/view/backup/grid.js +++ b/themes/Backend/ExtJs/backend/article_list/view/backup/grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/article_list/main"} diff --git a/themes/Backend/ExtJs/backend/article_list/view/backup/window.js b/themes/Backend/ExtJs/backend/article_list/view/backup/window.js index 662a7918402..494cd48d210 100644 --- a/themes/Backend/ExtJs/backend/article_list/view/backup/window.js +++ b/themes/Backend/ExtJs/backend/article_list/view/backup/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/article_list/main"} diff --git a/themes/Backend/ExtJs/backend/article_list/view/batch_process/grid.js b/themes/Backend/ExtJs/backend/article_list/view/batch_process/grid.js index c8b2fca4676..78d6f78db8f 100644 --- a/themes/Backend/ExtJs/backend/article_list/view/batch_process/grid.js +++ b/themes/Backend/ExtJs/backend/article_list/view/batch_process/grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/article_list/main"} diff --git a/themes/Backend/ExtJs/backend/article_list/view/batch_process/window.js b/themes/Backend/ExtJs/backend/article_list/view/batch_process/window.js index 383c42c5b65..9dbe0aa743d 100644 --- a/themes/Backend/ExtJs/backend/article_list/view/batch_process/window.js +++ b/themes/Backend/ExtJs/backend/article_list/view/batch_process/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/article_list/main"} diff --git a/themes/Backend/ExtJs/backend/article_list/view/filter_combo.js b/themes/Backend/ExtJs/backend/article_list/view/filter_combo.js index f54290b08af..985e148567e 100644 --- a/themes/Backend/ExtJs/backend/article_list/view/filter_combo.js +++ b/themes/Backend/ExtJs/backend/article_list/view/filter_combo.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/article_list/main"} diff --git a/themes/Backend/ExtJs/backend/article_list/view/main/category_tree.js b/themes/Backend/ExtJs/backend/article_list/view/main/category_tree.js index 0bc697557fc..7bdef6c95b4 100644 --- a/themes/Backend/ExtJs/backend/article_list/view/main/category_tree.js +++ b/themes/Backend/ExtJs/backend/article_list/view/main/category_tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/article_list/main"} diff --git a/themes/Backend/ExtJs/backend/article_list/view/main/grid.js b/themes/Backend/ExtJs/backend/article_list/view/main/grid.js index 87fd94bf742..ba6c8ebf247 100644 --- a/themes/Backend/ExtJs/backend/article_list/view/main/grid.js +++ b/themes/Backend/ExtJs/backend/article_list/view/main/grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/article_list/main"} diff --git a/themes/Backend/ExtJs/backend/article_list/view/main/multi_edit_menu.js b/themes/Backend/ExtJs/backend/article_list/view/main/multi_edit_menu.js index e4ff130219c..a1baa138886 100644 --- a/themes/Backend/ExtJs/backend/article_list/view/main/multi_edit_menu.js +++ b/themes/Backend/ExtJs/backend/article_list/view/main/multi_edit_menu.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/article_list/main"} diff --git a/themes/Backend/ExtJs/backend/article_list/view/main/navigation_grid.js b/themes/Backend/ExtJs/backend/article_list/view/main/navigation_grid.js index cc222c05b98..4393982e4ac 100644 --- a/themes/Backend/ExtJs/backend/article_list/view/main/navigation_grid.js +++ b/themes/Backend/ExtJs/backend/article_list/view/main/navigation_grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/article_list/view/main/sidebar.js b/themes/Backend/ExtJs/backend/article_list/view/main/sidebar.js index 97f7a4bdeab..73ce64dcfda 100644 --- a/themes/Backend/ExtJs/backend/article_list/view/main/sidebar.js +++ b/themes/Backend/ExtJs/backend/article_list/view/main/sidebar.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/article_list/main"} diff --git a/themes/Backend/ExtJs/backend/article_list/view/main/window.js b/themes/Backend/ExtJs/backend/article_list/view/main/window.js index f6561dab07e..d7428a072fc 100644 --- a/themes/Backend/ExtJs/backend/article_list/view/main/window.js +++ b/themes/Backend/ExtJs/backend/article_list/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/article_list/main"} diff --git a/themes/Backend/ExtJs/backend/article_list/view/query_field.js b/themes/Backend/ExtJs/backend/article_list/view/query_field.js index ee41c3ed4c3..d55b747a506 100644 --- a/themes/Backend/ExtJs/backend/article_list/view/query_field.js +++ b/themes/Backend/ExtJs/backend/article_list/view/query_field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/article_list/main"} diff --git a/themes/Backend/ExtJs/backend/attributes/app.js b/themes/Backend/ExtJs/backend/attributes/app.js index 6a628e39f7a..70e2eb419c2 100644 --- a/themes/Backend/ExtJs/backend/attributes/app.js +++ b/themes/Backend/ExtJs/backend/attributes/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/attributes/controller/main.js b/themes/Backend/ExtJs/backend/attributes/controller/main.js index 6b11cfe4550..9e7bcbedf21 100644 --- a/themes/Backend/ExtJs/backend/attributes/controller/main.js +++ b/themes/Backend/ExtJs/backend/attributes/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/attributes/model/table.js b/themes/Backend/ExtJs/backend/attributes/model/table.js index 008674d8f6c..fa2edfa46e0 100644 --- a/themes/Backend/ExtJs/backend/attributes/model/table.js +++ b/themes/Backend/ExtJs/backend/attributes/model/table.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/attributes/model/types.js b/themes/Backend/ExtJs/backend/attributes/model/types.js index ae2151259ef..c10debb7e8d 100644 --- a/themes/Backend/ExtJs/backend/attributes/model/types.js +++ b/themes/Backend/ExtJs/backend/attributes/model/types.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/attributes/store/column.js b/themes/Backend/ExtJs/backend/attributes/store/column.js index 0884abe31a0..38a7fd89a61 100644 --- a/themes/Backend/ExtJs/backend/attributes/store/column.js +++ b/themes/Backend/ExtJs/backend/attributes/store/column.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/attributes/store/depending_table.js b/themes/Backend/ExtJs/backend/attributes/store/depending_table.js index 027e93f2725..a0f64db4044 100644 --- a/themes/Backend/ExtJs/backend/attributes/store/depending_table.js +++ b/themes/Backend/ExtJs/backend/attributes/store/depending_table.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/attributes/store/entities.js b/themes/Backend/ExtJs/backend/attributes/store/entities.js index 72f0813701c..3c13a3328ab 100644 --- a/themes/Backend/ExtJs/backend/attributes/store/entities.js +++ b/themes/Backend/ExtJs/backend/attributes/store/entities.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/attributes/store/table.js b/themes/Backend/ExtJs/backend/attributes/store/table.js index b4b00638476..b9bcd833746 100644 --- a/themes/Backend/ExtJs/backend/attributes/store/table.js +++ b/themes/Backend/ExtJs/backend/attributes/store/table.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/attributes/store/types.js b/themes/Backend/ExtJs/backend/attributes/store/types.js index 02e7577fc9a..3684e383f9d 100644 --- a/themes/Backend/ExtJs/backend/attributes/store/types.js +++ b/themes/Backend/ExtJs/backend/attributes/store/types.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/attributes/view/array_store_field.js b/themes/Backend/ExtJs/backend/attributes/view/array_store_field.js index 113c644a256..375f741040f 100644 --- a/themes/Backend/ExtJs/backend/attributes/view/array_store_field.js +++ b/themes/Backend/ExtJs/backend/attributes/view/array_store_field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/attributes/view/detail.js b/themes/Backend/ExtJs/backend/attributes/view/detail.js index 42ef4f28b3f..7e8f87e977f 100644 --- a/themes/Backend/ExtJs/backend/attributes/view/detail.js +++ b/themes/Backend/ExtJs/backend/attributes/view/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/attributes/view/listing.js b/themes/Backend/ExtJs/backend/attributes/view/listing.js index 7e4c4cc1c6a..7d9b6a4d9ac 100644 --- a/themes/Backend/ExtJs/backend/attributes/view/listing.js +++ b/themes/Backend/ExtJs/backend/attributes/view/listing.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/attributes/view/window.js b/themes/Backend/ExtJs/backend/attributes/view/window.js index 4523816f430..5bd80ea5283 100644 --- a/themes/Backend/ExtJs/backend/attributes/view/window.js +++ b/themes/Backend/ExtJs/backend/attributes/view/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/banner/app.js b/themes/Backend/ExtJs/backend/banner/app.js index 8b980c37b42..e4a18d08911 100644 --- a/themes/Backend/ExtJs/backend/banner/app.js +++ b/themes/Backend/ExtJs/backend/banner/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Banner diff --git a/themes/Backend/ExtJs/backend/banner/controller/main.js b/themes/Backend/ExtJs/backend/banner/controller/main.js index eca151a85ce..0b2a2f2079c 100644 --- a/themes/Backend/ExtJs/backend/banner/controller/main.js +++ b/themes/Backend/ExtJs/backend/banner/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Banner diff --git a/themes/Backend/ExtJs/backend/banner/model/banner_detail.js b/themes/Backend/ExtJs/backend/banner/model/banner_detail.js index cba9a1d6458..b58fa87066f 100644 --- a/themes/Backend/ExtJs/backend/banner/model/banner_detail.js +++ b/themes/Backend/ExtJs/backend/banner/model/banner_detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Banner diff --git a/themes/Backend/ExtJs/backend/banner/store/banner.js b/themes/Backend/ExtJs/backend/banner/store/banner.js index 65ef861861c..81f9c07e009 100644 --- a/themes/Backend/ExtJs/backend/banner/store/banner.js +++ b/themes/Backend/ExtJs/backend/banner/store/banner.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Banner diff --git a/themes/Backend/ExtJs/backend/banner/store/category.js b/themes/Backend/ExtJs/backend/banner/store/category.js index 9203ef651cc..fc9f2e0b035 100644 --- a/themes/Backend/ExtJs/backend/banner/store/category.js +++ b/themes/Backend/ExtJs/backend/banner/store/category.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Banner diff --git a/themes/Backend/ExtJs/backend/banner/view/main.js b/themes/Backend/ExtJs/backend/banner/view/main.js index 0ec5fcfec21..dc0159391f0 100644 --- a/themes/Backend/ExtJs/backend/banner/view/main.js +++ b/themes/Backend/ExtJs/backend/banner/view/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Banner diff --git a/themes/Backend/ExtJs/backend/banner/view/main/banner_form.js b/themes/Backend/ExtJs/backend/banner/view/main/banner_form.js index f5499d9cf56..2f30a7ef5ec 100644 --- a/themes/Backend/ExtJs/backend/banner/view/main/banner_form.js +++ b/themes/Backend/ExtJs/backend/banner/view/main/banner_form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Banner diff --git a/themes/Backend/ExtJs/backend/banner/view/main/banner_form_add.js b/themes/Backend/ExtJs/backend/banner/view/main/banner_form_add.js index 6e267bdecdd..0c98420e1f0 100644 --- a/themes/Backend/ExtJs/backend/banner/view/main/banner_form_add.js +++ b/themes/Backend/ExtJs/backend/banner/view/main/banner_form_add.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Banner diff --git a/themes/Backend/ExtJs/backend/banner/view/main/panel.js b/themes/Backend/ExtJs/backend/banner/view/main/panel.js index 76f0c3f6412..7cd63ef4a44 100644 --- a/themes/Backend/ExtJs/backend/banner/view/main/panel.js +++ b/themes/Backend/ExtJs/backend/banner/view/main/panel.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Banner diff --git a/themes/Backend/ExtJs/backend/base/application/Shopware.store.Search.js b/themes/Backend/ExtJs/backend/base/application/Shopware.store.Search.js index 58c43b90a16..60455dc4d07 100644 --- a/themes/Backend/ExtJs/backend/base/application/Shopware.store.Search.js +++ b/themes/Backend/ExtJs/backend/base/application/Shopware.store.Search.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Button.js b/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Button.js index f69d5618874..6834962fbd7 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Button.js +++ b/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Button.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.FieldHandlerInterface.js b/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.FieldHandlerInterface.js index 8e7edd9be76..63313d9cba5 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.FieldHandlerInterface.js +++ b/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.FieldHandlerInterface.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Form.js b/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Form.js index 81433273568..78b37641ad2 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Form.js +++ b/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Window.js b/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Window.js index 4dd7e1bdb82..d4ab195944c 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Window.js +++ b/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/Shopware.grid.plugin.Attribute.js b/themes/Backend/ExtJs/backend/base/attribute/Shopware.grid.plugin.Attribute.js index 0d880745056..fd37a0d87e7 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/Shopware.grid.plugin.Attribute.js +++ b/themes/Backend/ExtJs/backend/base/attribute/Shopware.grid.plugin.Attribute.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.AttributeSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.AttributeSingleSelection.js index f757b3cab3e..f8ab311bbc2 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.AttributeSingleSelection.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.AttributeSingleSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.BlogGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.BlogGrid.js index ccffab01382..6f4198dbfeb 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.BlogGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.BlogGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.BlogSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.BlogSingleSelection.js index ec8d70c9cff..d804fd9b1e6 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.BlogSingleSelection.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.BlogSingleSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CategoryGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CategoryGrid.js index dacbc594a7b..cf0c489d66a 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CategoryGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CategoryGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CategorySingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CategorySingleSelection.js index 974819a5b25..7e625245ef5 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CategorySingleSelection.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CategorySingleSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ContentTypeSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ContentTypeSelection.js index 3508e06764d..19ad87ad958 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ContentTypeSelection.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ContentTypeSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/attributes/fields"} diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CountryGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CountryGrid.js index 36e44f1bc35..32d90a88992 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CountryGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CountryGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CountrySingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CountrySingleSelection.js index 8ab3573a174..7b189be0a0f 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CountrySingleSelection.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CountrySingleSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomFacetGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomFacetGrid.js index 230cad523ab..e27d68c24ec 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomFacetGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomFacetGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomSortingGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomSortingGrid.js index 8c8d55c08e7..477fc9c349d 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomSortingGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomSortingGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerGrid.js index 59a5ba9c9e8..661a7132cf2 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerSingleSelection.js index 1966a3386ab..70b03bafec5 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerSingleSelection.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerSingleSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerStreamGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerStreamGrid.js index a56df8e85d2..82cb5db478e 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerStreamGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerStreamGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerStreamSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerStreamSingleSelection.js index 5f1d7040a70..86cb52d54c7 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerStreamSingleSelection.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerStreamSingleSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.DispatchGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.DispatchGrid.js index 5287ff8764d..ce9184f487e 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.DispatchGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.DispatchGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.EmotionGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.EmotionGrid.js index 5882ac5d3e8..1f6fa399dfd 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.EmotionGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.EmotionGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.EmotionSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.EmotionSingleSelection.js index 897f78ac462..5326e0daf84 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.EmotionSingleSelection.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.EmotionSingleSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.FormGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.FormGrid.js index 749dbf754ce..395eff6ce81 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.FormGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.FormGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.FormSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.FormSingleSelection.js index 4a652635c0a..0115d8b128b 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.FormSingleSelection.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.FormSingleSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.Grid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.Grid.js index 739758a4803..262c1303943 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.Grid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.Grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.GridView.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.GridView.js index 0c42f71f133..ef3f658ee8a 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.GridView.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.GridView.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MailGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MailGrid.js index e87ab1dc8bc..669f254bd81 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MailGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MailGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MailSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MailSingleSelection.js index 18271c415d2..d487920a0f7 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MailSingleSelection.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MailSingleSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MediaGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MediaGrid.js index 8c09841d549..bd5f7b19bb4 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MediaGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MediaGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.NewsletterGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.NewsletterGrid.js index a6c12d45cef..71d31d82900 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.NewsletterGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.NewsletterGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.NewsletterSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.NewsletterSingleSelection.js index 8926f1c2ec2..60e1bfc57b8 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.NewsletterSingleSelection.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.NewsletterSingleSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.OrderDetailGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.OrderDetailGrid.js index 9169413da89..f928b0e47a7 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.OrderDetailGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.OrderDetailGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.OrderDetailSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.OrderDetailSingleSelection.js index 062021ae158..5d7a6550911 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.OrderDetailSingleSelection.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.OrderDetailSingleSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PartnerGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PartnerGrid.js index e7779d3dd8a..fd6435d6be0 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PartnerGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PartnerGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PartnerSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PartnerSingleSelection.js index e5731196904..b8d8d6f86f7 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PartnerSingleSelection.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PartnerSingleSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PaymentGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PaymentGrid.js index 67501100902..8aad3d0b591 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PaymentGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PaymentGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PaymentSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PaymentSingleSelection.js index 743b173c27b..d38b2108ab0 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PaymentSingleSelection.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PaymentSingleSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PremiumGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PremiumGrid.js index 4cfe1dc2305..aeda0d7eeaa 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PremiumGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PremiumGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PremiumSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PremiumSingleSelection.js index 29f0c1e3fe5..80cdb13514e 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PremiumSingleSelection.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PremiumSingleSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductFeedGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductFeedGrid.js index ce32f40fa7f..a295f90a2e7 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductFeedGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductFeedGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductFeedSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductFeedSingleSelection.js index dcc2617bccf..5b76b8b0dd6 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductFeedSingleSelection.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductFeedSingleSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductGrid.js index cb508e9ccfb..dd74387f909 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductSingleSelection.js index 0928d8f97be..7d1482c2c50 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductSingleSelection.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductSingleSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductStreamGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductStreamGrid.js index 203974d33c9..423726f8150 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductStreamGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductStreamGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductStreamSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductStreamSingleSelection.js index b3db32e6951..454efdad165 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductStreamSingleSelection.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductStreamSingleSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PropertyOptionGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PropertyOptionGrid.js index bd7bbded808..2f2cd0404fe 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PropertyOptionGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PropertyOptionGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PropertyOptionSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PropertyOptionSingleSelection.js index 3c163471c98..0143b467850 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PropertyOptionSingleSelection.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PropertyOptionSingleSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ShopGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ShopGrid.js index 776f035d97c..6e1ee119355 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ShopGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ShopGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.SingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.SingleSelection.js index ceb395954ba..da329fb5c41 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.SingleSelection.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.SingleSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.VoucherGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.VoucherGrid.js index aea27eec291..a4b14ca8460 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.VoucherGrid.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.VoucherGrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.VoucherSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.VoucherSingleSelection.js index d355c32b84e..3fd88581ef6 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.VoucherSingleSelection.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.VoucherSingleSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.AbstractEntityFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.AbstractEntityFieldHandler.js index a0783e23f97..df4cd47f0b5 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.AbstractEntityFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.AbstractEntityFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.BlogFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.BlogFieldHandler.js index 58e3affe0b2..739c2172e82 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.BlogFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.BlogFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.BooleanFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.BooleanFieldHandler.js index edbd21f1972..809bd0a55f4 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.BooleanFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.BooleanFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CategoryFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CategoryFieldHandler.js index a20ada70d96..4950ab2feae 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CategoryFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CategoryFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ComboBoxFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ComboBoxFieldHandler.js index c1b4cd5d2fc..331d60ce7e6 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ComboBoxFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ComboBoxFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CountryFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CountryFieldHandler.js index a7dddcbd1ee..710e755137f 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CountryFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CountryFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CustomerFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CustomerFieldHandler.js index 716d8041b65..74eaeeae682 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CustomerFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CustomerFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CustomerStreamFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CustomerStreamFieldHandler.js index d6d02ad44a5..8d4c105bcb3 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CustomerStreamFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CustomerStreamFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DateFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DateFieldHandler.js index 5a690f8377f..137b14f1c5f 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DateFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DateFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DateTimeFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DateTimeFieldHandler.js index b12f130d8ef..45f7bfa9c37 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DateTimeFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DateTimeFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DispatchFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DispatchFieldHandler.js index 2b4764ad76a..936cf69fff6 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DispatchFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DispatchFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.EmotionFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.EmotionFieldHandler.js index f5ec782ecd2..759339ff2ec 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.EmotionFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.EmotionFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.FloatFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.FloatFieldHandler.js index b20fa6cca2e..f047c16ad07 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.FloatFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.FloatFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.FormFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.FormFieldHandler.js index b89942891eb..2f0edff4eb5 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.FormFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.FormFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.HtmlFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.HtmlFieldHandler.js index fb1ed077186..cf4db87fd9a 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.HtmlFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.HtmlFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.IntegerFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.IntegerFieldHandler.js index cc8c2ad6b33..d7ba299c451 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.IntegerFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.IntegerFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MailFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MailFieldHandler.js index 99986c95457..6e47f30b0e9 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MailFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MailFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MediaFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MediaFieldHandler.js index e466c3e3fc0..44c9034897e 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MediaFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MediaFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MultiSelectionFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MultiSelectionFieldHandler.js index b75bcc95ff9..3490ee29b93 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MultiSelectionFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MultiSelectionFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.NewsletterFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.NewsletterFieldHandler.js index 610bfd5758e..43369396328 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.NewsletterFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.NewsletterFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.NoUrlFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.NoUrlFieldHandler.js index 328a70b2603..839f4d3058a 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.NoUrlFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.NoUrlFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.OrderDetailFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.OrderDetailFieldHandler.js index 14eb3e04af3..53896b3cfd5 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.OrderDetailFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.OrderDetailFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PartnerFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PartnerFieldHandler.js index 670c8539377..8c1ff460ac2 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PartnerFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PartnerFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PaymentFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PaymentFieldHandler.js index 81b8fac385b..c7cfdbac065 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PaymentFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PaymentFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PremiumFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PremiumFieldHandler.js index d8a1d14213f..c9f23b3f70d 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PremiumFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PremiumFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductFeedFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductFeedFieldHandler.js index a1a9fb50abf..313e727490b 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductFeedFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductFeedFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductFieldHandler.js index 9a69f3acbaf..a23d84ed9e3 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductStreamFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductStreamFieldHandler.js index a2995650ae3..62647086b8f 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductStreamFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductStreamFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PropertyOptionFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PropertyOptionFieldHandler.js index d24e66a79e7..13a946a9e86 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PropertyOptionFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PropertyOptionFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ShopFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ShopFieldHandler.js index 6aae5b7998b..a8a83c6d372 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ShopFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ShopFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.SingleSelectionFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.SingleSelectionFieldHandler.js index 4060b4ac2ac..06474570d46 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.SingleSelectionFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.SingleSelectionFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.StringFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.StringFieldHandler.js index 2e89ac805e5..cde20a380a9 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.StringFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.StringFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.TextAreaFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.TextAreaFieldHandler.js index a255c69c01e..fa87fc7dd98 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.TextAreaFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.TextAreaFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.VoucherFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.VoucherFieldHandler.js index 9d576207b5c..bf853dde959 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.VoucherFieldHandler.js +++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.VoucherFieldHandler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/mixins/Shopware.attribute.SelectionFactory.js b/themes/Backend/ExtJs/backend/base/attribute/mixins/Shopware.attribute.SelectionFactory.js index 29704ba8f0b..a20a3ed8354 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/mixins/Shopware.attribute.SelectionFactory.js +++ b/themes/Backend/ExtJs/backend/base/attribute/mixins/Shopware.attribute.SelectionFactory.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/model/dynamic.js b/themes/Backend/ExtJs/backend/base/attribute/model/dynamic.js index 453a4eecaa7..009a00efb9b 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/model/dynamic.js +++ b/themes/Backend/ExtJs/backend/base/attribute/model/dynamic.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/attribute/model/dynamic_reader.js b/themes/Backend/ExtJs/backend/base/attribute/model/dynamic_reader.js index 79363b7ceb3..b604807cb1b 100644 --- a/themes/Backend/ExtJs/backend/base/attribute/model/dynamic_reader.js +++ b/themes/Backend/ExtJs/backend/base/attribute/model/dynamic_reader.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/bootstrap.js b/themes/Backend/ExtJs/backend/base/bootstrap.js index 29f816b88c8..2464f959061 100644 --- a/themes/Backend/ExtJs/backend/base/bootstrap.js +++ b/themes/Backend/ExtJs/backend/base/bootstrap.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ {* Include default components *} diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.DataView.GooglePreview.js b/themes/Backend/ExtJs/backend/base/component/Shopware.DataView.GooglePreview.js index 8f420ff5a05..c375132fa40 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.DataView.GooglePreview.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.DataView.GooglePreview.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.DragAndDropSelector.js b/themes/Backend/ExtJs/backend/base/component/Shopware.DragAndDropSelector.js index ab8c8e99ade..63c46409814 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.DragAndDropSelector.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.DragAndDropSelector.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.MediaManager.MediaSelection.js b/themes/Backend/ExtJs/backend/base/component/Shopware.MediaManager.MediaSelection.js index 7c136314c3f..131fe3dfe7b 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.MediaManager.MediaSelection.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.MediaManager.MediaSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.MediaManager.MediaTextSelection.js b/themes/Backend/ExtJs/backend/base/component/Shopware.MediaManager.MediaTextSelection.js index 4ea15d4c78c..eb2c340fb59 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.MediaManager.MediaTextSelection.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.MediaManager.MediaTextSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.ModuleManager.js b/themes/Backend/ExtJs/backend/base/component/Shopware.ModuleManager.js index bfe675aba39..75aabe40912 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.ModuleManager.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.ModuleManager.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ Ext.define('Shopware.ModuleManager', { diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.Notification.js b/themes/Backend/ExtJs/backend/base/component/Shopware.Notification.js index a188d8e5d47..54244615c9d 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.Notification.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.Notification.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.VTypes.js b/themes/Backend/ExtJs/backend/base/component/Shopware.VTypes.js index 763d834f4cb..047e26334c8 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.VTypes.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.VTypes.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.button.HoverButton.js b/themes/Backend/ExtJs/backend/base/component/Shopware.button.HoverButton.js index 39893e8d8b2..30f2f256417 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.button.HoverButton.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.button.HoverButton.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.component.IconPreloader.js b/themes/Backend/ExtJs/backend/base/component/Shopware.component.IconPreloader.js index 3155926e988..73dfe68b0dc 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.component.IconPreloader.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.component.IconPreloader.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ Ext.define('Shopware.component.IconPreloader', { diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.component.Preloader.js b/themes/Backend/ExtJs/backend/base/component/Shopware.component.Preloader.js index e4fbf01167e..75d867bc939 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.component.Preloader.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.component.Preloader.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/base/component/preloader"} Ext.define('Shopware.component.Preloader', { diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.component.ValidatePassword.js b/themes/Backend/ExtJs/backend/base/component/Shopware.component.ValidatePassword.js index ad9783478f7..e6b3bd02925 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.component.ValidatePassword.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.component.ValidatePassword.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ Ext.define('Shopware.component.ValidatePassword', { diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.container.Viewport.js b/themes/Backend/ExtJs/backend/base/component/Shopware.container.Viewport.js index e1e72c259c7..4753c84dc35 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.container.Viewport.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.container.Viewport.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.data.reader.Application.js b/themes/Backend/ExtJs/backend/base/component/Shopware.data.reader.Application.js index c0bd6726823..7ce6e8cf7c9 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.data.reader.Application.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.data.reader.Application.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.form.PasswordStrengthMeter.js b/themes/Backend/ExtJs/backend/base/component/Shopware.form.PasswordStrengthMeter.js index 02d8e9ba531..1c196e13d35 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.form.PasswordStrengthMeter.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.form.PasswordStrengthMeter.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.form.PluginPanel.js b/themes/Backend/ExtJs/backend/base/component/Shopware.form.PluginPanel.js index d1daffe0fc3..f64a3e6a1a1 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.form.PluginPanel.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.form.PluginPanel.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.AceEditor.js b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.AceEditor.js index 27cfe9a41fb..53fb74da2f7 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.AceEditor.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.AceEditor.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ArticleSearch.js b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ArticleSearch.js index 53c44c6596d..02d7679fb95 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ArticleSearch.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ArticleSearch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ColorField.js b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ColorField.js index b92345759e0..0af33d903a5 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ColorField.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ColorField.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/base/color_components"} diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ComboTree.js b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ComboTree.js index d51ae4e7a19..d6fcafc7273 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ComboTree.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ComboTree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.PagingComboBox.js b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.PagingComboBox.js index 7e23f1c2667..2bda97bfeb9 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.PagingComboBox.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.PagingComboBox.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ProductStreamSelection.js b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ProductStreamSelection.js index d14cec00460..bebc99b766d 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ProductStreamSelection.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ProductStreamSelection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.TinyMCE.js b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.TinyMCE.js index 0f900ed43f1..2be140ea848 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.TinyMCE.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.TinyMCE.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.form.plugin.SnippetTranslation.js b/themes/Backend/ExtJs/backend/base/component/Shopware.form.plugin.SnippetTranslation.js index b1aaf1795a5..e8196b69047 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.form.plugin.SnippetTranslation.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.form.plugin.SnippetTranslation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.form.plugin.Translation.js b/themes/Backend/ExtJs/backend/base/component/Shopware.form.plugin.Translation.js index 5d808baedc2..2a91244d8ca 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.form.plugin.Translation.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.form.plugin.Translation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.global.ErrorReporter.js b/themes/Backend/ExtJs/backend/base/component/Shopware.global.ErrorReporter.js index 9752acb4a46..88524182b6c 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.global.ErrorReporter.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.global.ErrorReporter.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware.global.ErrorReporter diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.grid.HeaderToolTip.js b/themes/Backend/ExtJs/backend/base/component/Shopware.grid.HeaderToolTip.js index 0631a340aa9..89599145696 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.grid.HeaderToolTip.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.grid.HeaderToolTip.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.grid.Searchable.js b/themes/Backend/ExtJs/backend/base/component/Shopware.grid.Searchable.js index ee618ec0bfc..930cce75baa 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.grid.Searchable.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.grid.Searchable.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/base/component/searchable_grid"} @@ -522,7 +521,7 @@ Ext.define('Shopware.grid.Searchable', { params = {}; callback = callback || function () {}; - + if (identifiers === null) { return; } diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.grid.plugin.Translation.js b/themes/Backend/ExtJs/backend/base/component/Shopware.grid.plugin.Translation.js index 67acfd29a6e..b8247cbe33a 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.grid.plugin.Translation.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.grid.plugin.Translation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.notification.SubscriptionWarning.js b/themes/Backend/ExtJs/backend/base/component/Shopware.notification.SubscriptionWarning.js index f6f171b78f1..8f7fca541d4 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.notification.SubscriptionWarning.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.notification.SubscriptionWarning.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {namespace name="backend/index/view/menu"} diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.window.ExpiredPluginStop.js b/themes/Backend/ExtJs/backend/base/component/Shopware.window.ExpiredPluginStop.js index daaa41d8732..34427337c96 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.window.ExpiredPluginStop.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.window.ExpiredPluginStop.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @version $Id$ diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.window.ExpiredPluginWarning.js b/themes/Backend/ExtJs/backend/base/component/Shopware.window.ExpiredPluginWarning.js index 58a83177895..34d0153315f 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.window.ExpiredPluginWarning.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.window.ExpiredPluginWarning.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @version $Id$ diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.window.SimpleModule.js b/themes/Backend/ExtJs/backend/base/component/Shopware.window.SimpleModule.js index b9bf320c389..ad6a820be15 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.window.SimpleModule.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.window.SimpleModule.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ Ext.define('Shopware.window.SimpleModule', { extend: 'Enlight.app.Window', diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.window.plugin.Hub.js b/themes/Backend/ExtJs/backend/base/component/Shopware.window.plugin.Hub.js index 93887f5f1ce..4d26eeda20b 100644 --- a/themes/Backend/ExtJs/backend/base/component/Shopware.window.plugin.Hub.js +++ b/themes/Backend/ExtJs/backend/base/component/Shopware.window.plugin.Hub.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Window diff --git a/themes/Backend/ExtJs/backend/base/component/element/boolean.js b/themes/Backend/ExtJs/backend/base/component/element/boolean.js index e1b0a7aa7f3..d45d12d24a5 100644 --- a/themes/Backend/ExtJs/backend/base/component/element/boolean.js +++ b/themes/Backend/ExtJs/backend/base/component/element/boolean.js @@ -1,24 +1,23 @@ -/* +/** * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/element/boolean_select.js b/themes/Backend/ExtJs/backend/base/component/element/boolean_select.js index 1056ad008f3..44a83bfd703 100644 --- a/themes/Backend/ExtJs/backend/base/component/element/boolean_select.js +++ b/themes/Backend/ExtJs/backend/base/component/element/boolean_select.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/base/component/element/button.js b/themes/Backend/ExtJs/backend/base/component/element/button.js index 4a9bccd7483..34375ab16ec 100644 --- a/themes/Backend/ExtJs/backend/base/component/element/button.js +++ b/themes/Backend/ExtJs/backend/base/component/element/button.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/element/color.js b/themes/Backend/ExtJs/backend/base/component/element/color.js index dff633c7420..c8e9f57f55f 100644 --- a/themes/Backend/ExtJs/backend/base/component/element/color.js +++ b/themes/Backend/ExtJs/backend/base/component/element/color.js @@ -1,24 +1,23 @@ -/* +/** * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/element/date.js b/themes/Backend/ExtJs/backend/base/component/element/date.js index 43edc752f4d..4950d1ba6cf 100644 --- a/themes/Backend/ExtJs/backend/base/component/element/date.js +++ b/themes/Backend/ExtJs/backend/base/component/element/date.js @@ -1,24 +1,23 @@ -/* +/** * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/element/date_time.js b/themes/Backend/ExtJs/backend/base/component/element/date_time.js index 7d48dd3e4d6..8994e2ae4e6 100644 --- a/themes/Backend/ExtJs/backend/base/component/element/date_time.js +++ b/themes/Backend/ExtJs/backend/base/component/element/date_time.js @@ -1,24 +1,23 @@ -/* +/** * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/element/fieldset.js b/themes/Backend/ExtJs/backend/base/component/element/fieldset.js index 3c566d4244d..bc9d5cd38b9 100644 --- a/themes/Backend/ExtJs/backend/base/component/element/fieldset.js +++ b/themes/Backend/ExtJs/backend/base/component/element/fieldset.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/element/html.js b/themes/Backend/ExtJs/backend/base/component/element/html.js index 74910098689..aa044b6967a 100644 --- a/themes/Backend/ExtJs/backend/base/component/element/html.js +++ b/themes/Backend/ExtJs/backend/base/component/element/html.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/element/interval.js b/themes/Backend/ExtJs/backend/base/component/element/interval.js index 939a3f9c902..a7506258bc7 100644 --- a/themes/Backend/ExtJs/backend/base/component/element/interval.js +++ b/themes/Backend/ExtJs/backend/base/component/element/interval.js @@ -4,23 +4,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/element/listing_filter_mode_select.js b/themes/Backend/ExtJs/backend/base/component/element/listing_filter_mode_select.js index 56fec67d84e..a56e2ffabc3 100644 --- a/themes/Backend/ExtJs/backend/base/component/element/listing_filter_mode_select.js +++ b/themes/Backend/ExtJs/backend/base/component/element/listing_filter_mode_select.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/element/media_selection.js b/themes/Backend/ExtJs/backend/base/component/element/media_selection.js index e76159a9450..830aef56fb7 100644 --- a/themes/Backend/ExtJs/backend/base/component/element/media_selection.js +++ b/themes/Backend/ExtJs/backend/base/component/element/media_selection.js @@ -1,24 +1,23 @@ -/* +/** * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/element/media_text_selection.js b/themes/Backend/ExtJs/backend/base/component/element/media_text_selection.js index 3f35ced3c0c..4098c7b4611 100644 --- a/themes/Backend/ExtJs/backend/base/component/element/media_text_selection.js +++ b/themes/Backend/ExtJs/backend/base/component/element/media_text_selection.js @@ -1,24 +1,23 @@ -/* +/** * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/element/number.js b/themes/Backend/ExtJs/backend/base/component/element/number.js index 733247da775..6300d6489cd 100644 --- a/themes/Backend/ExtJs/backend/base/component/element/number.js +++ b/themes/Backend/ExtJs/backend/base/component/element/number.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/element/product_box_layout_select.js b/themes/Backend/ExtJs/backend/base/component/element/product_box_layout_select.js index 10443726dd4..1396aebd75c 100644 --- a/themes/Backend/ExtJs/backend/base/component/element/product_box_layout_select.js +++ b/themes/Backend/ExtJs/backend/base/component/element/product_box_layout_select.js @@ -1,23 +1,23 @@ -/* - * Shopware +/** + * Shopware 5 + * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/base/product_box_layout"} diff --git a/themes/Backend/ExtJs/backend/base/component/element/select.js b/themes/Backend/ExtJs/backend/base/component/element/select.js index 4a507b32871..c19b5f78983 100644 --- a/themes/Backend/ExtJs/backend/base/component/element/select.js +++ b/themes/Backend/ExtJs/backend/base/component/element/select.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/element/select_tree.js b/themes/Backend/ExtJs/backend/base/component/element/select_tree.js index 1be3514071a..4e5966de928 100644 --- a/themes/Backend/ExtJs/backend/base/component/element/select_tree.js +++ b/themes/Backend/ExtJs/backend/base/component/element/select_tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/element/text.js b/themes/Backend/ExtJs/backend/base/component/element/text.js index 3179e0f7848..7cc865aa358 100644 --- a/themes/Backend/ExtJs/backend/base/component/element/text.js +++ b/themes/Backend/ExtJs/backend/base/component/element/text.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/element/textarea.js b/themes/Backend/ExtJs/backend/base/component/element/textarea.js index 2cd77527589..6fb395ee725 100644 --- a/themes/Backend/ExtJs/backend/base/component/element/textarea.js +++ b/themes/Backend/ExtJs/backend/base/component/element/textarea.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/component/element/time.js b/themes/Backend/ExtJs/backend/base/component/element/time.js index 85b3a70219f..4b7c3c65060 100644 --- a/themes/Backend/ExtJs/backend/base/component/element/time.js +++ b/themes/Backend/ExtJs/backend/base/component/element/time.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/frame/postmessage-api.js b/themes/Backend/ExtJs/backend/base/frame/postmessage-api.js index 0767c1c0110..0f172224ebb 100644 --- a/themes/Backend/ExtJs/backend/base/frame/postmessage-api.js +++ b/themes/Backend/ExtJs/backend/base/frame/postmessage-api.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/base/model/address.js b/themes/Backend/ExtJs/backend/base/model/address.js index 13bc935547f..b7845f5c2c5 100644 --- a/themes/Backend/ExtJs/backend/base/model/address.js +++ b/themes/Backend/ExtJs/backend/base/model/address.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/article.js b/themes/Backend/ExtJs/backend/base/model/article.js index 0fe1e2a4a42..2a4182d4e1c 100644 --- a/themes/Backend/ExtJs/backend/base/model/article.js +++ b/themes/Backend/ExtJs/backend/base/model/article.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/billing_address.js b/themes/Backend/ExtJs/backend/base/model/billing_address.js index dd3af22f597..907d49e7884 100644 --- a/themes/Backend/ExtJs/backend/base/model/billing_address.js +++ b/themes/Backend/ExtJs/backend/base/model/billing_address.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/blog.js b/themes/Backend/ExtJs/backend/base/model/blog.js index 7011e9ccbe0..fbcc65a9b18 100644 --- a/themes/Backend/ExtJs/backend/base/model/blog.js +++ b/themes/Backend/ExtJs/backend/base/model/blog.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/captcha.js b/themes/Backend/ExtJs/backend/base/model/captcha.js index d4b2c6de58f..6ccd4b7e533 100644 --- a/themes/Backend/ExtJs/backend/base/model/captcha.js +++ b/themes/Backend/ExtJs/backend/base/model/captcha.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/category.js b/themes/Backend/ExtJs/backend/base/model/category.js index 23c44231fdd..c19d8168cba 100644 --- a/themes/Backend/ExtJs/backend/base/model/category.js +++ b/themes/Backend/ExtJs/backend/base/model/category.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/cookie_mode.js b/themes/Backend/ExtJs/backend/base/model/cookie_mode.js index 62ac715cab7..4350a7d4593 100644 --- a/themes/Backend/ExtJs/backend/base/model/cookie_mode.js +++ b/themes/Backend/ExtJs/backend/base/model/cookie_mode.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/corner_position.js b/themes/Backend/ExtJs/backend/base/model/corner_position.js index b1785524257..1898b66cbb9 100644 --- a/themes/Backend/ExtJs/backend/base/model/corner_position.js +++ b/themes/Backend/ExtJs/backend/base/model/corner_position.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/country.js b/themes/Backend/ExtJs/backend/base/model/country.js index b866f36b784..c48409b39f7 100644 --- a/themes/Backend/ExtJs/backend/base/model/country.js +++ b/themes/Backend/ExtJs/backend/base/model/country.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/country_area.js b/themes/Backend/ExtJs/backend/base/model/country_area.js index 05e28e25172..d1011a9bc0b 100644 --- a/themes/Backend/ExtJs/backend/base/model/country_area.js +++ b/themes/Backend/ExtJs/backend/base/model/country_area.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/country_state.js b/themes/Backend/ExtJs/backend/base/model/country_state.js index 1eb543e4aaa..872251cb88e 100644 --- a/themes/Backend/ExtJs/backend/base/model/country_state.js +++ b/themes/Backend/ExtJs/backend/base/model/country_state.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/currency.js b/themes/Backend/ExtJs/backend/base/model/currency.js index 916975210c4..7e53937ccc9 100644 --- a/themes/Backend/ExtJs/backend/base/model/currency.js +++ b/themes/Backend/ExtJs/backend/base/model/currency.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/custom_facet.js b/themes/Backend/ExtJs/backend/base/model/custom_facet.js index 83a127ceef1..1415072fab7 100644 --- a/themes/Backend/ExtJs/backend/base/model/custom_facet.js +++ b/themes/Backend/ExtJs/backend/base/model/custom_facet.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/base/model/custom_facet"} diff --git a/themes/Backend/ExtJs/backend/base/model/custom_sorting.js b/themes/Backend/ExtJs/backend/base/model/custom_sorting.js index d2c37327d18..0156a612fec 100755 --- a/themes/Backend/ExtJs/backend/base/model/custom_sorting.js +++ b/themes/Backend/ExtJs/backend/base/model/custom_sorting.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/base/model/custom_sorting"} diff --git a/themes/Backend/ExtJs/backend/base/model/customer.js b/themes/Backend/ExtJs/backend/base/model/customer.js index 67aa94ed33b..1aee3393f68 100644 --- a/themes/Backend/ExtJs/backend/base/model/customer.js +++ b/themes/Backend/ExtJs/backend/base/model/customer.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/customer_group.js b/themes/Backend/ExtJs/backend/base/model/customer_group.js index 648514f41b3..f0b06564f46 100644 --- a/themes/Backend/ExtJs/backend/base/model/customer_group.js +++ b/themes/Backend/ExtJs/backend/base/model/customer_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/dispatch.js b/themes/Backend/ExtJs/backend/base/model/dispatch.js index 443d6f87709..e0d440a5340 100644 --- a/themes/Backend/ExtJs/backend/base/model/dispatch.js +++ b/themes/Backend/ExtJs/backend/base/model/dispatch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/doc_type.js b/themes/Backend/ExtJs/backend/base/model/doc_type.js index cd145518d8b..4af760e13dc 100644 --- a/themes/Backend/ExtJs/backend/base/model/doc_type.js +++ b/themes/Backend/ExtJs/backend/base/model/doc_type.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/base/model/element.js b/themes/Backend/ExtJs/backend/base/model/element.js index 3def8e1c695..c1a70921454 100644 --- a/themes/Backend/ExtJs/backend/base/model/element.js +++ b/themes/Backend/ExtJs/backend/base/model/element.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Base diff --git a/themes/Backend/ExtJs/backend/base/model/form.js b/themes/Backend/ExtJs/backend/base/model/form.js index 310daca3d26..fea6ab0ad59 100644 --- a/themes/Backend/ExtJs/backend/base/model/form.js +++ b/themes/Backend/ExtJs/backend/base/model/form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Base diff --git a/themes/Backend/ExtJs/backend/base/model/landing_page.js b/themes/Backend/ExtJs/backend/base/model/landing_page.js index cde9c5a2b1d..fb02d10605c 100644 --- a/themes/Backend/ExtJs/backend/base/model/landing_page.js +++ b/themes/Backend/ExtJs/backend/base/model/landing_page.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/locale.js b/themes/Backend/ExtJs/backend/base/model/locale.js index 00faaa20db4..4e9a9355eba 100644 --- a/themes/Backend/ExtJs/backend/base/model/locale.js +++ b/themes/Backend/ExtJs/backend/base/model/locale.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/media.js b/themes/Backend/ExtJs/backend/base/model/media.js index 7b7fbcdab8b..edea8ac2f0e 100644 --- a/themes/Backend/ExtJs/backend/base/model/media.js +++ b/themes/Backend/ExtJs/backend/base/model/media.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/order_status.js b/themes/Backend/ExtJs/backend/base/model/order_status.js index b67e3dc8f03..e9df61b6ecc 100644 --- a/themes/Backend/ExtJs/backend/base/model/order_status.js +++ b/themes/Backend/ExtJs/backend/base/model/order_status.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/page_not_found_destination_options.js b/themes/Backend/ExtJs/backend/base/model/page_not_found_destination_options.js index 550afd22aa5..ae78d2b10ba 100644 --- a/themes/Backend/ExtJs/backend/base/model/page_not_found_destination_options.js +++ b/themes/Backend/ExtJs/backend/base/model/page_not_found_destination_options.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @version $Id$ diff --git a/themes/Backend/ExtJs/backend/base/model/password_encoder.js b/themes/Backend/ExtJs/backend/base/model/password_encoder.js index 08985c1554a..f9758f32dfa 100644 --- a/themes/Backend/ExtJs/backend/base/model/password_encoder.js +++ b/themes/Backend/ExtJs/backend/base/model/password_encoder.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/payment.js b/themes/Backend/ExtJs/backend/base/model/payment.js index 2ff882f0893..ee8250c3329 100644 --- a/themes/Backend/ExtJs/backend/base/model/payment.js +++ b/themes/Backend/ExtJs/backend/base/model/payment.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/payment_status.js b/themes/Backend/ExtJs/backend/base/model/payment_status.js index 74701422cbc..dbaf1ba9bf4 100644 --- a/themes/Backend/ExtJs/backend/base/model/payment_status.js +++ b/themes/Backend/ExtJs/backend/base/model/payment_status.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/position_status.js b/themes/Backend/ExtJs/backend/base/model/position_status.js index 2fd5fee3b3f..3d093d72e98 100644 --- a/themes/Backend/ExtJs/backend/base/model/position_status.js +++ b/themes/Backend/ExtJs/backend/base/model/position_status.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/base/model/product_box_layout.js b/themes/Backend/ExtJs/backend/base/model/product_box_layout.js index 5c968ffdcd1..b2a289d24f9 100644 --- a/themes/Backend/ExtJs/backend/base/model/product_box_layout.js +++ b/themes/Backend/ExtJs/backend/base/model/product_box_layout.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/shop.js b/themes/Backend/ExtJs/backend/base/model/shop.js index 9718bc6faf2..3e75cfc2b41 100644 --- a/themes/Backend/ExtJs/backend/base/model/shop.js +++ b/themes/Backend/ExtJs/backend/base/model/shop.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/static.js b/themes/Backend/ExtJs/backend/base/model/static.js index 363dac1f170..1b35109a906 100644 --- a/themes/Backend/ExtJs/backend/base/model/static.js +++ b/themes/Backend/ExtJs/backend/base/model/static.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/supplier.js b/themes/Backend/ExtJs/backend/base/model/supplier.js index e4210584f66..745d9424dab 100644 --- a/themes/Backend/ExtJs/backend/base/model/supplier.js +++ b/themes/Backend/ExtJs/backend/base/model/supplier.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/tax.js b/themes/Backend/ExtJs/backend/base/model/tax.js index d85bccbf3b2..fb407b15e47 100644 --- a/themes/Backend/ExtJs/backend/base/model/tax.js +++ b/themes/Backend/ExtJs/backend/base/model/tax.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/template.js b/themes/Backend/ExtJs/backend/base/model/template.js index e12692b149d..f5acbb1c7d4 100644 --- a/themes/Backend/ExtJs/backend/base/model/template.js +++ b/themes/Backend/ExtJs/backend/base/model/template.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/user.js b/themes/Backend/ExtJs/backend/base/model/user.js index fc560b36f46..567fdcfb679 100644 --- a/themes/Backend/ExtJs/backend/base/model/user.js +++ b/themes/Backend/ExtJs/backend/base/model/user.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/model/value.js b/themes/Backend/ExtJs/backend/base/model/value.js index 8fc1e5be0b7..8db58f32983 100644 --- a/themes/Backend/ExtJs/backend/base/model/value.js +++ b/themes/Backend/ExtJs/backend/base/model/value.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Base diff --git a/themes/Backend/ExtJs/backend/base/model/variant.js b/themes/Backend/ExtJs/backend/base/model/variant.js index 23d1513acdd..6863f73041a 100644 --- a/themes/Backend/ExtJs/backend/base/model/variant.js +++ b/themes/Backend/ExtJs/backend/base/model/variant.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/article.js b/themes/Backend/ExtJs/backend/base/store/article.js index 92625e69eae..acee55a3b81 100644 --- a/themes/Backend/ExtJs/backend/base/store/article.js +++ b/themes/Backend/ExtJs/backend/base/store/article.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/blog.js b/themes/Backend/ExtJs/backend/base/store/blog.js index e93d39c051b..52deb25ee46 100644 --- a/themes/Backend/ExtJs/backend/base/store/blog.js +++ b/themes/Backend/ExtJs/backend/base/store/blog.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/captcha.js b/themes/Backend/ExtJs/backend/base/store/captcha.js index 601905f6813..e659f9a55d6 100644 --- a/themes/Backend/ExtJs/backend/base/store/captcha.js +++ b/themes/Backend/ExtJs/backend/base/store/captcha.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/category.js b/themes/Backend/ExtJs/backend/base/store/category.js index 340622e2900..c76b4ded2cf 100644 --- a/themes/Backend/ExtJs/backend/base/store/category.js +++ b/themes/Backend/ExtJs/backend/base/store/category.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/category_tree.js b/themes/Backend/ExtJs/backend/base/store/category_tree.js index e12513213c1..564a3db7d23 100644 --- a/themes/Backend/ExtJs/backend/base/store/category_tree.js +++ b/themes/Backend/ExtJs/backend/base/store/category_tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/cookie_mode.js b/themes/Backend/ExtJs/backend/base/store/cookie_mode.js index 7a0585e3851..72e6a20b99e 100644 --- a/themes/Backend/ExtJs/backend/base/store/cookie_mode.js +++ b/themes/Backend/ExtJs/backend/base/store/cookie_mode.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/corner_position.js b/themes/Backend/ExtJs/backend/base/store/corner_position.js index 09abe30225e..857b3c23399 100644 --- a/themes/Backend/ExtJs/backend/base/store/corner_position.js +++ b/themes/Backend/ExtJs/backend/base/store/corner_position.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/country.js b/themes/Backend/ExtJs/backend/base/store/country.js index 0d579d9e1aa..89c63a1841c 100644 --- a/themes/Backend/ExtJs/backend/base/store/country.js +++ b/themes/Backend/ExtJs/backend/base/store/country.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/country_area.js b/themes/Backend/ExtJs/backend/base/store/country_area.js index 8ccdfe5fd39..dd037a4b9a7 100644 --- a/themes/Backend/ExtJs/backend/base/store/country_area.js +++ b/themes/Backend/ExtJs/backend/base/store/country_area.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/country_state.js b/themes/Backend/ExtJs/backend/base/store/country_state.js index 3425ae30917..7ff0941de9d 100644 --- a/themes/Backend/ExtJs/backend/base/store/country_state.js +++ b/themes/Backend/ExtJs/backend/base/store/country_state.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/currency.js b/themes/Backend/ExtJs/backend/base/store/currency.js index 755dfa88f6f..0428c5c30a5 100644 --- a/themes/Backend/ExtJs/backend/base/store/currency.js +++ b/themes/Backend/ExtJs/backend/base/store/currency.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/custom_facet.js b/themes/Backend/ExtJs/backend/base/store/custom_facet.js index 6604c785b18..fcc991a0b18 100644 --- a/themes/Backend/ExtJs/backend/base/store/custom_facet.js +++ b/themes/Backend/ExtJs/backend/base/store/custom_facet.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/base/store/custom_facet"} diff --git a/themes/Backend/ExtJs/backend/base/store/custom_sorting.js b/themes/Backend/ExtJs/backend/base/store/custom_sorting.js index 5997622094e..cd58b72778e 100755 --- a/themes/Backend/ExtJs/backend/base/store/custom_sorting.js +++ b/themes/Backend/ExtJs/backend/base/store/custom_sorting.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/base/store/custom_sorting"} diff --git a/themes/Backend/ExtJs/backend/base/store/customer_group.js b/themes/Backend/ExtJs/backend/base/store/customer_group.js index efd251f1424..c4e357aa643 100644 --- a/themes/Backend/ExtJs/backend/base/store/customer_group.js +++ b/themes/Backend/ExtJs/backend/base/store/customer_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/dispatch.js b/themes/Backend/ExtJs/backend/base/store/dispatch.js index 22f3414bdac..85c89d064d6 100644 --- a/themes/Backend/ExtJs/backend/base/store/dispatch.js +++ b/themes/Backend/ExtJs/backend/base/store/dispatch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/doc_type.js b/themes/Backend/ExtJs/backend/base/store/doc_type.js index 58a3792a060..64cf5c57656 100644 --- a/themes/Backend/ExtJs/backend/base/store/doc_type.js +++ b/themes/Backend/ExtJs/backend/base/store/doc_type.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/form.js b/themes/Backend/ExtJs/backend/base/store/form.js index f1cb8cf6b7a..d9100133987 100644 --- a/themes/Backend/ExtJs/backend/base/store/form.js +++ b/themes/Backend/ExtJs/backend/base/store/form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Base diff --git a/themes/Backend/ExtJs/backend/base/store/landing_page.js b/themes/Backend/ExtJs/backend/base/store/landing_page.js index 383acaa2953..4b8f89ff3ce 100644 --- a/themes/Backend/ExtJs/backend/base/store/landing_page.js +++ b/themes/Backend/ExtJs/backend/base/store/landing_page.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/listing_filter_mode.js b/themes/Backend/ExtJs/backend/base/store/listing_filter_mode.js index 0135c5f5d2d..17d825b518e 100644 --- a/themes/Backend/ExtJs/backend/base/store/listing_filter_mode.js +++ b/themes/Backend/ExtJs/backend/base/store/listing_filter_mode.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/locale.js b/themes/Backend/ExtJs/backend/base/store/locale.js index 94f5285b660..65be2c19cdd 100644 --- a/themes/Backend/ExtJs/backend/base/store/locale.js +++ b/themes/Backend/ExtJs/backend/base/store/locale.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/order_status.js b/themes/Backend/ExtJs/backend/base/store/order_status.js index 75bb28c7349..6d0e8a1fc0c 100644 --- a/themes/Backend/ExtJs/backend/base/store/order_status.js +++ b/themes/Backend/ExtJs/backend/base/store/order_status.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/page_not_found_destination_options.js b/themes/Backend/ExtJs/backend/base/store/page_not_found_destination_options.js index 36f25eff98a..1812aace523 100644 --- a/themes/Backend/ExtJs/backend/base/store/page_not_found_destination_options.js +++ b/themes/Backend/ExtJs/backend/base/store/page_not_found_destination_options.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @version $Id$ diff --git a/themes/Backend/ExtJs/backend/base/store/password_encoder.js b/themes/Backend/ExtJs/backend/base/store/password_encoder.js index 714169a1411..440741ad38b 100644 --- a/themes/Backend/ExtJs/backend/base/store/password_encoder.js +++ b/themes/Backend/ExtJs/backend/base/store/password_encoder.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/payment.js b/themes/Backend/ExtJs/backend/base/store/payment.js index 0a2afda9481..6a39e5dc79a 100644 --- a/themes/Backend/ExtJs/backend/base/store/payment.js +++ b/themes/Backend/ExtJs/backend/base/store/payment.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/payment_status.js b/themes/Backend/ExtJs/backend/base/store/payment_status.js index cd8eadabb1b..ffb3e5d920d 100644 --- a/themes/Backend/ExtJs/backend/base/store/payment_status.js +++ b/themes/Backend/ExtJs/backend/base/store/payment_status.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/position_status.js b/themes/Backend/ExtJs/backend/base/store/position_status.js index 297ae6b65c8..5b2eb8ffcb9 100644 --- a/themes/Backend/ExtJs/backend/base/store/position_status.js +++ b/themes/Backend/ExtJs/backend/base/store/position_status.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/base/store/product_box_layout.js b/themes/Backend/ExtJs/backend/base/store/product_box_layout.js index a536a93b14a..b30ad4373da 100644 --- a/themes/Backend/ExtJs/backend/base/store/product_box_layout.js +++ b/themes/Backend/ExtJs/backend/base/store/product_box_layout.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/salutation.js b/themes/Backend/ExtJs/backend/base/store/salutation.js index 1e7dd1c91f5..9099c6c364b 100644 --- a/themes/Backend/ExtJs/backend/base/store/salutation.js +++ b/themes/Backend/ExtJs/backend/base/store/salutation.js @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/shop.js b/themes/Backend/ExtJs/backend/base/store/shop.js index 2f2a6e909b8..4412e4bd4d4 100644 --- a/themes/Backend/ExtJs/backend/base/store/shop.js +++ b/themes/Backend/ExtJs/backend/base/store/shop.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/shop_language.js b/themes/Backend/ExtJs/backend/base/store/shop_language.js index 12536eed435..efa3e7db982 100644 --- a/themes/Backend/ExtJs/backend/base/store/shop_language.js +++ b/themes/Backend/ExtJs/backend/base/store/shop_language.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/static.js b/themes/Backend/ExtJs/backend/base/store/static.js index 6ad85d162cb..51123ca1c56 100644 --- a/themes/Backend/ExtJs/backend/base/store/static.js +++ b/themes/Backend/ExtJs/backend/base/store/static.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/supplier.js b/themes/Backend/ExtJs/backend/base/store/supplier.js index 9fc7552fde1..003e5344ad2 100644 --- a/themes/Backend/ExtJs/backend/base/store/supplier.js +++ b/themes/Backend/ExtJs/backend/base/store/supplier.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/tax.js b/themes/Backend/ExtJs/backend/base/store/tax.js index fd6c20da35e..24df19589db 100644 --- a/themes/Backend/ExtJs/backend/base/store/tax.js +++ b/themes/Backend/ExtJs/backend/base/store/tax.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/template.js b/themes/Backend/ExtJs/backend/base/store/template.js index 4c0e53df2d2..c6f8b36b0a9 100644 --- a/themes/Backend/ExtJs/backend/base/store/template.js +++ b/themes/Backend/ExtJs/backend/base/store/template.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/translation.js b/themes/Backend/ExtJs/backend/base/store/translation.js index 23f6103f6be..358c747359e 100644 --- a/themes/Backend/ExtJs/backend/base/store/translation.js +++ b/themes/Backend/ExtJs/backend/base/store/translation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/user.js b/themes/Backend/ExtJs/backend/base/store/user.js index ddade5f6876..a3609696152 100644 --- a/themes/Backend/ExtJs/backend/base/store/user.js +++ b/themes/Backend/ExtJs/backend/base/store/user.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/base/store/variant.js b/themes/Backend/ExtJs/backend/base/store/variant.js index d719a0effd6..e7e5631f156 100644 --- a/themes/Backend/ExtJs/backend/base/store/variant.js +++ b/themes/Backend/ExtJs/backend/base/store/variant.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/blog/app.js b/themes/Backend/ExtJs/backend/blog/app.js index 5079e88ff86..41f76732167 100644 --- a/themes/Backend/ExtJs/backend/blog/app.js +++ b/themes/Backend/ExtJs/backend/blog/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/controller/blog.js b/themes/Backend/ExtJs/backend/blog/controller/blog.js index 4810c890ee5..c1c27f168d1 100644 --- a/themes/Backend/ExtJs/backend/blog/controller/blog.js +++ b/themes/Backend/ExtJs/backend/blog/controller/blog.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/controller/comment.js b/themes/Backend/ExtJs/backend/blog/controller/comment.js index 8b31eb6d661..1e87c359d28 100644 --- a/themes/Backend/ExtJs/backend/blog/controller/comment.js +++ b/themes/Backend/ExtJs/backend/blog/controller/comment.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/controller/main.js b/themes/Backend/ExtJs/backend/blog/controller/main.js index 9c782a0d67f..ccb390467a8 100644 --- a/themes/Backend/ExtJs/backend/blog/controller/main.js +++ b/themes/Backend/ExtJs/backend/blog/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/controller/media.js b/themes/Backend/ExtJs/backend/blog/controller/media.js index f73f0adfea8..b953dda0d8f 100644 --- a/themes/Backend/ExtJs/backend/blog/controller/media.js +++ b/themes/Backend/ExtJs/backend/blog/controller/media.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/model/assigned_articles.js b/themes/Backend/ExtJs/backend/blog/model/assigned_articles.js index 7d918aff22f..6d973a39289 100644 --- a/themes/Backend/ExtJs/backend/blog/model/assigned_articles.js +++ b/themes/Backend/ExtJs/backend/blog/model/assigned_articles.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/model/comment.js b/themes/Backend/ExtJs/backend/blog/model/comment.js index aec4996a29e..d5d5fcb69db 100644 --- a/themes/Backend/ExtJs/backend/blog/model/comment.js +++ b/themes/Backend/ExtJs/backend/blog/model/comment.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/model/detail.js b/themes/Backend/ExtJs/backend/blog/model/detail.js index dfed38d84e1..1e0fd3b82de 100644 --- a/themes/Backend/ExtJs/backend/blog/model/detail.js +++ b/themes/Backend/ExtJs/backend/blog/model/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/model/main.js b/themes/Backend/ExtJs/backend/blog/model/main.js index 30d85b51289..7be8b45a953 100644 --- a/themes/Backend/ExtJs/backend/blog/model/main.js +++ b/themes/Backend/ExtJs/backend/blog/model/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/model/media.js b/themes/Backend/ExtJs/backend/blog/model/media.js index 8fc1286d765..76052c7050b 100644 --- a/themes/Backend/ExtJs/backend/blog/model/media.js +++ b/themes/Backend/ExtJs/backend/blog/model/media.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * Shopware Model - Blog backend module. * diff --git a/themes/Backend/ExtJs/backend/blog/model/template.js b/themes/Backend/ExtJs/backend/blog/model/template.js index 5ddfc658e32..9d7dbb01693 100644 --- a/themes/Backend/ExtJs/backend/blog/model/template.js +++ b/themes/Backend/ExtJs/backend/blog/model/template.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/model/tree.js b/themes/Backend/ExtJs/backend/blog/model/tree.js index 0e2f2e850f5..8ce2bff0aeb 100644 --- a/themes/Backend/ExtJs/backend/blog/model/tree.js +++ b/themes/Backend/ExtJs/backend/blog/model/tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/store/category_path.js b/themes/Backend/ExtJs/backend/blog/store/category_path.js index 2e102b24774..7fd85878082 100644 --- a/themes/Backend/ExtJs/backend/blog/store/category_path.js +++ b/themes/Backend/ExtJs/backend/blog/store/category_path.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/store/comment.js b/themes/Backend/ExtJs/backend/blog/store/comment.js index 056c6718f07..f574e6b6926 100644 --- a/themes/Backend/ExtJs/backend/blog/store/comment.js +++ b/themes/Backend/ExtJs/backend/blog/store/comment.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/store/detail.js b/themes/Backend/ExtJs/backend/blog/store/detail.js index d71d8f9d01a..561dc1bd289 100644 --- a/themes/Backend/ExtJs/backend/blog/store/detail.js +++ b/themes/Backend/ExtJs/backend/blog/store/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/store/list.js b/themes/Backend/ExtJs/backend/blog/store/list.js index 60c2e6359ec..4a557d6385e 100644 --- a/themes/Backend/ExtJs/backend/blog/store/list.js +++ b/themes/Backend/ExtJs/backend/blog/store/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/store/template.js b/themes/Backend/ExtJs/backend/blog/store/template.js index 51d1b230eb7..8195ff91e9e 100644 --- a/themes/Backend/ExtJs/backend/blog/store/template.js +++ b/themes/Backend/ExtJs/backend/blog/store/template.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/store/tree.js b/themes/Backend/ExtJs/backend/blog/store/tree.js index 2789e715cab..036506e7190 100644 --- a/themes/Backend/ExtJs/backend/blog/store/tree.js +++ b/themes/Backend/ExtJs/backend/blog/store/tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments.js b/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments.js index 22c5ecfb888..58a6f661eba 100644 --- a/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments.js +++ b/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments/grid.js b/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments/grid.js index b0082d23eda..3f4fe30804b 100644 --- a/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments/grid.js +++ b/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments/grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments/info_panel.js b/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments/info_panel.js index 0a9f13c8cd3..a1d4021763a 100644 --- a/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments/info_panel.js +++ b/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments/info_panel.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/view/blog/detail/main.js b/themes/Backend/ExtJs/backend/blog/view/blog/detail/main.js index 71d00e36ea1..10f4540fe8f 100644 --- a/themes/Backend/ExtJs/backend/blog/view/blog/detail/main.js +++ b/themes/Backend/ExtJs/backend/blog/view/blog/detail/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/assigned_articles.js b/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/assigned_articles.js index 7dff73f905e..5a22e325d4d 100644 --- a/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/assigned_articles.js +++ b/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/assigned_articles.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/options.js b/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/options.js index 33556c0c23b..1cfb1f739e7 100644 --- a/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/options.js +++ b/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/options.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/seo.js b/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/seo.js index bdf8acb6ad4..1cfdc400af8 100644 --- a/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/seo.js +++ b/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/seo.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/view/blog/list.js b/themes/Backend/ExtJs/backend/blog/view/blog/list.js index b22e5e73a1f..bfec0ce5a9b 100644 --- a/themes/Backend/ExtJs/backend/blog/view/blog/list.js +++ b/themes/Backend/ExtJs/backend/blog/view/blog/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/view/blog/tree.js b/themes/Backend/ExtJs/backend/blog/view/blog/tree.js index b4810129f35..adec2c9cb46 100644 --- a/themes/Backend/ExtJs/backend/blog/view/blog/tree.js +++ b/themes/Backend/ExtJs/backend/blog/view/blog/tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/view/blog/window.js b/themes/Backend/ExtJs/backend/blog/view/blog/window.js index e82a9f24167..70b842021e0 100644 --- a/themes/Backend/ExtJs/backend/blog/view/blog/window.js +++ b/themes/Backend/ExtJs/backend/blog/view/blog/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/blog/view/main/window.js b/themes/Backend/ExtJs/backend/blog/view/main/window.js index a6775886e20..d850936c41b 100644 --- a/themes/Backend/ExtJs/backend/blog/view/main/window.js +++ b/themes/Backend/ExtJs/backend/blog/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Blog diff --git a/themes/Backend/ExtJs/backend/canceled_order/app.js b/themes/Backend/ExtJs/backend/canceled_order/app.js index 13481bcf781..b18b7a85790 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/app.js +++ b/themes/Backend/ExtJs/backend/canceled_order/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/controller/basket.js b/themes/Backend/ExtJs/backend/canceled_order/controller/basket.js index 5c0dd0ce136..f6e603a6402 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/controller/basket.js +++ b/themes/Backend/ExtJs/backend/canceled_order/controller/basket.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/controller/main.js b/themes/Backend/ExtJs/backend/canceled_order/controller/main.js index 2977700a13e..f6c4c62f008 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/controller/main.js +++ b/themes/Backend/ExtJs/backend/canceled_order/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/controller/order.js b/themes/Backend/ExtJs/backend/canceled_order/controller/order.js index 4f6e6911f00..8476e242f12 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/controller/order.js +++ b/themes/Backend/ExtJs/backend/canceled_order/controller/order.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/model/articles.js b/themes/Backend/ExtJs/backend/canceled_order/model/articles.js index 8dc64456804..1e1ede5848f 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/model/articles.js +++ b/themes/Backend/ExtJs/backend/canceled_order/model/articles.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/model/basket.js b/themes/Backend/ExtJs/backend/canceled_order/model/basket.js index 840488752b0..e08a2a886dc 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/model/basket.js +++ b/themes/Backend/ExtJs/backend/canceled_order/model/basket.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/model/order.js b/themes/Backend/ExtJs/backend/canceled_order/model/order.js index b1d22d398c5..c3813f89ade 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/model/order.js +++ b/themes/Backend/ExtJs/backend/canceled_order/model/order.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/model/position.js b/themes/Backend/ExtJs/backend/canceled_order/model/position.js index 9e6b2431873..3f541d0ba44 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/model/position.js +++ b/themes/Backend/ExtJs/backend/canceled_order/model/position.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/canceled_order/model/statistic.js b/themes/Backend/ExtJs/backend/canceled_order/model/statistic.js index d3f819e9897..6ccd57fefa2 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/model/statistic.js +++ b/themes/Backend/ExtJs/backend/canceled_order/model/statistic.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/model/viewports.js b/themes/Backend/ExtJs/backend/canceled_order/model/viewports.js index d5ea22b4928..f47d5453061 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/model/viewports.js +++ b/themes/Backend/ExtJs/backend/canceled_order/model/viewports.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/model/voucher.js b/themes/Backend/ExtJs/backend/canceled_order/model/voucher.js index 820c691f776..1fcf3fa7f95 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/model/voucher.js +++ b/themes/Backend/ExtJs/backend/canceled_order/model/voucher.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/store/articles.js b/themes/Backend/ExtJs/backend/canceled_order/store/articles.js index 923a9a1151a..82a421b6682 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/store/articles.js +++ b/themes/Backend/ExtJs/backend/canceled_order/store/articles.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/store/basket.js b/themes/Backend/ExtJs/backend/canceled_order/store/basket.js index 39ca9bd6920..77dc246f169 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/store/basket.js +++ b/themes/Backend/ExtJs/backend/canceled_order/store/basket.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/store/order.js b/themes/Backend/ExtJs/backend/canceled_order/store/order.js index ad51b62a5b3..d2fd2c02aa3 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/store/order.js +++ b/themes/Backend/ExtJs/backend/canceled_order/store/order.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/store/statistic.js b/themes/Backend/ExtJs/backend/canceled_order/store/statistic.js index dcf6ebe2380..2d7e1e2a11b 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/store/statistic.js +++ b/themes/Backend/ExtJs/backend/canceled_order/store/statistic.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/store/viewports.js b/themes/Backend/ExtJs/backend/canceled_order/store/viewports.js index 443a31db2b2..382875079fa 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/store/viewports.js +++ b/themes/Backend/ExtJs/backend/canceled_order/store/viewports.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/store/voucher.js b/themes/Backend/ExtJs/backend/canceled_order/store/voucher.js index 3027ed26879..f8b990a58cf 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/store/voucher.js +++ b/themes/Backend/ExtJs/backend/canceled_order/store/voucher.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/view/main/window.js b/themes/Backend/ExtJs/backend/canceled_order/view/main/window.js index 48ecfab815a..e2f6c61c4b0 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/view/main/window.js +++ b/themes/Backend/ExtJs/backend/canceled_order/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/articles.js b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/articles.js index a21f63aa506..03089c84b36 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/articles.js +++ b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/articles.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/main.js b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/main.js index e148ef75f07..55a48c4a725 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/main.js +++ b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/overview.js b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/overview.js index e1e277397e2..db47eafb5b2 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/overview.js +++ b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/overview.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/viewports.js b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/viewports.js index d37a3a93ef2..f92314fc02c 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/viewports.js +++ b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/viewports.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/detail.js b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/detail.js index cfb94547f35..c224e9632ff 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/detail.js +++ b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/main.js b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/main.js index 324cf5d6fa4..1ff49b11d26 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/main.js +++ b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/orders.js b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/orders.js index cdc96164a11..ea4de0f2069 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/orders.js +++ b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/orders.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/position.js b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/position.js index 14bfaa34038..e43679844e6 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/position.js +++ b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/position.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/canceled_order/view/main"} diff --git a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/statistics.js b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/statistics.js index b3b6294c93f..7cd4127ccab 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/statistics.js +++ b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/statistics.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/canceled_order/view/toolbar.js b/themes/Backend/ExtJs/backend/canceled_order/view/toolbar.js index cd32c1f2429..0ae6e8c55b7 100644 --- a/themes/Backend/ExtJs/backend/canceled_order/view/toolbar.js +++ b/themes/Backend/ExtJs/backend/canceled_order/view/toolbar.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/category/app.js b/themes/Backend/ExtJs/backend/category/app.js index e6ef0997594..8d52c259eff 100644 --- a/themes/Backend/ExtJs/backend/category/app.js +++ b/themes/Backend/ExtJs/backend/category/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Category diff --git a/themes/Backend/ExtJs/backend/category/controller/article_mapping.js b/themes/Backend/ExtJs/backend/category/controller/article_mapping.js index c65e144ae47..ede19592492 100644 --- a/themes/Backend/ExtJs/backend/category/controller/article_mapping.js +++ b/themes/Backend/ExtJs/backend/category/controller/article_mapping.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. - * The licensing of the program under the AGPLv3 does +not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * The licensing of the program under the AGPLv3 does not imply a + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Category diff --git a/themes/Backend/ExtJs/backend/category/controller/duplicate_tasks.js b/themes/Backend/ExtJs/backend/category/controller/duplicate_tasks.js index d502dd8d2ce..aedc449ad7b 100644 --- a/themes/Backend/ExtJs/backend/category/controller/duplicate_tasks.js +++ b/themes/Backend/ExtJs/backend/category/controller/duplicate_tasks.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Category diff --git a/themes/Backend/ExtJs/backend/category/controller/main.js b/themes/Backend/ExtJs/backend/category/controller/main.js index 5afe29eb48c..29482e78955 100644 --- a/themes/Backend/ExtJs/backend/category/controller/main.js +++ b/themes/Backend/ExtJs/backend/category/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Category diff --git a/themes/Backend/ExtJs/backend/category/controller/manual_sorting.js b/themes/Backend/ExtJs/backend/category/controller/manual_sorting.js index 0d80c90ca20..9530fc3012f 100644 --- a/themes/Backend/ExtJs/backend/category/controller/manual_sorting.js +++ b/themes/Backend/ExtJs/backend/category/controller/manual_sorting.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Category diff --git a/themes/Backend/ExtJs/backend/category/controller/multi_request.js b/themes/Backend/ExtJs/backend/category/controller/multi_request.js index be1b17dfce5..32feda8f4ca 100644 --- a/themes/Backend/ExtJs/backend/category/controller/multi_request.js +++ b/themes/Backend/ExtJs/backend/category/controller/multi_request.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Category diff --git a/themes/Backend/ExtJs/backend/category/controller/settings.js b/themes/Backend/ExtJs/backend/category/controller/settings.js index 263961e5427..aa10c34fa4c 100644 --- a/themes/Backend/ExtJs/backend/category/controller/settings.js +++ b/themes/Backend/ExtJs/backend/category/controller/settings.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Category diff --git a/themes/Backend/ExtJs/backend/category/controller/tree.js b/themes/Backend/ExtJs/backend/category/controller/tree.js index 789f39ee6ec..8cbea2ebf61 100644 --- a/themes/Backend/ExtJs/backend/category/controller/tree.js +++ b/themes/Backend/ExtJs/backend/category/controller/tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Category diff --git a/themes/Backend/ExtJs/backend/category/model/detail.js b/themes/Backend/ExtJs/backend/category/model/detail.js index 4cc078d3774..0e10065977b 100644 --- a/themes/Backend/ExtJs/backend/category/model/detail.js +++ b/themes/Backend/ExtJs/backend/category/model/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/category/model/emotion.js b/themes/Backend/ExtJs/backend/category/model/emotion.js index 0dcd4fa5891..a19c2fd6047 100644 --- a/themes/Backend/ExtJs/backend/category/model/emotion.js +++ b/themes/Backend/ExtJs/backend/category/model/emotion.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/category/model/manual_sorting.js b/themes/Backend/ExtJs/backend/category/model/manual_sorting.js index e205c86262e..37956046c2b 100644 --- a/themes/Backend/ExtJs/backend/category/model/manual_sorting.js +++ b/themes/Backend/ExtJs/backend/category/model/manual_sorting.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/category/model/product_assignment.js b/themes/Backend/ExtJs/backend/category/model/product_assignment.js index a10bbb3f197..52afb0cf668 100644 --- a/themes/Backend/ExtJs/backend/category/model/product_assignment.js +++ b/themes/Backend/ExtJs/backend/category/model/product_assignment.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/category/model/product_assignment"} Ext.define('Shopware.apps.Category.model.ProductAssignment', { diff --git a/themes/Backend/ExtJs/backend/category/model/template.js b/themes/Backend/ExtJs/backend/category/model/template.js index 78bf21a066a..b4a71d23a0a 100644 --- a/themes/Backend/ExtJs/backend/category/model/template.js +++ b/themes/Backend/ExtJs/backend/category/model/template.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Category diff --git a/themes/Backend/ExtJs/backend/category/model/tree.js b/themes/Backend/ExtJs/backend/category/model/tree.js index 5f51801ab85..953b5efa102 100644 --- a/themes/Backend/ExtJs/backend/category/model/tree.js +++ b/themes/Backend/ExtJs/backend/category/model/tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/category/store/assigned_products.js b/themes/Backend/ExtJs/backend/category/store/assigned_products.js index 042ee818d5e..3c0a2573f1e 100644 --- a/themes/Backend/ExtJs/backend/category/store/assigned_products.js +++ b/themes/Backend/ExtJs/backend/category/store/assigned_products.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/category/store/available_products.js b/themes/Backend/ExtJs/backend/category/store/available_products.js index fb336b612d5..6902188212b 100644 --- a/themes/Backend/ExtJs/backend/category/store/available_products.js +++ b/themes/Backend/ExtJs/backend/category/store/available_products.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/category/store/category_path.js b/themes/Backend/ExtJs/backend/category/store/category_path.js index 6837f5c724f..711ae4a6c6d 100644 --- a/themes/Backend/ExtJs/backend/category/store/category_path.js +++ b/themes/Backend/ExtJs/backend/category/store/category_path.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ Ext.define('Shopware.apps.Category.store.CategoryPath', { diff --git a/themes/Backend/ExtJs/backend/category/store/customer_groups.js b/themes/Backend/ExtJs/backend/category/store/customer_groups.js index f39d5bf7427..efd48cd6ea1 100644 --- a/themes/Backend/ExtJs/backend/category/store/customer_groups.js +++ b/themes/Backend/ExtJs/backend/category/store/customer_groups.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Category diff --git a/themes/Backend/ExtJs/backend/category/store/detail.js b/themes/Backend/ExtJs/backend/category/store/detail.js index 07138922c13..8265e36d062 100644 --- a/themes/Backend/ExtJs/backend/category/store/detail.js +++ b/themes/Backend/ExtJs/backend/category/store/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/category/store/manual_sorting.js b/themes/Backend/ExtJs/backend/category/store/manual_sorting.js index c742d67284b..51462427a19 100644 --- a/themes/Backend/ExtJs/backend/category/store/manual_sorting.js +++ b/themes/Backend/ExtJs/backend/category/store/manual_sorting.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/category/store/manual_sort"} diff --git a/themes/Backend/ExtJs/backend/category/store/template.js b/themes/Backend/ExtJs/backend/category/store/template.js index 63c606883ae..f17b7bd4921 100644 --- a/themes/Backend/ExtJs/backend/category/store/template.js +++ b/themes/Backend/ExtJs/backend/category/store/template.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Category diff --git a/themes/Backend/ExtJs/backend/category/store/tree.js b/themes/Backend/ExtJs/backend/category/store/tree.js index a022e111e42..b22106fd5a9 100644 --- a/themes/Backend/ExtJs/backend/category/store/tree.js +++ b/themes/Backend/ExtJs/backend/category/store/tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/category/view/category/tabs/article_mapping.js b/themes/Backend/ExtJs/backend/category/view/category/tabs/article_mapping.js index dd0949b63e8..a8c90e645d3 100644 --- a/themes/Backend/ExtJs/backend/category/view/category/tabs/article_mapping.js +++ b/themes/Backend/ExtJs/backend/category/view/category/tabs/article_mapping.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Category diff --git a/themes/Backend/ExtJs/backend/category/view/category/tabs/custom_listing.js b/themes/Backend/ExtJs/backend/category/view/category/tabs/custom_listing.js index 1230eb74ab4..9b50bc5f18f 100644 --- a/themes/Backend/ExtJs/backend/category/view/category/tabs/custom_listing.js +++ b/themes/Backend/ExtJs/backend/category/view/category/tabs/custom_listing.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Category diff --git a/themes/Backend/ExtJs/backend/category/view/category/tabs/restriction.js b/themes/Backend/ExtJs/backend/category/view/category/tabs/restriction.js index 091eda57f9b..b8a650cb9ef 100644 --- a/themes/Backend/ExtJs/backend/category/view/category/tabs/restriction.js +++ b/themes/Backend/ExtJs/backend/category/view/category/tabs/restriction.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Category diff --git a/themes/Backend/ExtJs/backend/category/view/category/tabs/settings.js b/themes/Backend/ExtJs/backend/category/view/category/tabs/settings.js index 65761c18e29..c18cfd850c6 100644 --- a/themes/Backend/ExtJs/backend/category/view/category/tabs/settings.js +++ b/themes/Backend/ExtJs/backend/category/view/category/tabs/settings.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Category diff --git a/themes/Backend/ExtJs/backend/category/view/category/tree.js b/themes/Backend/ExtJs/backend/category/view/category/tree.js index 103127d8eb1..b78417fa890 100644 --- a/themes/Backend/ExtJs/backend/category/view/category/tree.js +++ b/themes/Backend/ExtJs/backend/category/view/category/tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Category diff --git a/themes/Backend/ExtJs/backend/category/view/fields/shop_grid.js b/themes/Backend/ExtJs/backend/category/view/fields/shop_grid.js index e0b71fab137..eebb91082a2 100644 --- a/themes/Backend/ExtJs/backend/category/view/fields/shop_grid.js +++ b/themes/Backend/ExtJs/backend/category/view/fields/shop_grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Category diff --git a/themes/Backend/ExtJs/backend/category/view/main/duplicate_settings.js b/themes/Backend/ExtJs/backend/category/view/main/duplicate_settings.js index dddb4b82948..40e96da2946 100644 --- a/themes/Backend/ExtJs/backend/category/view/main/duplicate_settings.js +++ b/themes/Backend/ExtJs/backend/category/view/main/duplicate_settings.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /* {namespace name="backend/category/main"} */ diff --git a/themes/Backend/ExtJs/backend/category/view/main/duplicate_tasks.js b/themes/Backend/ExtJs/backend/category/view/main/duplicate_tasks.js index f132a05e352..daaf21a27e7 100644 --- a/themes/Backend/ExtJs/backend/category/view/main/duplicate_tasks.js +++ b/themes/Backend/ExtJs/backend/category/view/main/duplicate_tasks.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /* {namespace name="backend/category/main"} */ diff --git a/themes/Backend/ExtJs/backend/category/view/main/multi_request_tasks.js b/themes/Backend/ExtJs/backend/category/view/main/multi_request_tasks.js index a37b3714865..f5270cede5b 100644 --- a/themes/Backend/ExtJs/backend/category/view/main/multi_request_tasks.js +++ b/themes/Backend/ExtJs/backend/category/view/main/multi_request_tasks.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /* {namespace name="backend/category/main"} */ diff --git a/themes/Backend/ExtJs/backend/category/view/main/window.js b/themes/Backend/ExtJs/backend/category/view/main/window.js index 1ac46009c60..a79318428d4 100644 --- a/themes/Backend/ExtJs/backend/category/view/main/window.js +++ b/themes/Backend/ExtJs/backend/category/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Category diff --git a/themes/Backend/ExtJs/backend/category/view/sorting/grid.js b/themes/Backend/ExtJs/backend/category/view/sorting/grid.js index acbea15a17d..ac7fc8d394b 100644 --- a/themes/Backend/ExtJs/backend/category/view/sorting/grid.js +++ b/themes/Backend/ExtJs/backend/category/view/sorting/grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Category diff --git a/themes/Backend/ExtJs/backend/category/view/sorting/tab.js b/themes/Backend/ExtJs/backend/category/view/sorting/tab.js index 3f75820a4b8..2abf66f1863 100644 --- a/themes/Backend/ExtJs/backend/category/view/sorting/tab.js +++ b/themes/Backend/ExtJs/backend/category/view/sorting/tab.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Category diff --git a/themes/Backend/ExtJs/backend/category/view/sorting/table.js b/themes/Backend/ExtJs/backend/category/view/sorting/table.js index 05571858274..332ca110bbf 100644 --- a/themes/Backend/ExtJs/backend/category/view/sorting/table.js +++ b/themes/Backend/ExtJs/backend/category/view/sorting/table.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Category diff --git a/themes/Backend/ExtJs/backend/config/app.js b/themes/Backend/ExtJs/backend/config/app.js index a404c4002b4..7ca39c8b207 100644 --- a/themes/Backend/ExtJs/backend/config/app.js +++ b/themes/Backend/ExtJs/backend/config/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Cache diff --git a/themes/Backend/ExtJs/backend/config/controller/document.js b/themes/Backend/ExtJs/backend/config/controller/document.js index 684558d5803..b81c840d3eb 100644 --- a/themes/Backend/ExtJs/backend/config/controller/document.js +++ b/themes/Backend/ExtJs/backend/config/controller/document.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/controller/form.js b/themes/Backend/ExtJs/backend/config/controller/form.js index 871df5eb500..51b18f6bb97 100644 --- a/themes/Backend/ExtJs/backend/config/controller/form.js +++ b/themes/Backend/ExtJs/backend/config/controller/form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/controller/main.js b/themes/Backend/ExtJs/backend/config/controller/main.js index 5e608b878c7..c36d39d9b2c 100644 --- a/themes/Backend/ExtJs/backend/config/controller/main.js +++ b/themes/Backend/ExtJs/backend/config/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/form/country.js b/themes/Backend/ExtJs/backend/config/model/form/country.js index ebc2a29cf15..ffee601c11f 100644 --- a/themes/Backend/ExtJs/backend/config/model/form/country.js +++ b/themes/Backend/ExtJs/backend/config/model/form/country.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/form/country_area.js b/themes/Backend/ExtJs/backend/config/model/form/country_area.js index 93936cf94fa..6e3849e9600 100644 --- a/themes/Backend/ExtJs/backend/config/model/form/country_area.js +++ b/themes/Backend/ExtJs/backend/config/model/form/country_area.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/form/cron_job.js b/themes/Backend/ExtJs/backend/config/model/form/cron_job.js index dd359efc061..85b2b8e3bcf 100644 --- a/themes/Backend/ExtJs/backend/config/model/form/cron_job.js +++ b/themes/Backend/ExtJs/backend/config/model/form/cron_job.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/form/currency.js b/themes/Backend/ExtJs/backend/config/model/form/currency.js index 1a4d8f874fc..26bfe45e988 100644 --- a/themes/Backend/ExtJs/backend/config/model/form/currency.js +++ b/themes/Backend/ExtJs/backend/config/model/form/currency.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/form/customer_group.js b/themes/Backend/ExtJs/backend/config/model/form/customer_group.js index 49290625fc0..69a5af879ef 100644 --- a/themes/Backend/ExtJs/backend/config/model/form/customer_group.js +++ b/themes/Backend/ExtJs/backend/config/model/form/customer_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/form/document.js b/themes/Backend/ExtJs/backend/config/model/form/document.js index d2215805c6f..66e138d7f8b 100644 --- a/themes/Backend/ExtJs/backend/config/model/form/document.js +++ b/themes/Backend/ExtJs/backend/config/model/form/document.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/form/document_element.js b/themes/Backend/ExtJs/backend/config/model/form/document_element.js index bae361860ac..9e76d126491 100644 --- a/themes/Backend/ExtJs/backend/config/model/form/document_element.js +++ b/themes/Backend/ExtJs/backend/config/model/form/document_element.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/form/locale.js b/themes/Backend/ExtJs/backend/config/model/form/locale.js index b5d35d7cfb6..979d818413c 100644 --- a/themes/Backend/ExtJs/backend/config/model/form/locale.js +++ b/themes/Backend/ExtJs/backend/config/model/form/locale.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/form/number.js b/themes/Backend/ExtJs/backend/config/model/form/number.js index 49eed3368cb..ffc739c4893 100644 --- a/themes/Backend/ExtJs/backend/config/model/form/number.js +++ b/themes/Backend/ExtJs/backend/config/model/form/number.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/form/page_group.js b/themes/Backend/ExtJs/backend/config/model/form/page_group.js index c81eae0e4c6..f857db2627b 100644 --- a/themes/Backend/ExtJs/backend/config/model/form/page_group.js +++ b/themes/Backend/ExtJs/backend/config/model/form/page_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/form/price_group.js b/themes/Backend/ExtJs/backend/config/model/form/price_group.js index 461da249da0..0cd12616e0e 100644 --- a/themes/Backend/ExtJs/backend/config/model/form/price_group.js +++ b/themes/Backend/ExtJs/backend/config/model/form/price_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/form/search_field.js b/themes/Backend/ExtJs/backend/config/model/form/search_field.js index 84ac3ea099d..21b0a47d0d2 100644 --- a/themes/Backend/ExtJs/backend/config/model/form/search_field.js +++ b/themes/Backend/ExtJs/backend/config/model/form/search_field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/form/search_table.js b/themes/Backend/ExtJs/backend/config/model/form/search_table.js index c599c991c25..081e517685a 100644 --- a/themes/Backend/ExtJs/backend/config/model/form/search_table.js +++ b/themes/Backend/ExtJs/backend/config/model/form/search_table.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/form/shop.js b/themes/Backend/ExtJs/backend/config/model/form/shop.js index cb0d7844cd5..0284e958015 100644 --- a/themes/Backend/ExtJs/backend/config/model/form/shop.js +++ b/themes/Backend/ExtJs/backend/config/model/form/shop.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/form/tax.js b/themes/Backend/ExtJs/backend/config/model/form/tax.js index 8265b336aaf..394b702dc02 100644 --- a/themes/Backend/ExtJs/backend/config/model/form/tax.js +++ b/themes/Backend/ExtJs/backend/config/model/form/tax.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/form/unit.js b/themes/Backend/ExtJs/backend/config/model/form/unit.js index b95486a2868..0d5972df5ea 100644 --- a/themes/Backend/ExtJs/backend/config/model/form/unit.js +++ b/themes/Backend/ExtJs/backend/config/model/form/unit.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/form/widget.js b/themes/Backend/ExtJs/backend/config/model/form/widget.js index b2c1e2ecfad..bc70786bb68 100644 --- a/themes/Backend/ExtJs/backend/config/model/form/widget.js +++ b/themes/Backend/ExtJs/backend/config/model/form/widget.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/form/widget_view.js b/themes/Backend/ExtJs/backend/config/model/form/widget_view.js index 106f6be7f31..1d2ccd408ba 100644 --- a/themes/Backend/ExtJs/backend/config/model/form/widget_view.js +++ b/themes/Backend/ExtJs/backend/config/model/form/widget_view.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/main/element.js b/themes/Backend/ExtJs/backend/config/model/main/element.js index fc6aa23ffc2..ba0f8113f59 100644 --- a/themes/Backend/ExtJs/backend/config/model/main/element.js +++ b/themes/Backend/ExtJs/backend/config/model/main/element.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/main/element_translation.js b/themes/Backend/ExtJs/backend/config/model/main/element_translation.js index cd391f6f062..e14ba9846b0 100644 --- a/themes/Backend/ExtJs/backend/config/model/main/element_translation.js +++ b/themes/Backend/ExtJs/backend/config/model/main/element_translation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/main/form.js b/themes/Backend/ExtJs/backend/config/model/main/form.js index 9c6aeab0dc6..8010baf0206 100644 --- a/themes/Backend/ExtJs/backend/config/model/main/form.js +++ b/themes/Backend/ExtJs/backend/config/model/main/form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/main/form_translation.js b/themes/Backend/ExtJs/backend/config/model/main/form_translation.js index cc5262cf34d..f02d8f6cb37 100644 --- a/themes/Backend/ExtJs/backend/config/model/main/form_translation.js +++ b/themes/Backend/ExtJs/backend/config/model/main/form_translation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/main/navigation.js b/themes/Backend/ExtJs/backend/config/model/main/navigation.js index 2669061983e..cf5d27b15ac 100644 --- a/themes/Backend/ExtJs/backend/config/model/main/navigation.js +++ b/themes/Backend/ExtJs/backend/config/model/main/navigation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/model/main/value.js b/themes/Backend/ExtJs/backend/config/model/main/value.js index 44fbfba38e2..72e61aeac62 100644 --- a/themes/Backend/ExtJs/backend/config/model/main/value.js +++ b/themes/Backend/ExtJs/backend/config/model/main/value.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/store/base/page_group.js b/themes/Backend/ExtJs/backend/config/store/base/page_group.js index 2a6693a6429..73c2bc5428b 100644 --- a/themes/Backend/ExtJs/backend/config/store/base/page_group.js +++ b/themes/Backend/ExtJs/backend/config/store/base/page_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/base/search_table.js b/themes/Backend/ExtJs/backend/config/store/base/search_table.js index ef78846d2c9..9e47a18f166 100644 --- a/themes/Backend/ExtJs/backend/config/store/base/search_table.js +++ b/themes/Backend/ExtJs/backend/config/store/base/search_table.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/detail/country.js b/themes/Backend/ExtJs/backend/config/store/detail/country.js index 107d527c995..1dea8180a4d 100644 --- a/themes/Backend/ExtJs/backend/config/store/detail/country.js +++ b/themes/Backend/ExtJs/backend/config/store/detail/country.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/detail/customer_group.js b/themes/Backend/ExtJs/backend/config/store/detail/customer_group.js index 950077200a6..ed0ab4b081a 100644 --- a/themes/Backend/ExtJs/backend/config/store/detail/customer_group.js +++ b/themes/Backend/ExtJs/backend/config/store/detail/customer_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/detail/document.js b/themes/Backend/ExtJs/backend/config/store/detail/document.js index 08c794364eb..ca3353bc511 100644 --- a/themes/Backend/ExtJs/backend/config/store/detail/document.js +++ b/themes/Backend/ExtJs/backend/config/store/detail/document.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/detail/page_group.js b/themes/Backend/ExtJs/backend/config/store/detail/page_group.js index b9f08d25ec0..b3f071d02dd 100644 --- a/themes/Backend/ExtJs/backend/config/store/detail/page_group.js +++ b/themes/Backend/ExtJs/backend/config/store/detail/page_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/detail/price_group.js b/themes/Backend/ExtJs/backend/config/store/detail/price_group.js index ad30050bc54..49b7c76134c 100644 --- a/themes/Backend/ExtJs/backend/config/store/detail/price_group.js +++ b/themes/Backend/ExtJs/backend/config/store/detail/price_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/detail/shop.js b/themes/Backend/ExtJs/backend/config/store/detail/shop.js index 491ffed1297..c0190af7d9c 100644 --- a/themes/Backend/ExtJs/backend/config/store/detail/shop.js +++ b/themes/Backend/ExtJs/backend/config/store/detail/shop.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/detail/tax.js b/themes/Backend/ExtJs/backend/config/store/detail/tax.js index 47c9c8b8390..2576c9892c9 100644 --- a/themes/Backend/ExtJs/backend/config/store/detail/tax.js +++ b/themes/Backend/ExtJs/backend/config/store/detail/tax.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/form/attribute.js b/themes/Backend/ExtJs/backend/config/store/form/attribute.js index fbedee2e5bf..e777fe298d7 100644 --- a/themes/Backend/ExtJs/backend/config/store/form/attribute.js +++ b/themes/Backend/ExtJs/backend/config/store/form/attribute.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/form/country.js b/themes/Backend/ExtJs/backend/config/store/form/country.js index 9a1e588c31b..48e976c3a95 100644 --- a/themes/Backend/ExtJs/backend/config/store/form/country.js +++ b/themes/Backend/ExtJs/backend/config/store/form/country.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/form/country_area.js b/themes/Backend/ExtJs/backend/config/store/form/country_area.js index 5c4d3ab7c8f..4f55fb69d32 100644 --- a/themes/Backend/ExtJs/backend/config/store/form/country_area.js +++ b/themes/Backend/ExtJs/backend/config/store/form/country_area.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/form/cron_job.js b/themes/Backend/ExtJs/backend/config/store/form/cron_job.js index 279eda806b0..530b35c5c2b 100644 --- a/themes/Backend/ExtJs/backend/config/store/form/cron_job.js +++ b/themes/Backend/ExtJs/backend/config/store/form/cron_job.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/form/currency.js b/themes/Backend/ExtJs/backend/config/store/form/currency.js index 6ca5d7baec6..4483a5caf99 100644 --- a/themes/Backend/ExtJs/backend/config/store/form/currency.js +++ b/themes/Backend/ExtJs/backend/config/store/form/currency.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/form/customer_group.js b/themes/Backend/ExtJs/backend/config/store/form/customer_group.js index fe01a3913c5..ab4b7f6be7c 100644 --- a/themes/Backend/ExtJs/backend/config/store/form/customer_group.js +++ b/themes/Backend/ExtJs/backend/config/store/form/customer_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/form/document.js b/themes/Backend/ExtJs/backend/config/store/form/document.js index 37f7c2cdd70..53c8de9e1ae 100644 --- a/themes/Backend/ExtJs/backend/config/store/form/document.js +++ b/themes/Backend/ExtJs/backend/config/store/form/document.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/form/locale.js b/themes/Backend/ExtJs/backend/config/store/form/locale.js index 4db7ffeebab..63e18045582 100644 --- a/themes/Backend/ExtJs/backend/config/store/form/locale.js +++ b/themes/Backend/ExtJs/backend/config/store/form/locale.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/form/number.js b/themes/Backend/ExtJs/backend/config/store/form/number.js index 125833ea7eb..cfb51ae18a4 100644 --- a/themes/Backend/ExtJs/backend/config/store/form/number.js +++ b/themes/Backend/ExtJs/backend/config/store/form/number.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/form/page_group.js b/themes/Backend/ExtJs/backend/config/store/form/page_group.js index 04bcee31ceb..cfae8a1cd1c 100644 --- a/themes/Backend/ExtJs/backend/config/store/form/page_group.js +++ b/themes/Backend/ExtJs/backend/config/store/form/page_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/form/price_group.js b/themes/Backend/ExtJs/backend/config/store/form/price_group.js index 2bcf7a932f1..baee6d45bd7 100644 --- a/themes/Backend/ExtJs/backend/config/store/form/price_group.js +++ b/themes/Backend/ExtJs/backend/config/store/form/price_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/form/search_field.js b/themes/Backend/ExtJs/backend/config/store/form/search_field.js index a58d7b4f8ea..3020ed6723c 100644 --- a/themes/Backend/ExtJs/backend/config/store/form/search_field.js +++ b/themes/Backend/ExtJs/backend/config/store/form/search_field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/form/shop.js b/themes/Backend/ExtJs/backend/config/store/form/shop.js index ea628392a2c..e4098b7680d 100644 --- a/themes/Backend/ExtJs/backend/config/store/form/shop.js +++ b/themes/Backend/ExtJs/backend/config/store/form/shop.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/form/tax.js b/themes/Backend/ExtJs/backend/config/store/form/tax.js index 96189de5270..a94b3aecd17 100644 --- a/themes/Backend/ExtJs/backend/config/store/form/tax.js +++ b/themes/Backend/ExtJs/backend/config/store/form/tax.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/form/unit.js b/themes/Backend/ExtJs/backend/config/store/form/unit.js index 2c7f164065f..45d0c419f54 100644 --- a/themes/Backend/ExtJs/backend/config/store/form/unit.js +++ b/themes/Backend/ExtJs/backend/config/store/form/unit.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/form/widget.js b/themes/Backend/ExtJs/backend/config/store/form/widget.js index 2177bf15b12..515df76e09b 100644 --- a/themes/Backend/ExtJs/backend/config/store/form/widget.js +++ b/themes/Backend/ExtJs/backend/config/store/form/widget.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/form/widget_view.js b/themes/Backend/ExtJs/backend/config/store/form/widget_view.js index 24f247907de..142b05f2416 100644 --- a/themes/Backend/ExtJs/backend/config/store/form/widget_view.js +++ b/themes/Backend/ExtJs/backend/config/store/form/widget_view.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/store/main/form.js b/themes/Backend/ExtJs/backend/config/store/main/form.js index 02f306183a6..9aec2d99d86 100644 --- a/themes/Backend/ExtJs/backend/config/store/main/form.js +++ b/themes/Backend/ExtJs/backend/config/store/main/form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/store/main/navigation.js b/themes/Backend/ExtJs/backend/config/store/main/navigation.js index f639c0bfb59..d69ffb9c58b 100644 --- a/themes/Backend/ExtJs/backend/config/store/main/navigation.js +++ b/themes/Backend/ExtJs/backend/config/store/main/navigation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/view/base/detail.js b/themes/Backend/ExtJs/backend/config/view/base/detail.js index dbb2d2e6673..3893b4772fa 100644 --- a/themes/Backend/ExtJs/backend/config/view/base/detail.js +++ b/themes/Backend/ExtJs/backend/config/view/base/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/base/form.js b/themes/Backend/ExtJs/backend/config/view/base/form.js index 6f8c55fe631..38c91d451cc 100644 --- a/themes/Backend/ExtJs/backend/config/view/base/form.js +++ b/themes/Backend/ExtJs/backend/config/view/base/form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/base/property.js b/themes/Backend/ExtJs/backend/config/view/base/property.js index 2cb7a7222ad..a0585176832 100644 --- a/themes/Backend/ExtJs/backend/config/view/base/property.js +++ b/themes/Backend/ExtJs/backend/config/view/base/property.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/base/search.js b/themes/Backend/ExtJs/backend/config/view/base/search.js index e9cb50d7c64..a69c76dd5e6 100644 --- a/themes/Backend/ExtJs/backend/config/view/base/search.js +++ b/themes/Backend/ExtJs/backend/config/view/base/search.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/base/table.js b/themes/Backend/ExtJs/backend/config/view/base/table.js index 9bc2d8deece..053db1be294 100644 --- a/themes/Backend/ExtJs/backend/config/view/base/table.js +++ b/themes/Backend/ExtJs/backend/config/view/base/table.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/common/listing.js b/themes/Backend/ExtJs/backend/config/view/custom_search/common/listing.js index 48025c86ca1..e33f3b94a2f 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/common/listing.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/common/listing.js @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/common"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/category_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/category_facet.js index 72e4870d8d5..f14d656ef86 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/category_facet.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/category_facet.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/combined_condition_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/combined_condition_facet.js index 86d4c1a372b..f1b01a8e0ba 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/combined_condition_facet.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/combined_condition_facet.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/condition_selection.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/condition_selection.js index e10ce085d62..8a0e20dee55 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/condition_selection.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/condition_selection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/facet_interface.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/facet_interface.js index c73c6cf6b51..769f4f6ba9e 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/facet_interface.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/facet_interface.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/height_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/height_facet.js index e5c020765d9..729d30fcbeb 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/height_facet.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/height_facet.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/immediate_delivery_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/immediate_delivery_facet.js index 5315be82ee6..9e900c373cb 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/immediate_delivery_facet.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/immediate_delivery_facet.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/length_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/length_facet.js index fe837d01c4b..c78920fad15 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/length_facet.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/length_facet.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/manufacturer_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/manufacturer_facet.js index 9425bbebf54..632506b9178 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/manufacturer_facet.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/manufacturer_facet.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/price_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/price_facet.js index 0086f1e0558..82f7307e5a0 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/price_facet.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/price_facet.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/product_attribute_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/product_attribute_facet.js index 1fcf5928a23..4d6e79bc9ae 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/product_attribute_facet.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/product_attribute_facet.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/property_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/property_facet.js index 4460448ac86..7b2c8b73cfd 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/property_facet.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/property_facet.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/shipping_free_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/shipping_free_facet.js index 869e84042db..c619c3816d4 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/shipping_free_facet.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/shipping_free_facet.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/variant_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/variant_facet.js index 2b5c27c6484..11ad03971af 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/variant_facet.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/variant_facet.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/config/view/variant_filter"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/vote_average_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/vote_average_facet.js index c3f758fa96d..0bc3c078fd6 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/vote_average_facet.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/vote_average_facet.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/weight_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/weight_facet.js index c910d72a33f..ff9310616a2 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/weight_facet.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/weight_facet.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/width_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/width_facet.js index 2310e17b73e..b9ab511f129 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/width_facet.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/width_facet.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/detail.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/detail.js index 60b169cb99b..3e082b1d8b0 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/detail.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/facet.js index 93cb4c450b4..ff223f7855e 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/facet.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/facet.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/listing.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/listing.js index 9176db82ff6..5c86e0a36cc 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/listing.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/listing.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/overview.js b/themes/Backend/ExtJs/backend/config/view/custom_search/overview.js index e0ba696ebdd..af0b7c7ed26 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/overview.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/overview.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/manual_sorting.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/manual_sorting.js index 262efa3e347..24f5198097e 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/manual_sorting.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/manual_sorting.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/popularity_sorting.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/popularity_sorting.js index cbabaab65dd..a7d53a64a31 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/popularity_sorting.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/popularity_sorting.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/price_sorting.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/price_sorting.js index c3af5f4f208..078be5cce6c 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/price_sorting.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/price_sorting.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_attribute_sorting.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_attribute_sorting.js index 7f0498d3781..4d1d9b63174 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_attribute_sorting.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_attribute_sorting.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_name_sorting.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_name_sorting.js index 989a51bff0f..432828f3088 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_name_sorting.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_name_sorting.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_number_sorting.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_number_sorting.js index 7378b5c655d..e295dc36f9a 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_number_sorting.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_number_sorting.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_stock_sorting.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_stock_sorting.js index ed50c8c6fa3..2b14ef769f9 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_stock_sorting.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_stock_sorting.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/release_date_sorting.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/release_date_sorting.js index 56a80fb85e0..aab5f8e91c8 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/release_date_sorting.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/release_date_sorting.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/search_ranking_sorting.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/search_ranking_sorting.js index fac746aeaef..5a36f89fd42 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/search_ranking_sorting.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/search_ranking_sorting.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/sorting_interface.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/sorting_interface.js index 8823849fb5e..49da84acc3e 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/sorting_interface.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/sorting_interface.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ Ext.define('Shopware.apps.Config.view.custom_search.sorting.classes.SortingInterface', { diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/detail.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/detail.js index 39717f864fe..249ed490592 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/detail.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/includes/create_window.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/includes/create_window.js index 21fab7cc754..5c0c7e41b03 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/includes/create_window.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/includes/create_window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/includes/direction_combo.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/includes/direction_combo.js index f0421ade34b..5b2fd20a93e 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/includes/direction_combo.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/includes/direction_combo.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/listing.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/listing.js index fb2345fbebe..e74638b021b 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/listing.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/listing.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/sorting_selection.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/sorting_selection.js index df8c0ae19df..27993e3c0ae 100644 --- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/sorting_selection.js +++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/sorting_selection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ ///{namespace name="backend/custom_search/translation"} diff --git a/themes/Backend/ExtJs/backend/config/view/customer_group/detail.js b/themes/Backend/ExtJs/backend/config/view/customer_group/detail.js index 817df054f73..cda0723e701 100644 --- a/themes/Backend/ExtJs/backend/config/view/customer_group/detail.js +++ b/themes/Backend/ExtJs/backend/config/view/customer_group/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/customer_group/discount.js b/themes/Backend/ExtJs/backend/config/view/customer_group/discount.js index d1b8cbd673a..af68d9323fb 100644 --- a/themes/Backend/ExtJs/backend/config/view/customer_group/discount.js +++ b/themes/Backend/ExtJs/backend/config/view/customer_group/discount.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/element/custom_facet_grid.js b/themes/Backend/ExtJs/backend/config/view/element/custom_facet_grid.js index e8bc0c10275..3333253c2ce 100644 --- a/themes/Backend/ExtJs/backend/config/view/element/custom_facet_grid.js +++ b/themes/Backend/ExtJs/backend/config/view/element/custom_facet_grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ Ext.define('Shopware.apps.Config.view.element.CustomFacetGrid', { diff --git a/themes/Backend/ExtJs/backend/config/view/element/custom_sorting_grid.js b/themes/Backend/ExtJs/backend/config/view/element/custom_sorting_grid.js index abeaf142f8a..0ed27dfaace 100644 --- a/themes/Backend/ExtJs/backend/config/view/element/custom_sorting_grid.js +++ b/themes/Backend/ExtJs/backend/config/view/element/custom_sorting_grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ Ext.define('Shopware.apps.Config.view.element.CustomSortingGrid', { diff --git a/themes/Backend/ExtJs/backend/config/view/element/custom_sorting_selection.js b/themes/Backend/ExtJs/backend/config/view/element/custom_sorting_selection.js index 6125dc853a2..bd01fa90311 100644 --- a/themes/Backend/ExtJs/backend/config/view/element/custom_sorting_selection.js +++ b/themes/Backend/ExtJs/backend/config/view/element/custom_sorting_selection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ Ext.define('Shopware.apps.Config.view.element.CustomSortingSelection', { diff --git a/themes/Backend/ExtJs/backend/config/view/form/core_license.js b/themes/Backend/ExtJs/backend/config/view/form/core_license.js index 96e4888165c..5ca19b747f1 100644 --- a/themes/Backend/ExtJs/backend/config/view/form/core_license.js +++ b/themes/Backend/ExtJs/backend/config/view/form/core_license.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/config/view/core_license"} diff --git a/themes/Backend/ExtJs/backend/config/view/form/country.js b/themes/Backend/ExtJs/backend/config/view/form/country.js index c43f2fdb5e2..6639165d8b2 100644 --- a/themes/Backend/ExtJs/backend/config/view/form/country.js +++ b/themes/Backend/ExtJs/backend/config/view/form/country.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/form/country_area.js b/themes/Backend/ExtJs/backend/config/view/form/country_area.js index 1fe5dd36f76..b78f12f751a 100644 --- a/themes/Backend/ExtJs/backend/config/view/form/country_area.js +++ b/themes/Backend/ExtJs/backend/config/view/form/country_area.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/form/cron_job.js b/themes/Backend/ExtJs/backend/config/view/form/cron_job.js index 064fccbee8a..0441eb948d4 100644 --- a/themes/Backend/ExtJs/backend/config/view/form/cron_job.js +++ b/themes/Backend/ExtJs/backend/config/view/form/cron_job.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/form/currency.js b/themes/Backend/ExtJs/backend/config/view/form/currency.js index 0636db49db1..1aea7571bc7 100644 --- a/themes/Backend/ExtJs/backend/config/view/form/currency.js +++ b/themes/Backend/ExtJs/backend/config/view/form/currency.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/form/customer_group.js b/themes/Backend/ExtJs/backend/config/view/form/customer_group.js index 8d5fe814953..dc999e68085 100644 --- a/themes/Backend/ExtJs/backend/config/view/form/customer_group.js +++ b/themes/Backend/ExtJs/backend/config/view/form/customer_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/form/document.js b/themes/Backend/ExtJs/backend/config/view/form/document.js index a163e835c89..87ef12775ba 100644 --- a/themes/Backend/ExtJs/backend/config/view/form/document.js +++ b/themes/Backend/ExtJs/backend/config/view/form/document.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/form/locale.js b/themes/Backend/ExtJs/backend/config/view/form/locale.js index 5670e6e5c4d..77a1ccbf37d 100644 --- a/themes/Backend/ExtJs/backend/config/view/form/locale.js +++ b/themes/Backend/ExtJs/backend/config/view/form/locale.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/form/number.js b/themes/Backend/ExtJs/backend/config/view/form/number.js index 36110838a6c..d26ae8a9b61 100644 --- a/themes/Backend/ExtJs/backend/config/view/form/number.js +++ b/themes/Backend/ExtJs/backend/config/view/form/number.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/form/page_group.js b/themes/Backend/ExtJs/backend/config/view/form/page_group.js index c94d18b05d8..1615c5487e3 100644 --- a/themes/Backend/ExtJs/backend/config/view/form/page_group.js +++ b/themes/Backend/ExtJs/backend/config/view/form/page_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/form/price_group.js b/themes/Backend/ExtJs/backend/config/view/form/price_group.js index 9a7ca96dcdd..7721548ed92 100644 --- a/themes/Backend/ExtJs/backend/config/view/form/price_group.js +++ b/themes/Backend/ExtJs/backend/config/view/form/price_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/form/search.js b/themes/Backend/ExtJs/backend/config/view/form/search.js index beee31164e3..ae521c8f151 100644 --- a/themes/Backend/ExtJs/backend/config/view/form/search.js +++ b/themes/Backend/ExtJs/backend/config/view/form/search.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/config/view/search"} diff --git a/themes/Backend/ExtJs/backend/config/view/form/shop.js b/themes/Backend/ExtJs/backend/config/view/form/shop.js index 2b534517240..c5cf2973529 100644 --- a/themes/Backend/ExtJs/backend/config/view/form/shop.js +++ b/themes/Backend/ExtJs/backend/config/view/form/shop.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/form/tax.js b/themes/Backend/ExtJs/backend/config/view/form/tax.js index 5e456f50c3f..cf299fc4842 100644 --- a/themes/Backend/ExtJs/backend/config/view/form/tax.js +++ b/themes/Backend/ExtJs/backend/config/view/form/tax.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/form/unit.js b/themes/Backend/ExtJs/backend/config/view/form/unit.js index 7b21e3364b5..ef18457fa2f 100644 --- a/themes/Backend/ExtJs/backend/config/view/form/unit.js +++ b/themes/Backend/ExtJs/backend/config/view/form/unit.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/form/widget.js b/themes/Backend/ExtJs/backend/config/view/form/widget.js index 74d256d2f6d..bef9c27bd11 100644 --- a/themes/Backend/ExtJs/backend/config/view/form/widget.js +++ b/themes/Backend/ExtJs/backend/config/view/form/widget.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/main/fieldset.js b/themes/Backend/ExtJs/backend/config/view/main/fieldset.js index c3c94330885..045dd109e33 100644 --- a/themes/Backend/ExtJs/backend/config/view/main/fieldset.js +++ b/themes/Backend/ExtJs/backend/config/view/main/fieldset.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/config/view/main"} diff --git a/themes/Backend/ExtJs/backend/config/view/main/form.js b/themes/Backend/ExtJs/backend/config/view/main/form.js index 3aef0fee9df..54759506d35 100644 --- a/themes/Backend/ExtJs/backend/config/view/main/form.js +++ b/themes/Backend/ExtJs/backend/config/view/main/form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/main/navigation.js b/themes/Backend/ExtJs/backend/config/view/main/navigation.js index 42e6c63979c..93f820e0831 100644 --- a/themes/Backend/ExtJs/backend/config/view/main/navigation.js +++ b/themes/Backend/ExtJs/backend/config/view/main/navigation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/view/main/panel.js b/themes/Backend/ExtJs/backend/config/view/main/panel.js index a932c13195b..4769346a23e 100644 --- a/themes/Backend/ExtJs/backend/config/view/main/panel.js +++ b/themes/Backend/ExtJs/backend/config/view/main/panel.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/view/main/window.js b/themes/Backend/ExtJs/backend/config/view/main/window.js index 20f3f283a9c..ab5a64c219c 100644 --- a/themes/Backend/ExtJs/backend/config/view/main/window.js +++ b/themes/Backend/ExtJs/backend/config/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/config/view/shop/currency.js b/themes/Backend/ExtJs/backend/config/view/shop/currency.js index 684e4138db4..35bc96a80f4 100644 --- a/themes/Backend/ExtJs/backend/config/view/shop/currency.js +++ b/themes/Backend/ExtJs/backend/config/view/shop/currency.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/shop/detail.js b/themes/Backend/ExtJs/backend/config/view/shop/detail.js index e4c20b5003b..915f95a80ff 100644 --- a/themes/Backend/ExtJs/backend/config/view/shop/detail.js +++ b/themes/Backend/ExtJs/backend/config/view/shop/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/config/view/form"} diff --git a/themes/Backend/ExtJs/backend/config/view/shop/page.js b/themes/Backend/ExtJs/backend/config/view/shop/page.js index 2252fe243ac..f9b769ec94b 100644 --- a/themes/Backend/ExtJs/backend/config/view/shop/page.js +++ b/themes/Backend/ExtJs/backend/config/view/shop/page.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/tax/detail.js b/themes/Backend/ExtJs/backend/config/view/tax/detail.js index 445bff25d2f..71da7f7f9ee 100644 --- a/themes/Backend/ExtJs/backend/config/view/tax/detail.js +++ b/themes/Backend/ExtJs/backend/config/view/tax/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/tax/rule.js b/themes/Backend/ExtJs/backend/config/view/tax/rule.js index 10e9da7e91f..b49bee50ae4 100644 --- a/themes/Backend/ExtJs/backend/config/view/tax/rule.js +++ b/themes/Backend/ExtJs/backend/config/view/tax/rule.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/config/view/variant_filter/dynamic_variant_reader.js b/themes/Backend/ExtJs/backend/config/view/variant_filter/dynamic_variant_reader.js index 947d1ef7724..da158b0fa72 100644 --- a/themes/Backend/ExtJs/backend/config/view/variant_filter/dynamic_variant_reader.js +++ b/themes/Backend/ExtJs/backend/config/view/variant_filter/dynamic_variant_reader.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/config/view/variant_filter/dynamic_variant_reader"} diff --git a/themes/Backend/ExtJs/backend/config/view/variant_filter/expand_groups_grid.js b/themes/Backend/ExtJs/backend/config/view/variant_filter/expand_groups_grid.js index d2d3ad6b085..95e9e6a3312 100644 --- a/themes/Backend/ExtJs/backend/config/view/variant_filter/expand_groups_grid.js +++ b/themes/Backend/ExtJs/backend/config/view/variant_filter/expand_groups_grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/config/view/variant_filter"} diff --git a/themes/Backend/ExtJs/backend/config/view/variant_filter/expand_groups_hidden_field.js b/themes/Backend/ExtJs/backend/config/view/variant_filter/expand_groups_hidden_field.js index 2f3e96dd960..b9e435bcfb2 100644 --- a/themes/Backend/ExtJs/backend/config/view/variant_filter/expand_groups_hidden_field.js +++ b/themes/Backend/ExtJs/backend/config/view/variant_filter/expand_groups_hidden_field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/config/view/variant_filter/expand_groups_hidden_field"} diff --git a/themes/Backend/ExtJs/backend/content_type/app.js b/themes/Backend/ExtJs/backend/content_type/app.js index fd5d8d606eb..4ced72e474b 100644 --- a/themes/Backend/ExtJs/backend/content_type/app.js +++ b/themes/Backend/ExtJs/backend/content_type/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {block name="backend/content_type/app"} diff --git a/themes/Backend/ExtJs/backend/content_type/controller/main.js b/themes/Backend/ExtJs/backend/content_type/controller/main.js index 2700d285afd..f1f44707d79 100644 --- a/themes/Backend/ExtJs/backend/content_type/controller/main.js +++ b/themes/Backend/ExtJs/backend/content_type/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {block name="backend/content_type/controller/main"} diff --git a/themes/Backend/ExtJs/backend/content_type/model/content.js b/themes/Backend/ExtJs/backend/content_type/model/content.js index 1861bc939d0..b7359f5a225 100644 --- a/themes/Backend/ExtJs/backend/content_type/model/content.js +++ b/themes/Backend/ExtJs/backend/content_type/model/content.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {block name="backend/content_type/model/content"} diff --git a/themes/Backend/ExtJs/backend/content_type/store/content.js b/themes/Backend/ExtJs/backend/content_type/store/content.js index 61afadb4e00..b1a9af1fe15 100644 --- a/themes/Backend/ExtJs/backend/content_type/store/content.js +++ b/themes/Backend/ExtJs/backend/content_type/store/content.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {block name="backend/content_type/store/content"} diff --git a/themes/Backend/ExtJs/backend/content_type/view/detail/content.js b/themes/Backend/ExtJs/backend/content_type/view/detail/content.js index e7b76fc7f1d..b0bd1572609 100644 --- a/themes/Backend/ExtJs/backend/content_type/view/detail/content.js +++ b/themes/Backend/ExtJs/backend/content_type/view/detail/content.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {block name="backend/content_type/view/detail/content"} diff --git a/themes/Backend/ExtJs/backend/content_type/view/detail/window.js b/themes/Backend/ExtJs/backend/content_type/view/detail/window.js index 3eed9212326..5271f660d46 100644 --- a/themes/Backend/ExtJs/backend/content_type/view/detail/window.js +++ b/themes/Backend/ExtJs/backend/content_type/view/detail/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {block name="backend/content_type/view/detail/window"} diff --git a/themes/Backend/ExtJs/backend/content_type/view/fields/single_selection.js b/themes/Backend/ExtJs/backend/content_type/view/fields/single_selection.js index 3329420890e..fa9ffdc90e1 100644 --- a/themes/Backend/ExtJs/backend/content_type/view/fields/single_selection.js +++ b/themes/Backend/ExtJs/backend/content_type/view/fields/single_selection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {block name="backend/content_type/view/fields/single_selection"} diff --git a/themes/Backend/ExtJs/backend/content_type/view/fields/static_combobox.js b/themes/Backend/ExtJs/backend/content_type/view/fields/static_combobox.js index aa8bb4854a9..7a7d288ce4f 100644 --- a/themes/Backend/ExtJs/backend/content_type/view/fields/static_combobox.js +++ b/themes/Backend/ExtJs/backend/content_type/view/fields/static_combobox.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {block name="backend/content_type/view/fields/static_combobox"} diff --git a/themes/Backend/ExtJs/backend/content_type/view/list/content.js b/themes/Backend/ExtJs/backend/content_type/view/list/content.js index 77b335cbf10..3bc61cde1da 100644 --- a/themes/Backend/ExtJs/backend/content_type/view/list/content.js +++ b/themes/Backend/ExtJs/backend/content_type/view/list/content.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {block name="backend/content_type/view/list/content"} diff --git a/themes/Backend/ExtJs/backend/content_type/view/list/window.js b/themes/Backend/ExtJs/backend/content_type/view/list/window.js index c19eeca815b..63dba53903e 100644 --- a/themes/Backend/ExtJs/backend/content_type/view/list/window.js +++ b/themes/Backend/ExtJs/backend/content_type/view/list/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {block name="backend/content_type/view/list/window"} diff --git a/themes/Backend/ExtJs/backend/content_type_manager/app.js b/themes/Backend/ExtJs/backend/content_type_manager/app.js index 7b8a7f505ca..cee883df7a5 100644 --- a/themes/Backend/ExtJs/backend/content_type_manager/app.js +++ b/themes/Backend/ExtJs/backend/content_type_manager/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {block name="backend/content_type_manager/app"} diff --git a/themes/Backend/ExtJs/backend/content_type_manager/controller/detail.js b/themes/Backend/ExtJs/backend/content_type_manager/controller/detail.js index 1f50e9fb420..7a0fcd5ce90 100644 --- a/themes/Backend/ExtJs/backend/content_type_manager/controller/detail.js +++ b/themes/Backend/ExtJs/backend/content_type_manager/controller/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {block name="backend/content_type_manager/controller/detail"} diff --git a/themes/Backend/ExtJs/backend/content_type_manager/controller/field.js b/themes/Backend/ExtJs/backend/content_type_manager/controller/field.js index 2245e0476cd..2917ae64844 100644 --- a/themes/Backend/ExtJs/backend/content_type_manager/controller/field.js +++ b/themes/Backend/ExtJs/backend/content_type_manager/controller/field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {block name="backend/content_type_manager/controller/field"} diff --git a/themes/Backend/ExtJs/backend/content_type_manager/controller/main.js b/themes/Backend/ExtJs/backend/content_type_manager/controller/main.js index 9d62c96d1e1..b3fac7f4920 100644 --- a/themes/Backend/ExtJs/backend/content_type_manager/controller/main.js +++ b/themes/Backend/ExtJs/backend/content_type_manager/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {block name="backend/content_type_manager/controller/main"} diff --git a/themes/Backend/ExtJs/backend/content_type_manager/model/field.js b/themes/Backend/ExtJs/backend/content_type_manager/model/field.js index 491cf183573..c536af154d7 100644 --- a/themes/Backend/ExtJs/backend/content_type_manager/model/field.js +++ b/themes/Backend/ExtJs/backend/content_type_manager/model/field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {block name="backend/content_type_manager/model/field"} diff --git a/themes/Backend/ExtJs/backend/content_type_manager/model/type.js b/themes/Backend/ExtJs/backend/content_type_manager/model/type.js index 1548bf30b20..78ca752203b 100644 --- a/themes/Backend/ExtJs/backend/content_type_manager/model/type.js +++ b/themes/Backend/ExtJs/backend/content_type_manager/model/type.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {block name="backend/content_type_manager/model/type"} diff --git a/themes/Backend/ExtJs/backend/content_type_manager/model/url.js b/themes/Backend/ExtJs/backend/content_type_manager/model/url.js index 104b6b3f1c9..0ea33c66dfc 100644 --- a/themes/Backend/ExtJs/backend/content_type_manager/model/url.js +++ b/themes/Backend/ExtJs/backend/content_type_manager/model/url.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {block name="backend/content_type_manager/model/url"} diff --git a/themes/Backend/ExtJs/backend/content_type_manager/store/fields.js b/themes/Backend/ExtJs/backend/content_type_manager/store/fields.js index 86165fb8d10..3d0c65f9bee 100644 --- a/themes/Backend/ExtJs/backend/content_type_manager/store/fields.js +++ b/themes/Backend/ExtJs/backend/content_type_manager/store/fields.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {block name="backend/content_type_manager/store/fields"} diff --git a/themes/Backend/ExtJs/backend/content_type_manager/store/robots.js b/themes/Backend/ExtJs/backend/content_type_manager/store/robots.js index e332b699cc1..7e1dc14f82b 100644 --- a/themes/Backend/ExtJs/backend/content_type_manager/store/robots.js +++ b/themes/Backend/ExtJs/backend/content_type_manager/store/robots.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {namespace name="backend/content_type_manager/main"} diff --git a/themes/Backend/ExtJs/backend/content_type_manager/store/type.js b/themes/Backend/ExtJs/backend/content_type_manager/store/type.js index ca6b8692999..197aabba486 100644 --- a/themes/Backend/ExtJs/backend/content_type_manager/store/type.js +++ b/themes/Backend/ExtJs/backend/content_type_manager/store/type.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {block name="backend/content_type_manager/store/type"} diff --git a/themes/Backend/ExtJs/backend/content_type_manager/view/detail/fields.js b/themes/Backend/ExtJs/backend/content_type_manager/view/detail/fields.js index eafcf19c0c6..99f84d746d0 100644 --- a/themes/Backend/ExtJs/backend/content_type_manager/view/detail/fields.js +++ b/themes/Backend/ExtJs/backend/content_type_manager/view/detail/fields.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {namespace name="backend/content_type_manager/main"} diff --git a/themes/Backend/ExtJs/backend/content_type_manager/view/detail/type.js b/themes/Backend/ExtJs/backend/content_type_manager/view/detail/type.js index 4aef2ff27f0..3376a0ef3f1 100644 --- a/themes/Backend/ExtJs/backend/content_type_manager/view/detail/type.js +++ b/themes/Backend/ExtJs/backend/content_type_manager/view/detail/type.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {namespace name="backend/content_type_manager/main"} diff --git a/themes/Backend/ExtJs/backend/content_type_manager/view/detail/window.js b/themes/Backend/ExtJs/backend/content_type_manager/view/detail/window.js index 97c97194e3a..dc3aee6a459 100644 --- a/themes/Backend/ExtJs/backend/content_type_manager/view/detail/window.js +++ b/themes/Backend/ExtJs/backend/content_type_manager/view/detail/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {namespace name="backend/content_type_manager/main"} diff --git a/themes/Backend/ExtJs/backend/content_type_manager/view/field/fieldset.js b/themes/Backend/ExtJs/backend/content_type_manager/view/field/fieldset.js index 0b31a0ad5a3..5aa902fe07b 100644 --- a/themes/Backend/ExtJs/backend/content_type_manager/view/field/fieldset.js +++ b/themes/Backend/ExtJs/backend/content_type_manager/view/field/fieldset.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {namespace name="backend/content_type_manager/main"} diff --git a/themes/Backend/ExtJs/backend/content_type_manager/view/field/form.js b/themes/Backend/ExtJs/backend/content_type_manager/view/field/form.js index fa6db3881bb..7dcb0b0ede4 100644 --- a/themes/Backend/ExtJs/backend/content_type_manager/view/field/form.js +++ b/themes/Backend/ExtJs/backend/content_type_manager/view/field/form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {namespace name="backend/content_type_manager/main"} diff --git a/themes/Backend/ExtJs/backend/content_type_manager/view/field/window.js b/themes/Backend/ExtJs/backend/content_type_manager/view/field/window.js index 043c7bfa14e..0d4b6071377 100644 --- a/themes/Backend/ExtJs/backend/content_type_manager/view/field/window.js +++ b/themes/Backend/ExtJs/backend/content_type_manager/view/field/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {namespace name="backend/content_type_manager/main"} diff --git a/themes/Backend/ExtJs/backend/content_type_manager/view/field_handler/combobox_handler.js b/themes/Backend/ExtJs/backend/content_type_manager/view/field_handler/combobox_handler.js index 9c9153a528e..1f60143993d 100644 --- a/themes/Backend/ExtJs/backend/content_type_manager/view/field_handler/combobox_handler.js +++ b/themes/Backend/ExtJs/backend/content_type_manager/view/field_handler/combobox_handler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {namespace name="backend/content_type_manager/main"} diff --git a/themes/Backend/ExtJs/backend/content_type_manager/view/field_handler/integer_handler.js b/themes/Backend/ExtJs/backend/content_type_manager/view/field_handler/integer_handler.js index d4755209e7e..67337d48d97 100644 --- a/themes/Backend/ExtJs/backend/content_type_manager/view/field_handler/integer_handler.js +++ b/themes/Backend/ExtJs/backend/content_type_manager/view/field_handler/integer_handler.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {namespace name="backend/content_type_manager/main"} diff --git a/themes/Backend/ExtJs/backend/content_type_manager/view/list/grid.js b/themes/Backend/ExtJs/backend/content_type_manager/view/list/grid.js index 75425701def..cb97f3a77c8 100644 --- a/themes/Backend/ExtJs/backend/content_type_manager/view/list/grid.js +++ b/themes/Backend/ExtJs/backend/content_type_manager/view/list/grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {namespace name="backend/content_type_manager/main"} diff --git a/themes/Backend/ExtJs/backend/content_type_manager/view/list/window.js b/themes/Backend/ExtJs/backend/content_type_manager/view/list/window.js index 7c966d780f6..2b4b720e6f9 100644 --- a/themes/Backend/ExtJs/backend/content_type_manager/view/list/window.js +++ b/themes/Backend/ExtJs/backend/content_type_manager/view/list/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ // {namespace name="backend/content_type_manager/main"} diff --git a/themes/Backend/ExtJs/backend/customer/app.js b/themes/Backend/ExtJs/backend/customer/app.js index 2875aedc041..64332690649 100644 --- a/themes/Backend/ExtJs/backend/customer/app.js +++ b/themes/Backend/ExtJs/backend/customer/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/controller/detail.js b/themes/Backend/ExtJs/backend/customer/controller/detail.js index 6942d5ea7d6..b1e5cb1829f 100644 --- a/themes/Backend/ExtJs/backend/customer/controller/detail.js +++ b/themes/Backend/ExtJs/backend/customer/controller/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/controller/main.js b/themes/Backend/ExtJs/backend/customer/controller/main.js index 5365f265d2a..2cdb840325d 100644 --- a/themes/Backend/ExtJs/backend/customer/controller/main.js +++ b/themes/Backend/ExtJs/backend/customer/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/controller/order.js b/themes/Backend/ExtJs/backend/customer/controller/order.js index 31c7d7f27cf..fc7e2aff79b 100644 --- a/themes/Backend/ExtJs/backend/customer/controller/order.js +++ b/themes/Backend/ExtJs/backend/customer/controller/order.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/controller/stream.js b/themes/Backend/ExtJs/backend/customer/controller/stream.js index f6ed8b854f7..7f33a37bcef 100644 --- a/themes/Backend/ExtJs/backend/customer/controller/stream.js +++ b/themes/Backend/ExtJs/backend/customer/controller/stream.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/model/address.js b/themes/Backend/ExtJs/backend/customer/model/address.js index c58c819df53..9d4eced722a 100644 --- a/themes/Backend/ExtJs/backend/customer/model/address.js +++ b/themes/Backend/ExtJs/backend/customer/model/address.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/model/batch.js b/themes/Backend/ExtJs/backend/customer/model/batch.js index 0f73ac2d569..d6f976604a1 100644 --- a/themes/Backend/ExtJs/backend/customer/model/batch.js +++ b/themes/Backend/ExtJs/backend/customer/model/batch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/model/chart.js b/themes/Backend/ExtJs/backend/customer/model/chart.js index 17c0697dce5..c08907fe83c 100644 --- a/themes/Backend/ExtJs/backend/customer/model/chart.js +++ b/themes/Backend/ExtJs/backend/customer/model/chart.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/model/customer.js b/themes/Backend/ExtJs/backend/customer/model/customer.js index b9e3d9a8399..438256fe050 100644 --- a/themes/Backend/ExtJs/backend/customer/model/customer.js +++ b/themes/Backend/ExtJs/backend/customer/model/customer.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/model/customer_stream.js b/themes/Backend/ExtJs/backend/customer/model/customer_stream.js index e76f997b665..8fb48d25b98 100755 --- a/themes/Backend/ExtJs/backend/customer/model/customer_stream.js +++ b/themes/Backend/ExtJs/backend/customer/model/customer_stream.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/model/debit.js b/themes/Backend/ExtJs/backend/customer/model/debit.js index 1d777c6d97c..cbd9e5447d1 100644 --- a/themes/Backend/ExtJs/backend/customer/model/debit.js +++ b/themes/Backend/ExtJs/backend/customer/model/debit.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/model/order.js b/themes/Backend/ExtJs/backend/customer/model/order.js index eb7884b25d7..82346362322 100644 --- a/themes/Backend/ExtJs/backend/customer/model/order.js +++ b/themes/Backend/ExtJs/backend/customer/model/order.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/model/payment_data.js b/themes/Backend/ExtJs/backend/customer/model/payment_data.js index 2000df6bfb7..96f7d2522d3 100644 --- a/themes/Backend/ExtJs/backend/customer/model/payment_data.js +++ b/themes/Backend/ExtJs/backend/customer/model/payment_data.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/model/quick_view.js b/themes/Backend/ExtJs/backend/customer/model/quick_view.js index 5602d12c6a3..f00255c20d3 100644 --- a/themes/Backend/ExtJs/backend/customer/model/quick_view.js +++ b/themes/Backend/ExtJs/backend/customer/model/quick_view.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/store/address.js b/themes/Backend/ExtJs/backend/customer/store/address.js index c23b4304798..1b303807981 100644 --- a/themes/Backend/ExtJs/backend/customer/store/address.js +++ b/themes/Backend/ExtJs/backend/customer/store/address.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/store/batch.js b/themes/Backend/ExtJs/backend/customer/store/batch.js index ca428e0fb75..778603c9700 100644 --- a/themes/Backend/ExtJs/backend/customer/store/batch.js +++ b/themes/Backend/ExtJs/backend/customer/store/batch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/store/chart.js b/themes/Backend/ExtJs/backend/customer/store/chart.js index 4a8bb45e35e..7d39b02b6ce 100644 --- a/themes/Backend/ExtJs/backend/customer/store/chart.js +++ b/themes/Backend/ExtJs/backend/customer/store/chart.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/store/customer_stream.js b/themes/Backend/ExtJs/backend/customer/store/customer_stream.js index 4524beed34e..84dbff32d22 100755 --- a/themes/Backend/ExtJs/backend/customer/store/customer_stream.js +++ b/themes/Backend/ExtJs/backend/customer/store/customer_stream.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/store/detail.js b/themes/Backend/ExtJs/backend/customer/store/detail.js index 514810f114e..b8809b5f6b5 100644 --- a/themes/Backend/ExtJs/backend/customer/store/detail.js +++ b/themes/Backend/ExtJs/backend/customer/store/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/store/orders.js b/themes/Backend/ExtJs/backend/customer/store/orders.js index 2a70f659387..27a31483798 100644 --- a/themes/Backend/ExtJs/backend/customer/store/orders.js +++ b/themes/Backend/ExtJs/backend/customer/store/orders.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/store/preview.js b/themes/Backend/ExtJs/backend/customer/store/preview.js index 43d94fd4d60..1c45ae5a2f0 100755 --- a/themes/Backend/ExtJs/backend/customer/store/preview.js +++ b/themes/Backend/ExtJs/backend/customer/store/preview.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/store/quick_view.js b/themes/Backend/ExtJs/backend/customer/store/quick_view.js index bad626d37d7..c209faf2bfc 100644 --- a/themes/Backend/ExtJs/backend/customer/store/quick_view.js +++ b/themes/Backend/ExtJs/backend/customer/store/quick_view.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/address/detail/address.js b/themes/Backend/ExtJs/backend/customer/view/address/detail/address.js index 7f6ec6e2f52..e1af08ab9f8 100644 --- a/themes/Backend/ExtJs/backend/customer/view/address/detail/address.js +++ b/themes/Backend/ExtJs/backend/customer/view/address/detail/address.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/address/detail/window.js b/themes/Backend/ExtJs/backend/customer/view/address/detail/window.js index 4fb3c102c05..62e48336650 100644 --- a/themes/Backend/ExtJs/backend/customer/view/address/detail/window.js +++ b/themes/Backend/ExtJs/backend/customer/view/address/detail/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/address/list.js b/themes/Backend/ExtJs/backend/customer/view/address/list.js index f3c6e5cd04e..e81db531fbc 100644 --- a/themes/Backend/ExtJs/backend/customer/view/address/list.js +++ b/themes/Backend/ExtJs/backend/customer/view/address/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/chart/amount_chart_factory.js b/themes/Backend/ExtJs/backend/customer/view/chart/amount_chart_factory.js index ae25f00485c..2e026e0d6c0 100644 --- a/themes/Backend/ExtJs/backend/customer/view/chart/amount_chart_factory.js +++ b/themes/Backend/ExtJs/backend/customer/view/chart/amount_chart_factory.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/chart/chart.js b/themes/Backend/ExtJs/backend/customer/view/chart/chart.js index cfa030eb5c4..26442e13be0 100644 --- a/themes/Backend/ExtJs/backend/customer/view/chart/chart.js +++ b/themes/Backend/ExtJs/backend/customer/view/chart/chart.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/chart/meta_chart.js b/themes/Backend/ExtJs/backend/customer/view/chart/meta_chart.js index b556054cd54..ed914adac8a 100644 --- a/themes/Backend/ExtJs/backend/customer/view/chart/meta_chart.js +++ b/themes/Backend/ExtJs/backend/customer/view/chart/meta_chart.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/condition_field.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/condition_field.js index b17f89b613f..ade0741c636 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/condition_field.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/condition_field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/condition_panel.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/condition_panel.js index 713125e4af5..6b54b218722 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/condition_panel.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/condition_panel.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/account_mode_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/account_mode_condition.js index d0432f61327..418e1728111 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/account_mode_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/account_mode_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/age_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/age_condition.js index bfc0f598d89..8a5f6c8e658 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/age_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/age_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/customer_attribute_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/customer_attribute_condition.js index 498d07d2653..79e15d32103 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/customer_attribute_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/customer_attribute_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/attribute_value.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/attribute_value.js index d0e97d461a7..0d9be2c881a 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/attribute_value.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/attribute_value.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/attribute_window.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/attribute_window.js index a13a70b22bd..596ce253f39 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/attribute_window.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/attribute_window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/operator_field.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/operator_field.js index 672374af9a0..80382671ca0 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/operator_field.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/operator_field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_address_with_country_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_address_with_country_condition.js index 0b17d859c7a..41248a7dc46 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_address_with_country_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_address_with_country_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_canceled_orders_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_canceled_orders_condition.js index 09577182c6c..68188cf8b74 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_canceled_orders_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_canceled_orders_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_newsletter_registration_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_newsletter_registration_condition.js index 1486eb307ff..64b196d8217 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_newsletter_registration_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_newsletter_registration_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_address_with_country_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_address_with_country_condition.js index b0a0f2e69f3..02b9558c4aa 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_address_with_country_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_address_with_country_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_canceled_orders_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_canceled_orders_condition.js index cf781bd733c..e7c9c8c6ba9 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_canceled_orders_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_canceled_orders_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_newsletter_registration_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_newsletter_registration_condition.js index 368d8a1dd77..62c029025e7 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_newsletter_registration_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_newsletter_registration_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_order_count_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_order_count_condition.js index 0434dd592d8..f105c35a46e 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_order_count_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_order_count_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_total_order_amount_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_total_order_amount_condition.js index c4e3b49a9eb..186434529db 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_total_order_amount_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_total_order_amount_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_customer_since_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_customer_since_condition.js index d7288c16e5e..088dbe9fb28 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_customer_since_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_customer_since_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_in_customer_group_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_in_customer_group_condition.js index e3b17bfd39d..7c840501aa6 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_in_customer_group_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_in_customer_group_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_not_in_customer_group_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_not_in_customer_group_condition.js index f2b92fe2af0..29ba28d0008 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_not_in_customer_group_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_not_in_customer_group_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_in_last_days_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_in_last_days_condition.js index 2e2340c79b2..adbce8084b6 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_in_last_days_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_in_last_days_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_in_shop_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_in_shop_condition.js index 50346b75a64..0da59a2145f 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_in_shop_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_in_shop_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_condition.js index 56909926732..57fb761b2ac 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_of_category_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_of_category_condition.js index 54543649b1a..9a5231aa7cf 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_of_category_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_of_category_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_of_manufacturer_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_of_manufacturer_condition.js index 5861c9cd86b..4cecd9fdf33 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_of_manufacturer_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_of_manufacturer_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_with_delivery_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_with_delivery_condition.js index 58d674aea3c..dd92ed71a22 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_with_delivery_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_with_delivery_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_with_payment_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_with_payment_condition.js index d7e1906ca4b..aebd7297c51 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_with_payment_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_with_payment_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_registered_in_shop_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_registered_in_shop_condition.js index 27349baedbf..d670be1e029 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_registered_in_shop_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_registered_in_shop_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_salutation_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_salutation_condition.js index 499fcf0997a..c62874c6ddc 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_salutation_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_salutation_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_at_weekday_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_at_weekday_condition.js index fcb45b7e3eb..a4639e53e50 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_at_weekday_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_at_weekday_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_in_last_days_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_in_last_days_condition.js index 84b03bd695b..045a582d5cf 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_in_last_days_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_in_last_days_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_in_shop_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_in_shop_condition.js index 14a27253126..c53e66738b6 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_in_shop_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_in_shop_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_on_device_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_on_device_condition.js index f310b42bedc..b5bc5881667 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_on_device_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_on_device_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_condition.js index 390b72c6dc5..5c9233610b2 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_of_category_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_of_category_condition.js index 5e3242ef4bc..34d753e1a20 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_of_category_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_of_category_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_of_manufacturer_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_of_manufacturer_condition.js index 89e6da84b47..8db69d49ed3 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_of_manufacturer_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_of_manufacturer_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_with_delivery_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_with_delivery_condition.js index 8b1955490d1..0bbc52056b2 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_with_delivery_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_with_delivery_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_with_payment_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_with_payment_condition.js index fb22582b6ba..67d5e0827d0 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_with_payment_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_with_payment_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/registered_in_shop_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/registered_in_shop_condition.js index be1e14d5ed0..6f1bd6b597a 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/registered_in_shop_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/registered_in_shop_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/salutation_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/salutation_condition.js index 3422575fa0b..95c2ac20636 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/salutation_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/salutation_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/search_term_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/search_term_condition.js index 82280abe4d5..d1781ba6120 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/search_term_condition.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/search_term_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/detail.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/detail.js index 1af8871b355..dfd711990ab 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/detail.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/listing.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/listing.js index 54c80424d42..cf00454f182 100755 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/listing.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/listing.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/preview.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/preview.js index 6cf6b7341a6..b964bbbb313 100644 --- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/preview.js +++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/preview.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/detail/additional.js b/themes/Backend/ExtJs/backend/customer/view/detail/additional.js index 599c9cea982..810d70f527c 100644 --- a/themes/Backend/ExtJs/backend/customer/view/detail/additional.js +++ b/themes/Backend/ExtJs/backend/customer/view/detail/additional.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/detail/base.js b/themes/Backend/ExtJs/backend/customer/view/detail/base.js index 6e844851a47..6d24f39bbf6 100644 --- a/themes/Backend/ExtJs/backend/customer/view/detail/base.js +++ b/themes/Backend/ExtJs/backend/customer/view/detail/base.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/detail/comment.js b/themes/Backend/ExtJs/backend/customer/view/detail/comment.js index 11e3a7759fe..8bac897d437 100644 --- a/themes/Backend/ExtJs/backend/customer/view/detail/comment.js +++ b/themes/Backend/ExtJs/backend/customer/view/detail/comment.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/detail/debit.js b/themes/Backend/ExtJs/backend/customer/view/detail/debit.js index 039cd7a0922..386b3978cc3 100644 --- a/themes/Backend/ExtJs/backend/customer/view/detail/debit.js +++ b/themes/Backend/ExtJs/backend/customer/view/detail/debit.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/detail/window.js b/themes/Backend/ExtJs/backend/customer/view/detail/window.js index caa00c959fd..5c13773c334 100644 --- a/themes/Backend/ExtJs/backend/customer/view/detail/window.js +++ b/themes/Backend/ExtJs/backend/customer/view/detail/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/main/customer_list.js b/themes/Backend/ExtJs/backend/customer/view/main/customer_list.js index af313663038..52a68e4acdf 100644 --- a/themes/Backend/ExtJs/backend/customer/view/main/customer_list.js +++ b/themes/Backend/ExtJs/backend/customer/view/main/customer_list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/main/customer_list_filter.js b/themes/Backend/ExtJs/backend/customer/view/main/customer_list_filter.js index 7f99c49d79c..66bda41e07e 100644 --- a/themes/Backend/ExtJs/backend/customer/view/main/customer_list_filter.js +++ b/themes/Backend/ExtJs/backend/customer/view/main/customer_list_filter.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/main/quick_view.js b/themes/Backend/ExtJs/backend/customer/view/main/quick_view.js index c880ba71942..74a1abf7f25 100644 --- a/themes/Backend/ExtJs/backend/customer/view/main/quick_view.js +++ b/themes/Backend/ExtJs/backend/customer/view/main/quick_view.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/main/stream_view.js b/themes/Backend/ExtJs/backend/customer/view/main/stream_view.js index 2999b4ac0dc..a3ea640336f 100644 --- a/themes/Backend/ExtJs/backend/customer/view/main/stream_view.js +++ b/themes/Backend/ExtJs/backend/customer/view/main/stream_view.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/main/window.js b/themes/Backend/ExtJs/backend/customer/view/main/window.js index 28018245416..d0e10800a77 100644 --- a/themes/Backend/ExtJs/backend/customer/view/main/window.js +++ b/themes/Backend/ExtJs/backend/customer/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/order/chart.js b/themes/Backend/ExtJs/backend/customer/view/order/chart.js index c4422bd478f..e9597e4ee45 100644 --- a/themes/Backend/ExtJs/backend/customer/view/order/chart.js +++ b/themes/Backend/ExtJs/backend/customer/view/order/chart.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/customer/view/order/list.js b/themes/Backend/ExtJs/backend/customer/view/order/list.js index 89efe14e6f6..43f1509faa3 100644 --- a/themes/Backend/ExtJs/backend/customer/view/order/list.js +++ b/themes/Backend/ExtJs/backend/customer/view/order/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/emotion/app.js b/themes/Backend/ExtJs/backend/emotion/app.js index 4be6ce6b17a..2afa9b3b1a2 100644 --- a/themes/Backend/ExtJs/backend/emotion/app.js +++ b/themes/Backend/ExtJs/backend/emotion/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/controller/detail.js b/themes/Backend/ExtJs/backend/emotion/controller/detail.js index e63dc17908f..5b3177e3c39 100644 --- a/themes/Backend/ExtJs/backend/emotion/controller/detail.js +++ b/themes/Backend/ExtJs/backend/emotion/controller/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/controller/main.js b/themes/Backend/ExtJs/backend/emotion/controller/main.js index 3e4f76270a3..ec5c092d18b 100644 --- a/themes/Backend/ExtJs/backend/emotion/controller/main.js +++ b/themes/Backend/ExtJs/backend/emotion/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/emotion/controller/templates.js b/themes/Backend/ExtJs/backend/emotion/controller/templates.js index 5f26433594b..050e1c636a9 100644 --- a/themes/Backend/ExtJs/backend/emotion/controller/templates.js +++ b/themes/Backend/ExtJs/backend/emotion/controller/templates.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/model/article_slider.js b/themes/Backend/ExtJs/backend/emotion/model/article_slider.js index cc2a6013302..e49dadad017 100644 --- a/themes/Backend/ExtJs/backend/emotion/model/article_slider.js +++ b/themes/Backend/ExtJs/backend/emotion/model/article_slider.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/model/banner_slider.js b/themes/Backend/ExtJs/backend/emotion/model/banner_slider.js index 832e785d280..d5f88803dec 100644 --- a/themes/Backend/ExtJs/backend/emotion/model/banner_slider.js +++ b/themes/Backend/ExtJs/backend/emotion/model/banner_slider.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/model/component.js b/themes/Backend/ExtJs/backend/emotion/model/component.js index b484b21fab2..009863d7840 100644 --- a/themes/Backend/ExtJs/backend/emotion/model/component.js +++ b/themes/Backend/ExtJs/backend/emotion/model/component.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/model/emotion.js b/themes/Backend/ExtJs/backend/emotion/model/emotion.js index f9a44b93090..ed482a60c05 100644 --- a/themes/Backend/ExtJs/backend/emotion/model/emotion.js +++ b/themes/Backend/ExtJs/backend/emotion/model/emotion.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/model/emotion_element.js b/themes/Backend/ExtJs/backend/emotion/model/emotion_element.js index facbff4f793..4e0b0fb8e31 100644 --- a/themes/Backend/ExtJs/backend/emotion/model/emotion_element.js +++ b/themes/Backend/ExtJs/backend/emotion/model/emotion_element.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/model/emotion_shop.js b/themes/Backend/ExtJs/backend/emotion/model/emotion_shop.js index 05c7e1934b1..196d4e21afb 100644 --- a/themes/Backend/ExtJs/backend/emotion/model/emotion_shop.js +++ b/themes/Backend/ExtJs/backend/emotion/model/emotion_shop.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/model/field.js b/themes/Backend/ExtJs/backend/emotion/model/field.js index 08d2ed55e9c..ec6b5ed5efc 100644 --- a/themes/Backend/ExtJs/backend/emotion/model/field.js +++ b/themes/Backend/ExtJs/backend/emotion/model/field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/model/manufacturer_slider.js b/themes/Backend/ExtJs/backend/emotion/model/manufacturer_slider.js index dbc874d8ac3..0b562b0bcba 100644 --- a/themes/Backend/ExtJs/backend/emotion/model/manufacturer_slider.js +++ b/themes/Backend/ExtJs/backend/emotion/model/manufacturer_slider.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/model/preset.js b/themes/Backend/ExtJs/backend/emotion/model/preset.js index ac881f439f1..e5cff76c30a 100644 --- a/themes/Backend/ExtJs/backend/emotion/model/preset.js +++ b/themes/Backend/ExtJs/backend/emotion/model/preset.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/model/presetdata.js b/themes/Backend/ExtJs/backend/emotion/model/presetdata.js index 5ce7509014a..0e79af2575a 100644 --- a/themes/Backend/ExtJs/backend/emotion/model/presetdata.js +++ b/themes/Backend/ExtJs/backend/emotion/model/presetdata.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/model/template.js b/themes/Backend/ExtJs/backend/emotion/model/template.js index 283d2c15454..26e9176e14b 100644 --- a/themes/Backend/ExtJs/backend/emotion/model/template.js +++ b/themes/Backend/ExtJs/backend/emotion/model/template.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/model/viewport.js b/themes/Backend/ExtJs/backend/emotion/model/viewport.js index b1c9c158222..5e7c7bf4733 100644 --- a/themes/Backend/ExtJs/backend/emotion/model/viewport.js +++ b/themes/Backend/ExtJs/backend/emotion/model/viewport.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/store/category_path.js b/themes/Backend/ExtJs/backend/emotion/store/category_path.js index 6ed80f464b3..8519d2ed7a9 100644 --- a/themes/Backend/ExtJs/backend/emotion/store/category_path.js +++ b/themes/Backend/ExtJs/backend/emotion/store/category_path.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ Ext.define('Shopware.apps.Emotion.store.CategoryPath', { diff --git a/themes/Backend/ExtJs/backend/emotion/store/content_type_mode.js b/themes/Backend/ExtJs/backend/emotion/store/content_type_mode.js index 4d75ecc8a71..8c3ab493ff3 100644 --- a/themes/Backend/ExtJs/backend/emotion/store/content_type_mode.js +++ b/themes/Backend/ExtJs/backend/emotion/store/content_type_mode.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/emotion/view/components/content_type"} diff --git a/themes/Backend/ExtJs/backend/emotion/store/detail.js b/themes/Backend/ExtJs/backend/emotion/store/detail.js index 88a4deef10f..b7271bea8d1 100644 --- a/themes/Backend/ExtJs/backend/emotion/store/detail.js +++ b/themes/Backend/ExtJs/backend/emotion/store/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/emotion/store/landing_page.js b/themes/Backend/ExtJs/backend/emotion/store/landing_page.js index bc7ace2a676..ec63c45d969 100644 --- a/themes/Backend/ExtJs/backend/emotion/store/landing_page.js +++ b/themes/Backend/ExtJs/backend/emotion/store/landing_page.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/emotion/store/library.js b/themes/Backend/ExtJs/backend/emotion/store/library.js index adcb59481e9..95dd19e6f51 100644 --- a/themes/Backend/ExtJs/backend/emotion/store/library.js +++ b/themes/Backend/ExtJs/backend/emotion/store/library.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/emotion/store/list.js b/themes/Backend/ExtJs/backend/emotion/store/list.js index 46e4a5251a4..68b88bd8192 100644 --- a/themes/Backend/ExtJs/backend/emotion/store/list.js +++ b/themes/Backend/ExtJs/backend/emotion/store/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Article diff --git a/themes/Backend/ExtJs/backend/emotion/store/presets.js b/themes/Backend/ExtJs/backend/emotion/store/presets.js index 8afef20c2a8..233f10a5adf 100644 --- a/themes/Backend/ExtJs/backend/emotion/store/presets.js +++ b/themes/Backend/ExtJs/backend/emotion/store/presets.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/store/templates.js b/themes/Backend/ExtJs/backend/emotion/store/templates.js index 542d86c5fe7..d6fa6518b70 100644 --- a/themes/Backend/ExtJs/backend/emotion/store/templates.js +++ b/themes/Backend/ExtJs/backend/emotion/store/templates.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/store/visibility.js b/themes/Backend/ExtJs/backend/emotion/store/visibility.js index 5db85c0bfdb..6bf368ec6f8 100644 --- a/themes/Backend/ExtJs/backend/emotion/store/visibility.js +++ b/themes/Backend/ExtJs/backend/emotion/store/visibility.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/article.js b/themes/Backend/ExtJs/backend/emotion/view/components/article.js index 38a8c5db55d..9f4660518cb 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/article.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/article.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/emotion/view/components/article"} //{namespace name="backend/emotion/view/components/article"} diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/article_slider.js b/themes/Backend/ExtJs/backend/emotion/view/components/article_slider.js index 1cc77765b2d..568f72bcc8c 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/article_slider.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/article_slider.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/banner.js b/themes/Backend/ExtJs/backend/emotion/view/components/banner.js index 0641df26362..dd583589438 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/banner.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/banner.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/banner_mapping.js b/themes/Backend/ExtJs/backend/emotion/view/components/banner_mapping.js index 54defe5bb53..7ddcbecc1d5 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/banner_mapping.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/banner_mapping.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/emotion/view/detail"} diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/banner_slider.js b/themes/Backend/ExtJs/backend/emotion/view/components/banner_slider.js index a2ae4015514..6d2ebbf9eeb 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/banner_slider.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/banner_slider.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/base.js b/themes/Backend/ExtJs/backend/emotion/view/components/base.js index 8c3786e3e61..fd9d863176e 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/base.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/base.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/emotion/view/detail"} diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/blog.js b/themes/Backend/ExtJs/backend/emotion/view/components/blog.js index 079d4986aa9..ced372edd7d 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/blog.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/blog.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/category_teaser.js b/themes/Backend/ExtJs/backend/emotion/view/components/category_teaser.js index 555e73a103a..487cbe67b32 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/category_teaser.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/category_teaser.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/content_type.js b/themes/Backend/ExtJs/backend/emotion/view/components/content_type.js index 4e51f32b4dc..c83b31c4599 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/content_type.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/content_type.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/emotion/view/components/content_type"} diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/fields/article.js b/themes/Backend/ExtJs/backend/emotion/view/components/fields/article.js index e44f9e9a6eb..97949738ad7 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/fields/article.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/fields/article.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ Ext.define('Shopware.apps.Emotion.view.components.fields.Article', { extend: 'Shopware.form.field.ProductSingleSelection', diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/fields/article_slider_type.js b/themes/Backend/ExtJs/backend/emotion/view/components/fields/article_slider_type.js index 1577f9511cb..7e91e29c25e 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/fields/article_slider_type.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/fields/article_slider_type.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/emotion/view/components/article_slider_type"} diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/fields/article_type.js b/themes/Backend/ExtJs/backend/emotion/view/components/fields/article_type.js index a29f0eda2fd..f74cb7b83e4 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/fields/article_type.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/fields/article_type.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/emotion/view/components/article"} Ext.define('Shopware.apps.Emotion.view.components.fields.ArticleType', { diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/fields/category_image_type.js b/themes/Backend/ExtJs/backend/emotion/view/components/fields/category_image_type.js index 9651901eeda..eb3e637b974 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/fields/category_image_type.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/fields/category_image_type.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/fields/category_selection.js b/themes/Backend/ExtJs/backend/emotion/view/components/fields/category_selection.js index e23d3737c20..db1413e03c7 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/fields/category_selection.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/fields/category_selection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/fields/link_target.js b/themes/Backend/ExtJs/backend/emotion/view/components/fields/link_target.js index 230e85eb1ad..8e3cc73eb03 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/fields/link_target.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/fields/link_target.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/fields/manufacturer_type.js b/themes/Backend/ExtJs/backend/emotion/view/components/fields/manufacturer_type.js index e559488a485..20020c5f94a 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/fields/manufacturer_type.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/fields/manufacturer_type.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/fields/slider_select.js b/themes/Backend/ExtJs/backend/emotion/view/components/fields/slider_select.js index d38ba1e2079..331d2941e41 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/fields/slider_select.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/fields/slider_select.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/fields/variant.js b/themes/Backend/ExtJs/backend/emotion/view/components/fields/variant.js index c91aadcde3b..dc2b279e264 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/fields/variant.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/fields/variant.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ Ext.define('Shopware.apps.Emotion.view.components.fields.Variant', { extend: 'Shopware.form.field.ProductSingleSelection', diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/fields/video_mode.js b/themes/Backend/ExtJs/backend/emotion/view/components/fields/video_mode.js index 7f175855f12..820b3e6ac8f 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/fields/video_mode.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/fields/video_mode.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/html_code.js b/themes/Backend/ExtJs/backend/emotion/view/components/html_code.js index 75fbc57a323..961aff1e471 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/html_code.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/html_code.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/emotion/view/components/html_code"} diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/html_element.js b/themes/Backend/ExtJs/backend/emotion/view/components/html_element.js index 8a9545de94c..6aa5cc9ed43 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/html_element.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/html_element.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/html_video.js b/themes/Backend/ExtJs/backend/emotion/view/components/html_video.js index 3d89cfd2184..cc799a00166 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/html_video.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/html_video.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/iframe.js b/themes/Backend/ExtJs/backend/emotion/view/components/iframe.js index 39496fec338..0c807fd1615 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/iframe.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/iframe.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/manufacturer_slider.js b/themes/Backend/ExtJs/backend/emotion/view/components/manufacturer_slider.js index 6d634dc7a78..8ee82e194ad 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/manufacturer_slider.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/manufacturer_slider.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/settings_window.js b/themes/Backend/ExtJs/backend/emotion/view/components/settings_window.js index 1081daea346..871a2d74caa 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/settings_window.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/settings_window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/youtube.js b/themes/Backend/ExtJs/backend/emotion/view/components/youtube.js index e2645195851..3972327531c 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/components/youtube.js +++ b/themes/Backend/ExtJs/backend/emotion/view/components/youtube.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/designer.js b/themes/Backend/ExtJs/backend/emotion/view/detail/designer.js index 51c1dcdd759..b339bf8b22a 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/detail/designer.js +++ b/themes/Backend/ExtJs/backend/emotion/view/detail/designer.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/article.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/article.js index 3e93c2c60e7..1f8a6d4465d 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/article.js +++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/article.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/article_slider.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/article_slider.js index 452e2c84da7..46a15763381 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/article_slider.js +++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/article_slider.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/banner.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/banner.js index abb61cd0481..95d3aef3c54 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/banner.js +++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/banner.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/banner_slider.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/banner_slider.js index 5aaf45bd4ee..0c7679c4710 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/banner_slider.js +++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/banner_slider.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/base.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/base.js index 8aa122633a5..734e031cee8 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/base.js +++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/base.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/blog.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/blog.js index bd069158ce2..9ee6f87b330 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/blog.js +++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/blog.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/category_teaser.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/category_teaser.js index aa690bb8629..eba169213b9 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/category_teaser.js +++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/category_teaser.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/content_type.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/content_type.js index 808c32bb4aa..62a0ba90746 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/content_type.js +++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/content_type.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html.js index bb7b80ba01d..7649076e15f 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html.js +++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html_code.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html_code.js index 522fba0c591..d9f70692682 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html_code.js +++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html_code.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html_video.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html_video.js index f795eb1cfde..fe011ea4c19 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html_video.js +++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html_video.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/iframe.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/iframe.js index 188010b478b..617e293cbd2 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/iframe.js +++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/iframe.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/manufacturer_slider.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/manufacturer_slider.js index f452879582f..bdcbd379cf3 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/manufacturer_slider.js +++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/manufacturer_slider.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/youtube.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/youtube.js index 9c59a036ca1..f1829b925b3 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/youtube.js +++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/youtube.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/grid.js b/themes/Backend/ExtJs/backend/emotion/view/detail/grid.js index c9d52b8d9d4..36fb4feacb6 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/detail/grid.js +++ b/themes/Backend/ExtJs/backend/emotion/view/detail/grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/layout.js b/themes/Backend/ExtJs/backend/emotion/view/detail/layout.js index 58e70dc6853..0e43c4a3fbd 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/detail/layout.js +++ b/themes/Backend/ExtJs/backend/emotion/view/detail/layout.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/preview.js b/themes/Backend/ExtJs/backend/emotion/view/detail/preview.js index 0f2ba4451f1..efe1df900d0 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/detail/preview.js +++ b/themes/Backend/ExtJs/backend/emotion/view/detail/preview.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/settings.js b/themes/Backend/ExtJs/backend/emotion/view/detail/settings.js index af1a39891c4..4bd9fd80f36 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/detail/settings.js +++ b/themes/Backend/ExtJs/backend/emotion/view/detail/settings.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/widgets.js b/themes/Backend/ExtJs/backend/emotion/view/detail/widgets.js index 5ea26cf6be9..4c5b392ce37 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/detail/widgets.js +++ b/themes/Backend/ExtJs/backend/emotion/view/detail/widgets.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/window.js b/themes/Backend/ExtJs/backend/emotion/view/detail/window.js index 96d94db86ef..4c4826999ce 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/detail/window.js +++ b/themes/Backend/ExtJs/backend/emotion/view/detail/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/list/grid.js b/themes/Backend/ExtJs/backend/emotion/view/list/grid.js index 012b6e26014..a1d7f9bcee3 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/list/grid.js +++ b/themes/Backend/ExtJs/backend/emotion/view/list/grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/list/toolbar.js b/themes/Backend/ExtJs/backend/emotion/view/list/toolbar.js index 30c192135b1..82059cd8dba 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/list/toolbar.js +++ b/themes/Backend/ExtJs/backend/emotion/view/list/toolbar.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/emotion/view/main/window.js b/themes/Backend/ExtJs/backend/emotion/view/main/window.js index 012ff1581fd..29a80da371b 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/main/window.js +++ b/themes/Backend/ExtJs/backend/emotion/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/presets/form.js b/themes/Backend/ExtJs/backend/emotion/view/presets/form.js index 0cf2735afa8..2d6b716788e 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/presets/form.js +++ b/themes/Backend/ExtJs/backend/emotion/view/presets/form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/emotion/view/presets/info.js b/themes/Backend/ExtJs/backend/emotion/view/presets/info.js index 6dcc9421125..9e1ffc58d59 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/presets/info.js +++ b/themes/Backend/ExtJs/backend/emotion/view/presets/info.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/emotion/presets/presets"} diff --git a/themes/Backend/ExtJs/backend/emotion/view/presets/list.js b/themes/Backend/ExtJs/backend/emotion/view/presets/list.js index 1849dd4916c..e59b7934b14 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/presets/list.js +++ b/themes/Backend/ExtJs/backend/emotion/view/presets/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/emotion/view/presets/window.js b/themes/Backend/ExtJs/backend/emotion/view/presets/window.js index 6ab8d67b66c..9a8f523a530 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/presets/window.js +++ b/themes/Backend/ExtJs/backend/emotion/view/presets/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/templates/list.js b/themes/Backend/ExtJs/backend/emotion/view/templates/list.js index ecbee6bc5e0..5f582579e06 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/templates/list.js +++ b/themes/Backend/ExtJs/backend/emotion/view/templates/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/templates/settings.js b/themes/Backend/ExtJs/backend/emotion/view/templates/settings.js index 33a98f9975d..a1bcc3064cd 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/templates/settings.js +++ b/themes/Backend/ExtJs/backend/emotion/view/templates/settings.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/templates/toolbar.js b/themes/Backend/ExtJs/backend/emotion/view/templates/toolbar.js index d6a0dba1092..0c82f695870 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/templates/toolbar.js +++ b/themes/Backend/ExtJs/backend/emotion/view/templates/toolbar.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/emotion/view/translation/window.js b/themes/Backend/ExtJs/backend/emotion/view/translation/window.js index 36b7eba5e80..465c04e68c7 100644 --- a/themes/Backend/ExtJs/backend/emotion/view/translation/window.js +++ b/themes/Backend/ExtJs/backend/emotion/view/translation/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Emotion diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/controller/config.js b/themes/Backend/ExtJs/backend/first_run_wizard/controller/config.js index 3a1e7443eb7..dab28b2cd9f 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/controller/config.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/controller/config.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/controller/localization.js b/themes/Backend/ExtJs/backend/first_run_wizard/controller/localization.js index adb0b98755f..b4f6f42deeb 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/controller/localization.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/controller/localization.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/controller/main.js b/themes/Backend/ExtJs/backend/first_run_wizard/controller/main.js index 1101ad92f9f..1131872e1b3 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/controller/main.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/controller/pay_pal.js b/themes/Backend/ExtJs/backend/first_run_wizard/controller/pay_pal.js index f6d1b30f280..fdc6bad8a4f 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/controller/pay_pal.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/controller/pay_pal.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/controller/recommendation.js b/themes/Backend/ExtJs/backend/first_run_wizard/controller/recommendation.js index a036f2fd095..4a997ec91d5 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/controller/recommendation.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/controller/recommendation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/model/integrated_plugins_countries.js b/themes/Backend/ExtJs/backend/first_run_wizard/model/integrated_plugins_countries.js index 8dcd7547ff4..a47a23e0bf1 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/model/integrated_plugins_countries.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/model/integrated_plugins_countries.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/model/locale.js b/themes/Backend/ExtJs/backend/first_run_wizard/model/locale.js index e5e838b59ef..722a5bdd83f 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/model/locale.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/model/locale.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/model/localization.js b/themes/Backend/ExtJs/backend/first_run_wizard/model/localization.js index 427e0201e0c..c4e9a2f5fb3 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/model/localization.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/model/localization.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/store/available_localization_plugin.js b/themes/Backend/ExtJs/backend/first_run_wizard/store/available_localization_plugin.js index f9354ba4f64..3a17a5e5d1c 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/store/available_localization_plugin.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/store/available_localization_plugin.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/store/demo_plugin.js b/themes/Backend/ExtJs/backend/first_run_wizard/store/demo_plugin.js index a9864661a01..3b29cbf36cd 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/store/demo_plugin.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/store/demo_plugin.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/store/integrated_plugin.js b/themes/Backend/ExtJs/backend/first_run_wizard/store/integrated_plugin.js index 9c654c26fa5..959b4a9588e 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/store/integrated_plugin.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/store/integrated_plugin.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/store/integrated_plugins_countries.js b/themes/Backend/ExtJs/backend/first_run_wizard/store/integrated_plugins_countries.js index 6d6a0dceee4..c7500291dac 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/store/integrated_plugins_countries.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/store/integrated_plugins_countries.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/store/license_plugin.js b/themes/Backend/ExtJs/backend/first_run_wizard/store/license_plugin.js index b7424e45aea..c95229e4d1f 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/store/license_plugin.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/store/license_plugin.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/store/locale.js b/themes/Backend/ExtJs/backend/first_run_wizard/store/locale.js index c1c46c22dfe..ace1086ed43 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/store/locale.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/store/locale.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/store/localization.js b/themes/Backend/ExtJs/backend/first_run_wizard/store/localization.js index b1101d112b2..6e4b66b8e6a 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/store/localization.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/store/localization.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/store/localization_plugin.js b/themes/Backend/ExtJs/backend/first_run_wizard/store/localization_plugin.js index 2aeb89a1d4a..bc1113612ab 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/store/localization_plugin.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/store/localization_plugin.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/store/recommended_plugin.js b/themes/Backend/ExtJs/backend/first_run_wizard/store/recommended_plugin.js index a9284b7cc1d..b0b01e43ea9 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/store/recommended_plugin.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/store/recommended_plugin.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/config.js b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/config.js index b9402bc5497..4773b08c292 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/config.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/config.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/demo_data.js b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/demo_data.js index f9877c8ee81..ced3c0b681a 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/demo_data.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/demo_data.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/finish.js b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/finish.js index d313490daf8..3f62eecb5a3 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/finish.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/finish.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization.js b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization.js index e7a47c1f06e..f23cd84a023 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization_installer.js b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization_installer.js index cc11b7fea11..8c256b95562 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization_installer.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization_installer.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization_switcher.js b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization_switcher.js index 87b5635ac91..155a93bc366 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization_switcher.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization_switcher.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/pay_pal.js b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/pay_pal.js index b1ae116e999..62b9cb41b84 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/pay_pal.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/pay_pal.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/recommendation.js b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/recommendation.js index ffe2fe52f65..91cb6321a8c 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/recommendation.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/recommendation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/window.js b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/window.js index fb4d97397b4..f17ca811eaf 100644 --- a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/window.js +++ b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/form/app.js b/themes/Backend/ExtJs/backend/form/app.js index 68110bcef74..b516bdf7fdd 100644 --- a/themes/Backend/ExtJs/backend/form/app.js +++ b/themes/Backend/ExtJs/backend/form/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Form diff --git a/themes/Backend/ExtJs/backend/form/controller/fields.js b/themes/Backend/ExtJs/backend/form/controller/fields.js index 12fef26d263..32315ba8f05 100644 --- a/themes/Backend/ExtJs/backend/form/controller/fields.js +++ b/themes/Backend/ExtJs/backend/form/controller/fields.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Form diff --git a/themes/Backend/ExtJs/backend/form/controller/main.js b/themes/Backend/ExtJs/backend/form/controller/main.js index 8db45d26efb..691113a54ad 100644 --- a/themes/Backend/ExtJs/backend/form/controller/main.js +++ b/themes/Backend/ExtJs/backend/form/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Form diff --git a/themes/Backend/ExtJs/backend/form/model/field.js b/themes/Backend/ExtJs/backend/form/model/field.js index 370795a7f1b..db830d880ec 100644 --- a/themes/Backend/ExtJs/backend/form/model/field.js +++ b/themes/Backend/ExtJs/backend/form/model/field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Form diff --git a/themes/Backend/ExtJs/backend/form/model/form.js b/themes/Backend/ExtJs/backend/form/model/form.js index 1bf99bec83b..90b5466104f 100644 --- a/themes/Backend/ExtJs/backend/form/model/form.js +++ b/themes/Backend/ExtJs/backend/form/model/form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Form diff --git a/themes/Backend/ExtJs/backend/form/store/field.js b/themes/Backend/ExtJs/backend/form/store/field.js index 944f3233684..a4a2225f1df 100644 --- a/themes/Backend/ExtJs/backend/form/store/field.js +++ b/themes/Backend/ExtJs/backend/form/store/field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Form diff --git a/themes/Backend/ExtJs/backend/form/store/form.js b/themes/Backend/ExtJs/backend/form/store/form.js index 00387f8b3da..4fb3b4e7e8d 100644 --- a/themes/Backend/ExtJs/backend/form/store/form.js +++ b/themes/Backend/ExtJs/backend/form/store/form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Form diff --git a/themes/Backend/ExtJs/backend/form/store/shop.js b/themes/Backend/ExtJs/backend/form/store/shop.js index ff1ec20c0e9..d835b5be4c9 100644 --- a/themes/Backend/ExtJs/backend/form/store/shop.js +++ b/themes/Backend/ExtJs/backend/form/store/shop.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/form/store/shop"} diff --git a/themes/Backend/ExtJs/backend/form/view/main/editwindow.js b/themes/Backend/ExtJs/backend/form/view/main/editwindow.js index 384bb06cba9..8506aaa3ddb 100644 --- a/themes/Backend/ExtJs/backend/form/view/main/editwindow.js +++ b/themes/Backend/ExtJs/backend/form/view/main/editwindow.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Form diff --git a/themes/Backend/ExtJs/backend/form/view/main/fieldgrid.js b/themes/Backend/ExtJs/backend/form/view/main/fieldgrid.js index 267ad59a637..11e0e046e2c 100644 --- a/themes/Backend/ExtJs/backend/form/view/main/fieldgrid.js +++ b/themes/Backend/ExtJs/backend/form/view/main/fieldgrid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Form diff --git a/themes/Backend/ExtJs/backend/form/view/main/formpanel.js b/themes/Backend/ExtJs/backend/form/view/main/formpanel.js index 82eade81f71..dc3dd97e099 100644 --- a/themes/Backend/ExtJs/backend/form/view/main/formpanel.js +++ b/themes/Backend/ExtJs/backend/form/view/main/formpanel.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Form diff --git a/themes/Backend/ExtJs/backend/form/view/main/list.js b/themes/Backend/ExtJs/backend/form/view/main/list.js index 0a16f373ea4..4949fbc0fa5 100644 --- a/themes/Backend/ExtJs/backend/form/view/main/list.js +++ b/themes/Backend/ExtJs/backend/form/view/main/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Form diff --git a/themes/Backend/ExtJs/backend/form/view/main/mainwindow.js b/themes/Backend/ExtJs/backend/form/view/main/mainwindow.js index 96cbde9ffe9..4958f5e0233 100644 --- a/themes/Backend/ExtJs/backend/form/view/main/mainwindow.js +++ b/themes/Backend/ExtJs/backend/form/view/main/mainwindow.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Form diff --git a/themes/Backend/ExtJs/backend/index/app.js b/themes/Backend/ExtJs/backend/index/app.js index 8453859f049..559ae565619 100644 --- a/themes/Backend/ExtJs/backend/index/app.js +++ b/themes/Backend/ExtJs/backend/index/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/controller/error_reporter.js b/themes/Backend/ExtJs/backend/index/controller/error_reporter.js index 859bc3e6359..bfe1890f28b 100644 --- a/themes/Backend/ExtJs/backend/index/controller/error_reporter.js +++ b/themes/Backend/ExtJs/backend/index/controller/error_reporter.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/controller/main.js b/themes/Backend/ExtJs/backend/index/controller/main.js index cdc20bd7e91..69178c43417 100644 --- a/themes/Backend/ExtJs/backend/index/controller/main.js +++ b/themes/Backend/ExtJs/backend/index/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/controller/theme_cache_warm_up.js b/themes/Backend/ExtJs/backend/index/controller/theme_cache_warm_up.js index f8e33b3b8f8..ed013fc9bfa 100644 --- a/themes/Backend/ExtJs/backend/index/controller/theme_cache_warm_up.js +++ b/themes/Backend/ExtJs/backend/index/controller/theme_cache_warm_up.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/controller/widgets.js b/themes/Backend/ExtJs/backend/index/controller/widgets.js index 7fbd1f14177..c5c5df78830 100644 --- a/themes/Backend/ExtJs/backend/index/controller/widgets.js +++ b/themes/Backend/ExtJs/backend/index/controller/widgets.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/model/batch.js b/themes/Backend/ExtJs/backend/index/model/batch.js index 4b10eba00b9..aa9b77019c2 100644 --- a/themes/Backend/ExtJs/backend/index/model/batch.js +++ b/themes/Backend/ExtJs/backend/index/model/batch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/model/customers.js b/themes/Backend/ExtJs/backend/index/model/customers.js index 19eb443824f..a75c4c5cb8f 100644 --- a/themes/Backend/ExtJs/backend/index/model/customers.js +++ b/themes/Backend/ExtJs/backend/index/model/customers.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/model/error_reporter.js b/themes/Backend/ExtJs/backend/index/model/error_reporter.js index fb0afcf9e90..b7e93d1fe0e 100644 --- a/themes/Backend/ExtJs/backend/index/model/error_reporter.js +++ b/themes/Backend/ExtJs/backend/index/model/error_reporter.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/model/merchant.js b/themes/Backend/ExtJs/backend/index/model/merchant.js index 7b1fc958329..4b694cf3550 100644 --- a/themes/Backend/ExtJs/backend/index/model/merchant.js +++ b/themes/Backend/ExtJs/backend/index/model/merchant.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/model/merchant_mail.js b/themes/Backend/ExtJs/backend/index/model/merchant_mail.js index bbf2444d74a..d73e1400e19 100644 --- a/themes/Backend/ExtJs/backend/index/model/merchant_mail.js +++ b/themes/Backend/ExtJs/backend/index/model/merchant_mail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/model/news.js b/themes/Backend/ExtJs/backend/index/model/news.js index 2bb4d881c0c..60fda0c0fcb 100644 --- a/themes/Backend/ExtJs/backend/index/model/news.js +++ b/themes/Backend/ExtJs/backend/index/model/news.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/index/model/news"} diff --git a/themes/Backend/ExtJs/backend/index/model/orders.js b/themes/Backend/ExtJs/backend/index/model/orders.js index 92739b6518a..ef52414314a 100644 --- a/themes/Backend/ExtJs/backend/index/model/orders.js +++ b/themes/Backend/ExtJs/backend/index/model/orders.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/model/rating.js b/themes/Backend/ExtJs/backend/index/model/rating.js index cfa6bf81e59..b04f389fc7b 100644 --- a/themes/Backend/ExtJs/backend/index/model/rating.js +++ b/themes/Backend/ExtJs/backend/index/model/rating.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/index/model/rating"} diff --git a/themes/Backend/ExtJs/backend/index/model/theme_cache_warm_up.js b/themes/Backend/ExtJs/backend/index/model/theme_cache_warm_up.js index f41e3e02840..7d76bb853d6 100644 --- a/themes/Backend/ExtJs/backend/index/model/theme_cache_warm_up.js +++ b/themes/Backend/ExtJs/backend/index/model/theme_cache_warm_up.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/model/turnover.js b/themes/Backend/ExtJs/backend/index/model/turnover.js index 9474846d2ef..073a6d05a9a 100644 --- a/themes/Backend/ExtJs/backend/index/model/turnover.js +++ b/themes/Backend/ExtJs/backend/index/model/turnover.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/model/visitors.js b/themes/Backend/ExtJs/backend/index/model/visitors.js index 190e09cd7c0..b64822f56a5 100644 --- a/themes/Backend/ExtJs/backend/index/model/visitors.js +++ b/themes/Backend/ExtJs/backend/index/model/visitors.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/model/widget.js b/themes/Backend/ExtJs/backend/index/model/widget.js index b46fd88977a..338c0eee1b8 100644 --- a/themes/Backend/ExtJs/backend/index/model/widget.js +++ b/themes/Backend/ExtJs/backend/index/model/widget.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/index/model/widget"} diff --git a/themes/Backend/ExtJs/backend/index/model/widget_settings.js b/themes/Backend/ExtJs/backend/index/model/widget_settings.js index 81340b859e1..27521c7813a 100644 --- a/themes/Backend/ExtJs/backend/index/model/widget_settings.js +++ b/themes/Backend/ExtJs/backend/index/model/widget_settings.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/index/model/widget_settings"} diff --git a/themes/Backend/ExtJs/backend/index/store/error_reporter.js b/themes/Backend/ExtJs/backend/index/store/error_reporter.js index 327fc4c8faa..da76605fbdb 100644 --- a/themes/Backend/ExtJs/backend/index/store/error_reporter.js +++ b/themes/Backend/ExtJs/backend/index/store/error_reporter.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/store/merchant.js b/themes/Backend/ExtJs/backend/index/store/merchant.js index d5850cc438a..06a3c4c74a4 100644 --- a/themes/Backend/ExtJs/backend/index/store/merchant.js +++ b/themes/Backend/ExtJs/backend/index/store/merchant.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/store/news.js b/themes/Backend/ExtJs/backend/index/store/news.js index 083f2d677b8..a615d11383e 100644 --- a/themes/Backend/ExtJs/backend/index/store/news.js +++ b/themes/Backend/ExtJs/backend/index/store/news.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/index/store/news"} diff --git a/themes/Backend/ExtJs/backend/index/store/news_local.js b/themes/Backend/ExtJs/backend/index/store/news_local.js index b1c7ea92073..d66cc6ecbbd 100644 --- a/themes/Backend/ExtJs/backend/index/store/news_local.js +++ b/themes/Backend/ExtJs/backend/index/store/news_local.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/index/store/news_local"} diff --git a/themes/Backend/ExtJs/backend/index/store/orders.js b/themes/Backend/ExtJs/backend/index/store/orders.js index 17a6812cffd..57c051d979f 100644 --- a/themes/Backend/ExtJs/backend/index/store/orders.js +++ b/themes/Backend/ExtJs/backend/index/store/orders.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/store/theme_cache_warm_up.js b/themes/Backend/ExtJs/backend/index/store/theme_cache_warm_up.js index 7f8e05978ec..d3d84f6b512 100644 --- a/themes/Backend/ExtJs/backend/index/store/theme_cache_warm_up.js +++ b/themes/Backend/ExtJs/backend/index/store/theme_cache_warm_up.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/store/turnover.js b/themes/Backend/ExtJs/backend/index/store/turnover.js index 534734d5756..5972169f070 100644 --- a/themes/Backend/ExtJs/backend/index/store/turnover.js +++ b/themes/Backend/ExtJs/backend/index/store/turnover.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/store/visitors.js b/themes/Backend/ExtJs/backend/index/store/visitors.js index a94f9342aee..c414df123d9 100644 --- a/themes/Backend/ExtJs/backend/index/store/visitors.js +++ b/themes/Backend/ExtJs/backend/index/store/visitors.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/store/widget.js b/themes/Backend/ExtJs/backend/index/store/widget.js index c31a37adcce..9f76c909336 100644 --- a/themes/Backend/ExtJs/backend/index/store/widget.js +++ b/themes/Backend/ExtJs/backend/index/store/widget.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/index/store/widget"} diff --git a/themes/Backend/ExtJs/backend/index/store/widget_settings.js b/themes/Backend/ExtJs/backend/index/store/widget_settings.js index 436ba86bbdf..ccdcfbe5ce1 100644 --- a/themes/Backend/ExtJs/backend/index/store/widget_settings.js +++ b/themes/Backend/ExtJs/backend/index/store/widget_settings.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/index/store/widget_settings"} diff --git a/themes/Backend/ExtJs/backend/index/view/error_reporter/list.js b/themes/Backend/ExtJs/backend/index/view/error_reporter/list.js index 654c7f1b432..e39edc0003e 100644 --- a/themes/Backend/ExtJs/backend/index/view/error_reporter/list.js +++ b/themes/Backend/ExtJs/backend/index/view/error_reporter/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/view/footer.js b/themes/Backend/ExtJs/backend/index/view/footer.js index 3288f19751c..67aadb54230 100644 --- a/themes/Backend/ExtJs/backend/index/view/footer.js +++ b/themes/Backend/ExtJs/backend/index/view/footer.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/index/view/detail"} diff --git a/themes/Backend/ExtJs/backend/index/view/main.js b/themes/Backend/ExtJs/backend/index/view/main.js index 2d8d9337520..64c3a8870b7 100644 --- a/themes/Backend/ExtJs/backend/index/view/main.js +++ b/themes/Backend/ExtJs/backend/index/view/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/view/menu.js b/themes/Backend/ExtJs/backend/index/view/menu.js index 77d2e769a2f..de2035a36ad 100644 --- a/themes/Backend/ExtJs/backend/index/view/menu.js +++ b/themes/Backend/ExtJs/backend/index/view/menu.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/index/view/menu"} diff --git a/themes/Backend/ExtJs/backend/index/view/merchant/window.js b/themes/Backend/ExtJs/backend/index/view/merchant/window.js index 19e11081023..9aef2413a26 100644 --- a/themes/Backend/ExtJs/backend/index/view/merchant/window.js +++ b/themes/Backend/ExtJs/backend/index/view/merchant/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/index/view/widgets"} diff --git a/themes/Backend/ExtJs/backend/index/view/search.js b/themes/Backend/ExtJs/backend/index/view/search.js index d8bb62f41a8..67db32d6fbe 100644 --- a/themes/Backend/ExtJs/backend/index/view/search.js +++ b/themes/Backend/ExtJs/backend/index/view/search.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/view/theme_cache/theme_cache_warm_up.js b/themes/Backend/ExtJs/backend/index/view/theme_cache/theme_cache_warm_up.js index f634eccc39d..572f4acbb97 100644 --- a/themes/Backend/ExtJs/backend/index/view/theme_cache/theme_cache_warm_up.js +++ b/themes/Backend/ExtJs/backend/index/view/theme_cache/theme_cache_warm_up.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Window diff --git a/themes/Backend/ExtJs/backend/index/view/widgets/base.js b/themes/Backend/ExtJs/backend/index/view/widgets/base.js index 657a82fa8b0..bec01babd8f 100644 --- a/themes/Backend/ExtJs/backend/index/view/widgets/base.js +++ b/themes/Backend/ExtJs/backend/index/view/widgets/base.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/index/view/widgets/merchant.js b/themes/Backend/ExtJs/backend/index/view/widgets/merchant.js index 82bd93100b2..004af6c2c07 100644 --- a/themes/Backend/ExtJs/backend/index/view/widgets/merchant.js +++ b/themes/Backend/ExtJs/backend/index/view/widgets/merchant.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/index/view/widgets"} diff --git a/themes/Backend/ExtJs/backend/index/view/widgets/news.js b/themes/Backend/ExtJs/backend/index/view/widgets/news.js index 5962a9a47f1..a7e9f352559 100644 --- a/themes/Backend/ExtJs/backend/index/view/widgets/news.js +++ b/themes/Backend/ExtJs/backend/index/view/widgets/news.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/index/view/widgets"} diff --git a/themes/Backend/ExtJs/backend/index/view/widgets/notice.js b/themes/Backend/ExtJs/backend/index/view/widgets/notice.js index e6d0d862a6f..6fc9c4c5955 100644 --- a/themes/Backend/ExtJs/backend/index/view/widgets/notice.js +++ b/themes/Backend/ExtJs/backend/index/view/widgets/notice.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/index/view/widgets"} diff --git a/themes/Backend/ExtJs/backend/index/view/widgets/orders.js b/themes/Backend/ExtJs/backend/index/view/widgets/orders.js index a85a4fc9b00..8fdb74ca516 100644 --- a/themes/Backend/ExtJs/backend/index/view/widgets/orders.js +++ b/themes/Backend/ExtJs/backend/index/view/widgets/orders.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/index/view/widgets"} diff --git a/themes/Backend/ExtJs/backend/index/view/widgets/rating.js b/themes/Backend/ExtJs/backend/index/view/widgets/rating.js index 8b18464508f..beecda60448 100644 --- a/themes/Backend/ExtJs/backend/index/view/widgets/rating.js +++ b/themes/Backend/ExtJs/backend/index/view/widgets/rating.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/index/view/widgets"} diff --git a/themes/Backend/ExtJs/backend/index/view/widgets/sales.js b/themes/Backend/ExtJs/backend/index/view/widgets/sales.js index 2f86b3ff157..a8d2cb22509 100644 --- a/themes/Backend/ExtJs/backend/index/view/widgets/sales.js +++ b/themes/Backend/ExtJs/backend/index/view/widgets/sales.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/index/view/widgets"} @@ -181,7 +180,7 @@ Ext.define('Shopware.apps.Index.view.widgets.Sales', { ] }); }, - + /** * Helper method for load and format of the conversion rate * @@ -300,7 +299,7 @@ Ext.define('Shopware.apps.Index.view.widgets.Sales', { display: 'insideEnd', orientation: 'horizontal', field: 'turnover', - renderer: function (value) { + renderer: function (value) { return Ext.util.Format.currency(value); }, fill: '#FFFFFF', diff --git a/themes/Backend/ExtJs/backend/index/view/widgets/upload.js b/themes/Backend/ExtJs/backend/index/view/widgets/upload.js index 808488fcbe3..15dc2078899 100644 --- a/themes/Backend/ExtJs/backend/index/view/widgets/upload.js +++ b/themes/Backend/ExtJs/backend/index/view/widgets/upload.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/index/view/widgets"} diff --git a/themes/Backend/ExtJs/backend/index/view/widgets/visitors.js b/themes/Backend/ExtJs/backend/index/view/widgets/visitors.js index f875d887910..2504c9503ec 100644 --- a/themes/Backend/ExtJs/backend/index/view/widgets/visitors.js +++ b/themes/Backend/ExtJs/backend/index/view/widgets/visitors.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/index/view/widgets"} diff --git a/themes/Backend/ExtJs/backend/index/view/widgets/window.js b/themes/Backend/ExtJs/backend/index/view/widgets/window.js index 1184e599dac..d60709706e2 100644 --- a/themes/Backend/ExtJs/backend/index/view/widgets/window.js +++ b/themes/Backend/ExtJs/backend/index/view/widgets/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/log/app.js b/themes/Backend/ExtJs/backend/log/app.js index cdec0191602..a7ad97ca8b0 100644 --- a/themes/Backend/ExtJs/backend/log/app.js +++ b/themes/Backend/ExtJs/backend/log/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Log diff --git a/themes/Backend/ExtJs/backend/log/controller/log.js b/themes/Backend/ExtJs/backend/log/controller/log.js index a158e4b7e82..58fa44eec89 100644 --- a/themes/Backend/ExtJs/backend/log/controller/log.js +++ b/themes/Backend/ExtJs/backend/log/controller/log.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Log diff --git a/themes/Backend/ExtJs/backend/log/controller/main.js b/themes/Backend/ExtJs/backend/log/controller/main.js index 3135fa32bb0..683f0d80879 100644 --- a/themes/Backend/ExtJs/backend/log/controller/main.js +++ b/themes/Backend/ExtJs/backend/log/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Log diff --git a/themes/Backend/ExtJs/backend/log/controller/system.js b/themes/Backend/ExtJs/backend/log/controller/system.js index d857e047526..ff186c8eb6a 100644 --- a/themes/Backend/ExtJs/backend/log/controller/system.js +++ b/themes/Backend/ExtJs/backend/log/controller/system.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/log/controller/system"} diff --git a/themes/Backend/ExtJs/backend/log/model/log.js b/themes/Backend/ExtJs/backend/log/model/log.js index 2434ea19fff..76f16b61786 100644 --- a/themes/Backend/ExtJs/backend/log/model/log.js +++ b/themes/Backend/ExtJs/backend/log/model/log.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Log diff --git a/themes/Backend/ExtJs/backend/log/model/log_file.js b/themes/Backend/ExtJs/backend/log/model/log_file.js index a81c86c4251..7c3c447dfe0 100644 --- a/themes/Backend/ExtJs/backend/log/model/log_file.js +++ b/themes/Backend/ExtJs/backend/log/model/log_file.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/log/model/system_log.js b/themes/Backend/ExtJs/backend/log/model/system_log.js index 25bba6e28c1..a9c947f66ff 100644 --- a/themes/Backend/ExtJs/backend/log/model/system_log.js +++ b/themes/Backend/ExtJs/backend/log/model/system_log.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/log/store/log_files.js b/themes/Backend/ExtJs/backend/log/store/log_files.js index edb83f20376..aae9fb372ad 100644 --- a/themes/Backend/ExtJs/backend/log/store/log_files.js +++ b/themes/Backend/ExtJs/backend/log/store/log_files.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/log/store/logs.js b/themes/Backend/ExtJs/backend/log/store/logs.js index 9f998a2cefc..cd6ac43a2c4 100644 --- a/themes/Backend/ExtJs/backend/log/store/logs.js +++ b/themes/Backend/ExtJs/backend/log/store/logs.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Log diff --git a/themes/Backend/ExtJs/backend/log/store/system_logs.js b/themes/Backend/ExtJs/backend/log/store/system_logs.js index 4731a75f506..2b3fb13c628 100644 --- a/themes/Backend/ExtJs/backend/log/store/system_logs.js +++ b/themes/Backend/ExtJs/backend/log/store/system_logs.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/log/view/log/detail.js b/themes/Backend/ExtJs/backend/log/view/log/detail.js index 314f7af4e6c..845d07ac138 100644 --- a/themes/Backend/ExtJs/backend/log/view/log/detail.js +++ b/themes/Backend/ExtJs/backend/log/view/log/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Log diff --git a/themes/Backend/ExtJs/backend/log/view/log/list.js b/themes/Backend/ExtJs/backend/log/view/log/list.js index caf978e92a2..ebd81ca8673 100644 --- a/themes/Backend/ExtJs/backend/log/view/log/list.js +++ b/themes/Backend/ExtJs/backend/log/view/log/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Log diff --git a/themes/Backend/ExtJs/backend/log/view/main/window.js b/themes/Backend/ExtJs/backend/log/view/main/window.js index 1e9542a0f2a..420fac87cb2 100644 --- a/themes/Backend/ExtJs/backend/log/view/main/window.js +++ b/themes/Backend/ExtJs/backend/log/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/log/main"} diff --git a/themes/Backend/ExtJs/backend/log/view/system/detail.js b/themes/Backend/ExtJs/backend/log/view/system/detail.js index e80a1d3476d..e0ae551b22c 100644 --- a/themes/Backend/ExtJs/backend/log/view/system/detail.js +++ b/themes/Backend/ExtJs/backend/log/view/system/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Log diff --git a/themes/Backend/ExtJs/backend/log/view/system/list.js b/themes/Backend/ExtJs/backend/log/view/system/list.js index 71fbacb9a4c..4b7c123dc9e 100644 --- a/themes/Backend/ExtJs/backend/log/view/system/list.js +++ b/themes/Backend/ExtJs/backend/log/view/system/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/login/app.js b/themes/Backend/ExtJs/backend/login/app.js index 9de4640c5b2..39480e5427a 100644 --- a/themes/Backend/ExtJs/backend/login/app.js +++ b/themes/Backend/ExtJs/backend/login/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Login diff --git a/themes/Backend/ExtJs/backend/login/controller/main.js b/themes/Backend/ExtJs/backend/login/controller/main.js index 546ad62141f..7a726e053e0 100644 --- a/themes/Backend/ExtJs/backend/login/controller/main.js +++ b/themes/Backend/ExtJs/backend/login/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Login diff --git a/themes/Backend/ExtJs/backend/login/model/locale.js b/themes/Backend/ExtJs/backend/login/model/locale.js index 4493209f4b1..59d66980fb9 100644 --- a/themes/Backend/ExtJs/backend/login/model/locale.js +++ b/themes/Backend/ExtJs/backend/login/model/locale.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Login diff --git a/themes/Backend/ExtJs/backend/login/store/locale.js b/themes/Backend/ExtJs/backend/login/store/locale.js index e6da1a0b3f8..9cf47560151 100644 --- a/themes/Backend/ExtJs/backend/login/store/locale.js +++ b/themes/Backend/ExtJs/backend/login/store/locale.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Login diff --git a/themes/Backend/ExtJs/backend/login/view/main.js b/themes/Backend/ExtJs/backend/login/view/main.js index 4cc5b6ed434..c4a3989dbbd 100644 --- a/themes/Backend/ExtJs/backend/login/view/main.js +++ b/themes/Backend/ExtJs/backend/login/view/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Login diff --git a/themes/Backend/ExtJs/backend/login/view/main/form.js b/themes/Backend/ExtJs/backend/login/view/main/form.js index 10937d728b4..9237cb3b0f8 100644 --- a/themes/Backend/ExtJs/backend/login/view/main/form.js +++ b/themes/Backend/ExtJs/backend/login/view/main/form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Login diff --git a/themes/Backend/ExtJs/backend/mail/app.js b/themes/Backend/ExtJs/backend/mail/app.js index 20f2eb109d2..3dbbda6d887 100644 --- a/themes/Backend/ExtJs/backend/mail/app.js +++ b/themes/Backend/ExtJs/backend/mail/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Mail diff --git a/themes/Backend/ExtJs/backend/mail/controller/attachment.js b/themes/Backend/ExtJs/backend/mail/controller/attachment.js index 34998f287d0..6adbbb597c4 100644 --- a/themes/Backend/ExtJs/backend/mail/controller/attachment.js +++ b/themes/Backend/ExtJs/backend/mail/controller/attachment.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Mail diff --git a/themes/Backend/ExtJs/backend/mail/controller/main.js b/themes/Backend/ExtJs/backend/mail/controller/main.js index 7503cef0792..aa324e01dee 100644 --- a/themes/Backend/ExtJs/backend/mail/controller/main.js +++ b/themes/Backend/ExtJs/backend/mail/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Mail diff --git a/themes/Backend/ExtJs/backend/mail/model/attachment.js b/themes/Backend/ExtJs/backend/mail/model/attachment.js index 9c778cf0cf2..d8da56f85b2 100644 --- a/themes/Backend/ExtJs/backend/mail/model/attachment.js +++ b/themes/Backend/ExtJs/backend/mail/model/attachment.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Mail diff --git a/themes/Backend/ExtJs/backend/mail/model/mail.js b/themes/Backend/ExtJs/backend/mail/model/mail.js index 3f313974876..e9bae5fbcf9 100644 --- a/themes/Backend/ExtJs/backend/mail/model/mail.js +++ b/themes/Backend/ExtJs/backend/mail/model/mail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Mail diff --git a/themes/Backend/ExtJs/backend/mail/store/attachment.js b/themes/Backend/ExtJs/backend/mail/store/attachment.js index 2aa9f06b61e..fbc914ae621 100644 --- a/themes/Backend/ExtJs/backend/mail/store/attachment.js +++ b/themes/Backend/ExtJs/backend/mail/store/attachment.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Mail diff --git a/themes/Backend/ExtJs/backend/mail/store/mail.js b/themes/Backend/ExtJs/backend/mail/store/mail.js index 0cd9467e788..ad1c92511c6 100644 --- a/themes/Backend/ExtJs/backend/mail/store/mail.js +++ b/themes/Backend/ExtJs/backend/mail/store/mail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Mail diff --git a/themes/Backend/ExtJs/backend/mail/store/tree.js b/themes/Backend/ExtJs/backend/mail/store/tree.js index c16e009cd9a..37ce7e49d93 100644 --- a/themes/Backend/ExtJs/backend/mail/store/tree.js +++ b/themes/Backend/ExtJs/backend/mail/store/tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Mail diff --git a/themes/Backend/ExtJs/backend/mail/view/main/attachments.js b/themes/Backend/ExtJs/backend/mail/view/main/attachments.js index ad627acb849..bb83fef9c98 100644 --- a/themes/Backend/ExtJs/backend/mail/view/main/attachments.js +++ b/themes/Backend/ExtJs/backend/mail/view/main/attachments.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Mail diff --git a/themes/Backend/ExtJs/backend/mail/view/main/content_editor.js b/themes/Backend/ExtJs/backend/mail/view/main/content_editor.js index 272f7ab369c..4e1ca5f7801 100644 --- a/themes/Backend/ExtJs/backend/mail/view/main/content_editor.js +++ b/themes/Backend/ExtJs/backend/mail/view/main/content_editor.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Mail diff --git a/themes/Backend/ExtJs/backend/mail/view/main/form.js b/themes/Backend/ExtJs/backend/mail/view/main/form.js index e66eab5e9f2..c7d43dc3e20 100644 --- a/themes/Backend/ExtJs/backend/mail/view/main/form.js +++ b/themes/Backend/ExtJs/backend/mail/view/main/form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Mail diff --git a/themes/Backend/ExtJs/backend/mail/view/main/info.js b/themes/Backend/ExtJs/backend/mail/view/main/info.js index 40a270595a2..4adaef150a7 100644 --- a/themes/Backend/ExtJs/backend/mail/view/main/info.js +++ b/themes/Backend/ExtJs/backend/mail/view/main/info.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Mail diff --git a/themes/Backend/ExtJs/backend/mail/view/main/navigation.js b/themes/Backend/ExtJs/backend/mail/view/main/navigation.js index 4fc4e7081f8..9f1e56c08a0 100644 --- a/themes/Backend/ExtJs/backend/mail/view/main/navigation.js +++ b/themes/Backend/ExtJs/backend/mail/view/main/navigation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Mail diff --git a/themes/Backend/ExtJs/backend/mail/view/main/window.js b/themes/Backend/ExtJs/backend/mail/view/main/window.js index b8eb4415dfc..9acdd6c5f39 100644 --- a/themes/Backend/ExtJs/backend/mail/view/main/window.js +++ b/themes/Backend/ExtJs/backend/mail/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Mail diff --git a/themes/Backend/ExtJs/backend/media_manager/app.js b/themes/Backend/ExtJs/backend/media_manager/app.js index 682703496d1..6aa5a3ca478 100644 --- a/themes/Backend/ExtJs/backend/media_manager/app.js +++ b/themes/Backend/ExtJs/backend/media_manager/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package MediaManager diff --git a/themes/Backend/ExtJs/backend/media_manager/controller/album.js b/themes/Backend/ExtJs/backend/media_manager/controller/album.js index f886286b346..447ab705d31 100644 --- a/themes/Backend/ExtJs/backend/media_manager/controller/album.js +++ b/themes/Backend/ExtJs/backend/media_manager/controller/album.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package MediaManager diff --git a/themes/Backend/ExtJs/backend/media_manager/controller/main.js b/themes/Backend/ExtJs/backend/media_manager/controller/main.js index 51cd0c412ba..1870e7120f1 100644 --- a/themes/Backend/ExtJs/backend/media_manager/controller/main.js +++ b/themes/Backend/ExtJs/backend/media_manager/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package MediaManager diff --git a/themes/Backend/ExtJs/backend/media_manager/controller/media.js b/themes/Backend/ExtJs/backend/media_manager/controller/media.js index 4596a1552f2..b4e265ba216 100644 --- a/themes/Backend/ExtJs/backend/media_manager/controller/media.js +++ b/themes/Backend/ExtJs/backend/media_manager/controller/media.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package MediaManager diff --git a/themes/Backend/ExtJs/backend/media_manager/controller/thumbnail.js b/themes/Backend/ExtJs/backend/media_manager/controller/thumbnail.js index fc3f4078737..8dffd886920 100644 --- a/themes/Backend/ExtJs/backend/media_manager/controller/thumbnail.js +++ b/themes/Backend/ExtJs/backend/media_manager/controller/thumbnail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/media_manager/model/album.js b/themes/Backend/ExtJs/backend/media_manager/model/album.js index df5845d2f51..e3b2ce203ee 100644 --- a/themes/Backend/ExtJs/backend/media_manager/model/album.js +++ b/themes/Backend/ExtJs/backend/media_manager/model/album.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package MediaManager diff --git a/themes/Backend/ExtJs/backend/media_manager/model/media.js b/themes/Backend/ExtJs/backend/media_manager/model/media.js index ece0509291a..2fff53db5f8 100644 --- a/themes/Backend/ExtJs/backend/media_manager/model/media.js +++ b/themes/Backend/ExtJs/backend/media_manager/model/media.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package MediaManager diff --git a/themes/Backend/ExtJs/backend/media_manager/model/setting.js b/themes/Backend/ExtJs/backend/media_manager/model/setting.js index fad28388619..78b2091e65d 100644 --- a/themes/Backend/ExtJs/backend/media_manager/model/setting.js +++ b/themes/Backend/ExtJs/backend/media_manager/model/setting.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package MediaManager diff --git a/themes/Backend/ExtJs/backend/media_manager/store/album.js b/themes/Backend/ExtJs/backend/media_manager/store/album.js index a7e79c778c3..fddeb236ddd 100644 --- a/themes/Backend/ExtJs/backend/media_manager/store/album.js +++ b/themes/Backend/ExtJs/backend/media_manager/store/album.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package MediaManager diff --git a/themes/Backend/ExtJs/backend/media_manager/store/media.js b/themes/Backend/ExtJs/backend/media_manager/store/media.js index 32308c4977b..8fe920bd2ae 100644 --- a/themes/Backend/ExtJs/backend/media_manager/store/media.js +++ b/themes/Backend/ExtJs/backend/media_manager/store/media.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package MediaManager diff --git a/themes/Backend/ExtJs/backend/media_manager/view/album/add.js b/themes/Backend/ExtJs/backend/media_manager/view/album/add.js index 335b899fd65..2d696607995 100644 --- a/themes/Backend/ExtJs/backend/media_manager/view/album/add.js +++ b/themes/Backend/ExtJs/backend/media_manager/view/album/add.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package MediaManager diff --git a/themes/Backend/ExtJs/backend/media_manager/view/album/setting.js b/themes/Backend/ExtJs/backend/media_manager/view/album/setting.js index c81e7061491..373ab034653 100644 --- a/themes/Backend/ExtJs/backend/media_manager/view/album/setting.js +++ b/themes/Backend/ExtJs/backend/media_manager/view/album/setting.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package MediaManager diff --git a/themes/Backend/ExtJs/backend/media_manager/view/album/tree.js b/themes/Backend/ExtJs/backend/media_manager/view/album/tree.js index 0b19b06f6b5..abbc48ba99e 100644 --- a/themes/Backend/ExtJs/backend/media_manager/view/album/tree.js +++ b/themes/Backend/ExtJs/backend/media_manager/view/album/tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package MediaManager diff --git a/themes/Backend/ExtJs/backend/media_manager/view/batch_move/batch_move.js b/themes/Backend/ExtJs/backend/media_manager/view/batch_move/batch_move.js index 20ae492f495..2817a2f265b 100644 --- a/themes/Backend/ExtJs/backend/media_manager/view/batch_move/batch_move.js +++ b/themes/Backend/ExtJs/backend/media_manager/view/batch_move/batch_move.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/media_manager/view/main"} diff --git a/themes/Backend/ExtJs/backend/media_manager/view/main/selection.js b/themes/Backend/ExtJs/backend/media_manager/view/main/selection.js index e45503c1ea6..4b7692e9b24 100644 --- a/themes/Backend/ExtJs/backend/media_manager/view/main/selection.js +++ b/themes/Backend/ExtJs/backend/media_manager/view/main/selection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package MediaManager diff --git a/themes/Backend/ExtJs/backend/media_manager/view/main/window.js b/themes/Backend/ExtJs/backend/media_manager/view/main/window.js index 2e725d7e0e2..5e654b2a504 100644 --- a/themes/Backend/ExtJs/backend/media_manager/view/main/window.js +++ b/themes/Backend/ExtJs/backend/media_manager/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package MediaManager diff --git a/themes/Backend/ExtJs/backend/media_manager/view/media/grid.js b/themes/Backend/ExtJs/backend/media_manager/view/media/grid.js index 91265f1ef0c..73c2459a28e 100644 --- a/themes/Backend/ExtJs/backend/media_manager/view/media/grid.js +++ b/themes/Backend/ExtJs/backend/media_manager/view/media/grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package MediaManager diff --git a/themes/Backend/ExtJs/backend/media_manager/view/media/view.js b/themes/Backend/ExtJs/backend/media_manager/view/media/view.js index 7699c1d7219..851e9305634 100644 --- a/themes/Backend/ExtJs/backend/media_manager/view/media/view.js +++ b/themes/Backend/ExtJs/backend/media_manager/view/media/view.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package MediaManager diff --git a/themes/Backend/ExtJs/backend/media_manager/view/replace/file_select.js b/themes/Backend/ExtJs/backend/media_manager/view/replace/file_select.js index b0123a93119..33eb286d31d 100644 --- a/themes/Backend/ExtJs/backend/media_manager/view/replace/file_select.js +++ b/themes/Backend/ExtJs/backend/media_manager/view/replace/file_select.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * */ diff --git a/themes/Backend/ExtJs/backend/media_manager/view/replace/grid.js b/themes/Backend/ExtJs/backend/media_manager/view/replace/grid.js index d85c0295353..c859001205a 100644 --- a/themes/Backend/ExtJs/backend/media_manager/view/replace/grid.js +++ b/themes/Backend/ExtJs/backend/media_manager/view/replace/grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * */ diff --git a/themes/Backend/ExtJs/backend/media_manager/view/replace/row.js b/themes/Backend/ExtJs/backend/media_manager/view/replace/row.js index 09881409505..311b327764b 100644 --- a/themes/Backend/ExtJs/backend/media_manager/view/replace/row.js +++ b/themes/Backend/ExtJs/backend/media_manager/view/replace/row.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * */ diff --git a/themes/Backend/ExtJs/backend/media_manager/view/replace/upload.js b/themes/Backend/ExtJs/backend/media_manager/view/replace/upload.js index 13a9f3a7237..ea63eac4a29 100644 --- a/themes/Backend/ExtJs/backend/media_manager/view/replace/upload.js +++ b/themes/Backend/ExtJs/backend/media_manager/view/replace/upload.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * */ diff --git a/themes/Backend/ExtJs/backend/media_manager/view/replace/window.js b/themes/Backend/ExtJs/backend/media_manager/view/replace/window.js index 0cb04e618e7..bed15305583 100644 --- a/themes/Backend/ExtJs/backend/media_manager/view/replace/window.js +++ b/themes/Backend/ExtJs/backend/media_manager/view/replace/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * */ diff --git a/themes/Backend/ExtJs/backend/media_manager/view/thumbnail/main.js b/themes/Backend/ExtJs/backend/media_manager/view/thumbnail/main.js index ef840aebd34..66316ec1743 100644 --- a/themes/Backend/ExtJs/backend/media_manager/view/thumbnail/main.js +++ b/themes/Backend/ExtJs/backend/media_manager/view/thumbnail/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/app.js b/themes/Backend/ExtJs/backend/newsletter_manager/app.js index b268e27c89a..7c6073b21a4 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/app.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/controller/admin.js b/themes/Backend/ExtJs/backend/newsletter_manager/controller/admin.js index a2620ab8726..c785aacbc35 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/controller/admin.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/controller/admin.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/controller/editor.js b/themes/Backend/ExtJs/backend/newsletter_manager/controller/editor.js index 144a7bdeb0f..40bcfa0216a 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/controller/editor.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/controller/editor.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/controller/main.js b/themes/Backend/ExtJs/backend/newsletter_manager/controller/main.js index 3129393d336..d4329d9d2a8 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/controller/main.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/controller/overview.js b/themes/Backend/ExtJs/backend/newsletter_manager/controller/overview.js index 48d2c12d5c2..7b6b798483f 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/controller/overview.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/controller/overview.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/model/container.js b/themes/Backend/ExtJs/backend/newsletter_manager/model/container.js index f5291b29e34..62d4d78b071 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/model/container.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/model/container.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/model/container_type_text.js b/themes/Backend/ExtJs/backend/newsletter_manager/model/container_type_text.js index bbbf75a1104..ae25cd2d6c1 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/model/container_type_text.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/model/container_type_text.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/model/mail_dispatch.js b/themes/Backend/ExtJs/backend/newsletter_manager/model/mail_dispatch.js index 8235b75dedd..b78b30e2922 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/model/mail_dispatch.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/model/mail_dispatch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/model/mailing.js b/themes/Backend/ExtJs/backend/newsletter_manager/model/mailing.js index b40ff072128..5409ba7c0f0 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/model/mailing.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/model/mailing.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/model/newsletter_group.js b/themes/Backend/ExtJs/backend/newsletter_manager/model/newsletter_group.js index a79b32c857a..f40b66aa264 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/model/newsletter_group.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/model/newsletter_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/model/recipient.js b/themes/Backend/ExtJs/backend/newsletter_manager/model/recipient.js index 3b1b7d59859..574e95ec6ca 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/model/recipient.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/model/recipient.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/model/recipient_group.js b/themes/Backend/ExtJs/backend/newsletter_manager/model/recipient_group.js index 4c97b92ca13..4dbcb8eac61 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/model/recipient_group.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/model/recipient_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/model/sender.js b/themes/Backend/ExtJs/backend/newsletter_manager/model/sender.js index 88bcfc26ef2..65231ab19dc 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/model/sender.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/model/sender.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/model/settings.js b/themes/Backend/ExtJs/backend/newsletter_manager/model/settings.js index da0c4afbf2b..03cd24ae139 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/model/settings.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/model/settings.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/store/mail_dispatch.js b/themes/Backend/ExtJs/backend/newsletter_manager/store/mail_dispatch.js index acc95e84f56..8875e2f4036 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/store/mail_dispatch.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/store/mail_dispatch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/store/mailing.js b/themes/Backend/ExtJs/backend/newsletter_manager/store/mailing.js index b456d1e73a7..1b623fa0d59 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/store/mailing.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/store/mailing.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/store/newsletter_group.js b/themes/Backend/ExtJs/backend/newsletter_manager/store/newsletter_group.js index 500e6df2aeb..28d4f6c012e 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/store/newsletter_group.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/store/newsletter_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/store/recipient.js b/themes/Backend/ExtJs/backend/newsletter_manager/store/recipient.js index 26f784f219c..a2df7f568ea 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/store/recipient.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/store/recipient.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/store/recipient_group.js b/themes/Backend/ExtJs/backend/newsletter_manager/store/recipient_group.js index 318740021fc..e9b2b8d518a 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/store/recipient_group.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/store/recipient_group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/store/sender.js b/themes/Backend/ExtJs/backend/newsletter_manager/store/sender.js index ed66e9c3e81..f336103e535 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/store/sender.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/store/sender.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/view/main/window.js b/themes/Backend/ExtJs/backend/newsletter_manager/view/main/window.js index e6db549e91b..a9c290b7223 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/view/main/window.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/bottom_toolbar.js b/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/bottom_toolbar.js index e4d51b9a920..e94dcf13c6a 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/bottom_toolbar.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/bottom_toolbar.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/editor.js b/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/editor.js index b0458d623ec..e92d979f0cc 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/editor.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/editor.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/settings.js b/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/settings.js index de2fd5a8f33..0edead52add 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/settings.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/settings.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/window.js b/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/window.js index 420fac93ac4..0beed83d785 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/window.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/view/sender_dialog.js b/themes/Backend/ExtJs/backend/newsletter_manager/view/sender_dialog.js index 5b2e14ba7cb..5ec470bc0c7 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/view/sender_dialog.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/view/sender_dialog.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/admin.js b/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/admin.js index 318e3eb8fcf..2e33833c4b8 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/admin.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/admin.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/overview.js b/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/overview.js index 98272f47f06..6b1ec5b681b 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/overview.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/overview.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/recipient_groups.js b/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/recipient_groups.js index 818d65a26dc..1d979eeaa69 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/recipient_groups.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/recipient_groups.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/recipients.js b/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/recipients.js index 3fcbd2bbd05..dafaaf042ab 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/recipients.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/recipients.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/sender.js b/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/sender.js index ba5de172738..7224e162d07 100644 --- a/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/sender.js +++ b/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/sender.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package NewsletterManager diff --git a/themes/Backend/ExtJs/backend/notification/app.js b/themes/Backend/ExtJs/backend/notification/app.js index 2104c9918d6..c54bcce0556 100644 --- a/themes/Backend/ExtJs/backend/notification/app.js +++ b/themes/Backend/ExtJs/backend/notification/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Notification diff --git a/themes/Backend/ExtJs/backend/notification/controller/main.js b/themes/Backend/ExtJs/backend/notification/controller/main.js index f7346271620..4740893fa6e 100644 --- a/themes/Backend/ExtJs/backend/notification/controller/main.js +++ b/themes/Backend/ExtJs/backend/notification/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Notification diff --git a/themes/Backend/ExtJs/backend/notification/controller/notification.js b/themes/Backend/ExtJs/backend/notification/controller/notification.js index 7430c222bd8..41314f1a69f 100644 --- a/themes/Backend/ExtJs/backend/notification/controller/notification.js +++ b/themes/Backend/ExtJs/backend/notification/controller/notification.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Notification diff --git a/themes/Backend/ExtJs/backend/notification/model/article.js b/themes/Backend/ExtJs/backend/notification/model/article.js index 2db50b95bdd..bb1f20e0e99 100644 --- a/themes/Backend/ExtJs/backend/notification/model/article.js +++ b/themes/Backend/ExtJs/backend/notification/model/article.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Notification diff --git a/themes/Backend/ExtJs/backend/notification/model/customer.js b/themes/Backend/ExtJs/backend/notification/model/customer.js index 4fe051d87ed..d2a5f80742a 100644 --- a/themes/Backend/ExtJs/backend/notification/model/customer.js +++ b/themes/Backend/ExtJs/backend/notification/model/customer.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Notification diff --git a/themes/Backend/ExtJs/backend/notification/store/article.js b/themes/Backend/ExtJs/backend/notification/store/article.js index 9f068f56245..c5735497bbb 100644 --- a/themes/Backend/ExtJs/backend/notification/store/article.js +++ b/themes/Backend/ExtJs/backend/notification/store/article.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Notification diff --git a/themes/Backend/ExtJs/backend/notification/store/customer.js b/themes/Backend/ExtJs/backend/notification/store/customer.js index 39966a03d94..ba33fc45484 100644 --- a/themes/Backend/ExtJs/backend/notification/store/customer.js +++ b/themes/Backend/ExtJs/backend/notification/store/customer.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Notification diff --git a/themes/Backend/ExtJs/backend/notification/view/main/window.js b/themes/Backend/ExtJs/backend/notification/view/main/window.js index 3e8328e0091..20fbf8d343b 100644 --- a/themes/Backend/ExtJs/backend/notification/view/main/window.js +++ b/themes/Backend/ExtJs/backend/notification/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Notification diff --git a/themes/Backend/ExtJs/backend/notification/view/notification/article.js b/themes/Backend/ExtJs/backend/notification/view/notification/article.js index 8d74d9e67ca..033e6b9a0b4 100644 --- a/themes/Backend/ExtJs/backend/notification/view/notification/article.js +++ b/themes/Backend/ExtJs/backend/notification/view/notification/article.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Notification diff --git a/themes/Backend/ExtJs/backend/notification/view/notification/customer.js b/themes/Backend/ExtJs/backend/notification/view/notification/customer.js index 48538693105..0e4fe7ff277 100644 --- a/themes/Backend/ExtJs/backend/notification/view/notification/customer.js +++ b/themes/Backend/ExtJs/backend/notification/view/notification/customer.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Notification diff --git a/themes/Backend/ExtJs/backend/order/app.js b/themes/Backend/ExtJs/backend/order/app.js index b89de1d9acc..28704c1e26a 100644 --- a/themes/Backend/ExtJs/backend/order/app.js +++ b/themes/Backend/ExtJs/backend/order/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/controller/attachment.js b/themes/Backend/ExtJs/backend/order/controller/attachment.js index 6ac4c7d6881..3d46faf334f 100644 --- a/themes/Backend/ExtJs/backend/order/controller/attachment.js +++ b/themes/Backend/ExtJs/backend/order/controller/attachment.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @author shopware AG diff --git a/themes/Backend/ExtJs/backend/order/controller/batch.js b/themes/Backend/ExtJs/backend/order/controller/batch.js index 8bb03f1ff0c..0b5f5cb42c2 100644 --- a/themes/Backend/ExtJs/backend/order/controller/batch.js +++ b/themes/Backend/ExtJs/backend/order/controller/batch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/controller/detail.js b/themes/Backend/ExtJs/backend/order/controller/detail.js index a5740c12d8c..ced79853f2c 100644 --- a/themes/Backend/ExtJs/backend/order/controller/detail.js +++ b/themes/Backend/ExtJs/backend/order/controller/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/controller/document.js b/themes/Backend/ExtJs/backend/order/controller/document.js index 2163f33f97a..860955d5db5 100644 --- a/themes/Backend/ExtJs/backend/order/controller/document.js +++ b/themes/Backend/ExtJs/backend/order/controller/document.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @subpackage Controller diff --git a/themes/Backend/ExtJs/backend/order/controller/filter.js b/themes/Backend/ExtJs/backend/order/controller/filter.js index c3e12c645b2..1ea71c7ab45 100644 --- a/themes/Backend/ExtJs/backend/order/controller/filter.js +++ b/themes/Backend/ExtJs/backend/order/controller/filter.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/controller/list.js b/themes/Backend/ExtJs/backend/order/controller/list.js index 41f91d468f9..e66660f6612 100644 --- a/themes/Backend/ExtJs/backend/order/controller/list.js +++ b/themes/Backend/ExtJs/backend/order/controller/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/controller/mail.js b/themes/Backend/ExtJs/backend/order/controller/mail.js index 17ed5fdd686..6c23e5cdc84 100644 --- a/themes/Backend/ExtJs/backend/order/controller/mail.js +++ b/themes/Backend/ExtJs/backend/order/controller/mail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/controller/main.js b/themes/Backend/ExtJs/backend/order/controller/main.js index 5f6850f5b5e..ced33a3b643 100644 --- a/themes/Backend/ExtJs/backend/order/controller/main.js +++ b/themes/Backend/ExtJs/backend/order/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/model/batch.js b/themes/Backend/ExtJs/backend/order/model/batch.js index 050e565f43f..62e722ffa9f 100644 --- a/themes/Backend/ExtJs/backend/order/model/batch.js +++ b/themes/Backend/ExtJs/backend/order/model/batch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/model/billing.js b/themes/Backend/ExtJs/backend/order/model/billing.js index ecd18c207b6..b56f819fe42 100644 --- a/themes/Backend/ExtJs/backend/order/model/billing.js +++ b/themes/Backend/ExtJs/backend/order/model/billing.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/model/configuration.js b/themes/Backend/ExtJs/backend/order/model/configuration.js index 856ed8a3b2b..7e7ce6fb9db 100644 --- a/themes/Backend/ExtJs/backend/order/model/configuration.js +++ b/themes/Backend/ExtJs/backend/order/model/configuration.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/model/debit.js b/themes/Backend/ExtJs/backend/order/model/debit.js index 1ffd339d680..664e485c153 100644 --- a/themes/Backend/ExtJs/backend/order/model/debit.js +++ b/themes/Backend/ExtJs/backend/order/model/debit.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/model/detail_batch.js b/themes/Backend/ExtJs/backend/order/model/detail_batch.js index daf5089d809..f1b8db8f9e2 100644 --- a/themes/Backend/ExtJs/backend/order/model/detail_batch.js +++ b/themes/Backend/ExtJs/backend/order/model/detail_batch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/model/dispatch.js b/themes/Backend/ExtJs/backend/order/model/dispatch.js index 8c578516a47..9c8ed254f81 100644 --- a/themes/Backend/ExtJs/backend/order/model/dispatch.js +++ b/themes/Backend/ExtJs/backend/order/model/dispatch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/model/list_batch.js b/themes/Backend/ExtJs/backend/order/model/list_batch.js index e8ca42fe1c0..53e86995077 100644 --- a/themes/Backend/ExtJs/backend/order/model/list_batch.js +++ b/themes/Backend/ExtJs/backend/order/model/list_batch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/model/mail.js b/themes/Backend/ExtJs/backend/order/model/mail.js index 0febf5e810e..b82f391a4a7 100644 --- a/themes/Backend/ExtJs/backend/order/model/mail.js +++ b/themes/Backend/ExtJs/backend/order/model/mail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/model/mail_template.js b/themes/Backend/ExtJs/backend/order/model/mail_template.js index cb985e5a600..aca1259b297 100644 --- a/themes/Backend/ExtJs/backend/order/model/mail_template.js +++ b/themes/Backend/ExtJs/backend/order/model/mail_template.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/model/order.js b/themes/Backend/ExtJs/backend/order/model/order.js index 3503e0db9e8..d3eede53fce 100644 --- a/themes/Backend/ExtJs/backend/order/model/order.js +++ b/themes/Backend/ExtJs/backend/order/model/order.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/model/order_history.js b/themes/Backend/ExtJs/backend/order/model/order_history.js index 5c9a8edd668..c6985799d87 100644 --- a/themes/Backend/ExtJs/backend/order/model/order_history.js +++ b/themes/Backend/ExtJs/backend/order/model/order_history.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/model/payment.js b/themes/Backend/ExtJs/backend/order/model/payment.js index 42f0ea8779a..a648a26f702 100644 --- a/themes/Backend/ExtJs/backend/order/model/payment.js +++ b/themes/Backend/ExtJs/backend/order/model/payment.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/model/payment_instance.js b/themes/Backend/ExtJs/backend/order/model/payment_instance.js index c1d56df3ccd..fe604a01bee 100644 --- a/themes/Backend/ExtJs/backend/order/model/payment_instance.js +++ b/themes/Backend/ExtJs/backend/order/model/payment_instance.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/model/position.js b/themes/Backend/ExtJs/backend/order/model/position.js index 44ae912bfda..dc635dd1ebf 100644 --- a/themes/Backend/ExtJs/backend/order/model/position.js +++ b/themes/Backend/ExtJs/backend/order/model/position.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/model/position_product_search.js b/themes/Backend/ExtJs/backend/order/model/position_product_search.js index eef32b9064d..876affc8870 100644 --- a/themes/Backend/ExtJs/backend/order/model/position_product_search.js +++ b/themes/Backend/ExtJs/backend/order/model/position_product_search.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Base diff --git a/themes/Backend/ExtJs/backend/order/model/receipt.js b/themes/Backend/ExtJs/backend/order/model/receipt.js index 7fc2fd6b8e7..7000de6649c 100644 --- a/themes/Backend/ExtJs/backend/order/model/receipt.js +++ b/themes/Backend/ExtJs/backend/order/model/receipt.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/model/receipt_attribute.js b/themes/Backend/ExtJs/backend/order/model/receipt_attribute.js index caf919f36e5..f6478dfc43a 100644 --- a/themes/Backend/ExtJs/backend/order/model/receipt_attribute.js +++ b/themes/Backend/ExtJs/backend/order/model/receipt_attribute.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/model/shipping.js b/themes/Backend/ExtJs/backend/order/model/shipping.js index d5201659440..a7424a3c5c7 100644 --- a/themes/Backend/ExtJs/backend/order/model/shipping.js +++ b/themes/Backend/ExtJs/backend/order/model/shipping.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/model/tax.js b/themes/Backend/ExtJs/backend/order/model/tax.js index 62479f01b31..a882dc6e94b 100644 --- a/themes/Backend/ExtJs/backend/order/model/tax.js +++ b/themes/Backend/ExtJs/backend/order/model/tax.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/model/voucher.js b/themes/Backend/ExtJs/backend/order/model/voucher.js index faa17180804..b152bc1d0c7 100644 --- a/themes/Backend/ExtJs/backend/order/model/voucher.js +++ b/themes/Backend/ExtJs/backend/order/model/voucher.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/store/batch.js b/themes/Backend/ExtJs/backend/order/store/batch.js index 12f1a96941c..48b619189d6 100644 --- a/themes/Backend/ExtJs/backend/order/store/batch.js +++ b/themes/Backend/ExtJs/backend/order/store/batch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/store/configuration.js b/themes/Backend/ExtJs/backend/order/store/configuration.js index e869d12feb9..7c9d561c0b7 100644 --- a/themes/Backend/ExtJs/backend/order/store/configuration.js +++ b/themes/Backend/ExtJs/backend/order/store/configuration.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/store/detail_batch.js b/themes/Backend/ExtJs/backend/order/store/detail_batch.js index d703ff8271a..cae4bb7d0d4 100644 --- a/themes/Backend/ExtJs/backend/order/store/detail_batch.js +++ b/themes/Backend/ExtJs/backend/order/store/detail_batch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/store/doc_type.js b/themes/Backend/ExtJs/backend/order/store/doc_type.js index 6367bf3a567..2b3340db11b 100644 --- a/themes/Backend/ExtJs/backend/order/store/doc_type.js +++ b/themes/Backend/ExtJs/backend/order/store/doc_type.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/store/document_registry.js b/themes/Backend/ExtJs/backend/order/store/document_registry.js index 46b30a3d974..ecb0c4be502 100644 --- a/themes/Backend/ExtJs/backend/order/store/document_registry.js +++ b/themes/Backend/ExtJs/backend/order/store/document_registry.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @author shopware AG diff --git a/themes/Backend/ExtJs/backend/order/store/list_batch.js b/themes/Backend/ExtJs/backend/order/store/list_batch.js index 13c734e9c1f..c6b83b36992 100644 --- a/themes/Backend/ExtJs/backend/order/store/list_batch.js +++ b/themes/Backend/ExtJs/backend/order/store/list_batch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/store/mail_template.js b/themes/Backend/ExtJs/backend/order/store/mail_template.js index 605c4af430a..89e1acc8cbc 100644 --- a/themes/Backend/ExtJs/backend/order/store/mail_template.js +++ b/themes/Backend/ExtJs/backend/order/store/mail_template.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/store/order.js b/themes/Backend/ExtJs/backend/order/store/order.js index 10f36401e16..261cca9b51d 100644 --- a/themes/Backend/ExtJs/backend/order/store/order.js +++ b/themes/Backend/ExtJs/backend/order/store/order.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/store/order_history.js b/themes/Backend/ExtJs/backend/order/store/order_history.js index 9559506a4dd..8db34a2664d 100644 --- a/themes/Backend/ExtJs/backend/order/store/order_history.js +++ b/themes/Backend/ExtJs/backend/order/store/order_history.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/store/position_product_search.js b/themes/Backend/ExtJs/backend/order/store/position_product_search.js index 7f1d136dd5a..ece9e405f82 100644 --- a/themes/Backend/ExtJs/backend/order/store/position_product_search.js +++ b/themes/Backend/ExtJs/backend/order/store/position_product_search.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/store/tax.js b/themes/Backend/ExtJs/backend/order/store/tax.js index 273ad603657..f80aff2ed41 100644 --- a/themes/Backend/ExtJs/backend/order/store/tax.js +++ b/themes/Backend/ExtJs/backend/order/store/tax.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/store/voucher.js b/themes/Backend/ExtJs/backend/order/store/voucher.js index 508e96ea198..79faaddadd6 100644 --- a/themes/Backend/ExtJs/backend/order/store/voucher.js +++ b/themes/Backend/ExtJs/backend/order/store/voucher.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/batch/form.js b/themes/Backend/ExtJs/backend/order/view/batch/form.js index f4e7ab73138..3fe6a4e6d89 100644 --- a/themes/Backend/ExtJs/backend/order/view/batch/form.js +++ b/themes/Backend/ExtJs/backend/order/view/batch/form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/batch/list.js b/themes/Backend/ExtJs/backend/order/view/batch/list.js index ec38867f067..6cc2613d64d 100644 --- a/themes/Backend/ExtJs/backend/order/view/batch/list.js +++ b/themes/Backend/ExtJs/backend/order/view/batch/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/batch/progress.js b/themes/Backend/ExtJs/backend/order/view/batch/progress.js index df9aa92cfc3..2bd6e54b8df 100644 --- a/themes/Backend/ExtJs/backend/order/view/batch/progress.js +++ b/themes/Backend/ExtJs/backend/order/view/batch/progress.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/batch/window.js b/themes/Backend/ExtJs/backend/order/view/batch/window.js index fc78fa1cd1c..3957330bbae 100644 --- a/themes/Backend/ExtJs/backend/order/view/batch/window.js +++ b/themes/Backend/ExtJs/backend/order/view/batch/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/detail/billing.js b/themes/Backend/ExtJs/backend/order/view/detail/billing.js index 3c30a3f0692..ccd0f54f0f4 100644 --- a/themes/Backend/ExtJs/backend/order/view/detail/billing.js +++ b/themes/Backend/ExtJs/backend/order/view/detail/billing.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/detail/communication.js b/themes/Backend/ExtJs/backend/order/view/detail/communication.js index 79cf922ad8c..cbfa2b481b6 100644 --- a/themes/Backend/ExtJs/backend/order/view/detail/communication.js +++ b/themes/Backend/ExtJs/backend/order/view/detail/communication.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/detail/configuration.js b/themes/Backend/ExtJs/backend/order/view/detail/configuration.js index ffdb63d2986..a0c218592b4 100644 --- a/themes/Backend/ExtJs/backend/order/view/detail/configuration.js +++ b/themes/Backend/ExtJs/backend/order/view/detail/configuration.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/detail/debit.js b/themes/Backend/ExtJs/backend/order/view/detail/debit.js index d7bebf41cf1..0692ee77bf1 100644 --- a/themes/Backend/ExtJs/backend/order/view/detail/debit.js +++ b/themes/Backend/ExtJs/backend/order/view/detail/debit.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/detail/detail.js b/themes/Backend/ExtJs/backend/order/view/detail/detail.js index bcf3a3c6f6d..7c493fa360c 100644 --- a/themes/Backend/ExtJs/backend/order/view/detail/detail.js +++ b/themes/Backend/ExtJs/backend/order/view/detail/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/detail/dispatch.js b/themes/Backend/ExtJs/backend/order/view/detail/dispatch.js index 3abd2862353..2fdc926ef05 100644 --- a/themes/Backend/ExtJs/backend/order/view/detail/dispatch.js +++ b/themes/Backend/ExtJs/backend/order/view/detail/dispatch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/detail/document.js b/themes/Backend/ExtJs/backend/order/view/detail/document.js index feefcb9782f..7e991477dbe 100644 --- a/themes/Backend/ExtJs/backend/order/view/detail/document.js +++ b/themes/Backend/ExtJs/backend/order/view/detail/document.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/detail/order_history.js b/themes/Backend/ExtJs/backend/order/view/detail/order_history.js index 7dacf93406b..1999348fa3e 100644 --- a/themes/Backend/ExtJs/backend/order/view/detail/order_history.js +++ b/themes/Backend/ExtJs/backend/order/view/detail/order_history.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/detail/overview.js b/themes/Backend/ExtJs/backend/order/view/detail/overview.js index cb1254e52f1..8b8c814f100 100644 --- a/themes/Backend/ExtJs/backend/order/view/detail/overview.js +++ b/themes/Backend/ExtJs/backend/order/view/detail/overview.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/detail/position.js b/themes/Backend/ExtJs/backend/order/view/detail/position.js index 62b70ff1141..94006ea04f5 100644 --- a/themes/Backend/ExtJs/backend/order/view/detail/position.js +++ b/themes/Backend/ExtJs/backend/order/view/detail/position.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/detail/shipping.js b/themes/Backend/ExtJs/backend/order/view/detail/shipping.js index c2aab0dd096..4d9ea161a68 100644 --- a/themes/Backend/ExtJs/backend/order/view/detail/shipping.js +++ b/themes/Backend/ExtJs/backend/order/view/detail/shipping.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/detail/window.js b/themes/Backend/ExtJs/backend/order/view/detail/window.js index d8633b8727d..17d24c3299f 100644 --- a/themes/Backend/ExtJs/backend/order/view/detail/window.js +++ b/themes/Backend/ExtJs/backend/order/view/detail/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/list/document.js b/themes/Backend/ExtJs/backend/order/view/list/document.js index 796651addad..8eff1ba4588 100644 --- a/themes/Backend/ExtJs/backend/order/view/list/document.js +++ b/themes/Backend/ExtJs/backend/order/view/list/document.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/list/filter.js b/themes/Backend/ExtJs/backend/order/view/list/filter.js index c64316a2e50..4c2855e8f25 100644 --- a/themes/Backend/ExtJs/backend/order/view/list/filter.js +++ b/themes/Backend/ExtJs/backend/order/view/list/filter.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/list/list.js b/themes/Backend/ExtJs/backend/order/view/list/list.js index 0b730978d6a..8a6883b3658 100644 --- a/themes/Backend/ExtJs/backend/order/view/list/list.js +++ b/themes/Backend/ExtJs/backend/order/view/list/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/list/navigation.js b/themes/Backend/ExtJs/backend/order/view/list/navigation.js index 4949ce29c91..e3fa6e040ae 100644 --- a/themes/Backend/ExtJs/backend/order/view/list/navigation.js +++ b/themes/Backend/ExtJs/backend/order/view/list/navigation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/list/position.js b/themes/Backend/ExtJs/backend/order/view/list/position.js index b27d08e488c..0474e9de4b4 100644 --- a/themes/Backend/ExtJs/backend/order/view/list/position.js +++ b/themes/Backend/ExtJs/backend/order/view/list/position.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/mail/attachment.js b/themes/Backend/ExtJs/backend/order/view/mail/attachment.js index 8cc47595fa9..c6eadce23ba 100644 --- a/themes/Backend/ExtJs/backend/order/view/mail/attachment.js +++ b/themes/Backend/ExtJs/backend/order/view/mail/attachment.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @author shopware AG diff --git a/themes/Backend/ExtJs/backend/order/view/mail/form.js b/themes/Backend/ExtJs/backend/order/view/mail/form.js index 3a171c22242..1145b616367 100644 --- a/themes/Backend/ExtJs/backend/order/view/mail/form.js +++ b/themes/Backend/ExtJs/backend/order/view/mail/form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/mail/window.js b/themes/Backend/ExtJs/backend/order/view/mail/window.js index 3e8fd801c8a..f6924d026da 100644 --- a/themes/Backend/ExtJs/backend/order/view/mail/window.js +++ b/themes/Backend/ExtJs/backend/order/view/mail/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/order/view/main/window.js b/themes/Backend/ExtJs/backend/order/view/main/window.js index b4d7ff95d02..f95f2005dfd 100644 --- a/themes/Backend/ExtJs/backend/order/view/main/window.js +++ b/themes/Backend/ExtJs/backend/order/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/overview/app.js b/themes/Backend/ExtJs/backend/overview/app.js index b84e0afd5dd..f7fcd85cf58 100644 --- a/themes/Backend/ExtJs/backend/overview/app.js +++ b/themes/Backend/ExtJs/backend/overview/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Overview diff --git a/themes/Backend/ExtJs/backend/overview/controller/main.js b/themes/Backend/ExtJs/backend/overview/controller/main.js index e733adc6b2f..1e3e9dcda74 100644 --- a/themes/Backend/ExtJs/backend/overview/controller/main.js +++ b/themes/Backend/ExtJs/backend/overview/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Overview diff --git a/themes/Backend/ExtJs/backend/overview/model/overview.js b/themes/Backend/ExtJs/backend/overview/model/overview.js index 5c14ba83f0c..f85c7ed03c4 100644 --- a/themes/Backend/ExtJs/backend/overview/model/overview.js +++ b/themes/Backend/ExtJs/backend/overview/model/overview.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Overview diff --git a/themes/Backend/ExtJs/backend/overview/store/overview.js b/themes/Backend/ExtJs/backend/overview/store/overview.js index 1f565036d6a..8f08dbe9e00 100644 --- a/themes/Backend/ExtJs/backend/overview/store/overview.js +++ b/themes/Backend/ExtJs/backend/overview/store/overview.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Overview diff --git a/themes/Backend/ExtJs/backend/overview/view/main/grid.js b/themes/Backend/ExtJs/backend/overview/view/main/grid.js index 738c0e5d995..63aad5355d5 100644 --- a/themes/Backend/ExtJs/backend/overview/view/main/grid.js +++ b/themes/Backend/ExtJs/backend/overview/view/main/grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Overview diff --git a/themes/Backend/ExtJs/backend/overview/view/main/window.js b/themes/Backend/ExtJs/backend/overview/view/main/window.js index 53d60edd483..40b4e5cae70 100644 --- a/themes/Backend/ExtJs/backend/overview/view/main/window.js +++ b/themes/Backend/ExtJs/backend/overview/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Overview diff --git a/themes/Backend/ExtJs/backend/partner/app.js b/themes/Backend/ExtJs/backend/partner/app.js index 6d4d970316c..8d8f53dbf9a 100644 --- a/themes/Backend/ExtJs/backend/partner/app.js +++ b/themes/Backend/ExtJs/backend/partner/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Partner diff --git a/themes/Backend/ExtJs/backend/partner/controller/main.js b/themes/Backend/ExtJs/backend/partner/controller/main.js index cbe053b05a4..35048c83e61 100644 --- a/themes/Backend/ExtJs/backend/partner/controller/main.js +++ b/themes/Backend/ExtJs/backend/partner/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Partner diff --git a/themes/Backend/ExtJs/backend/partner/controller/partner.js b/themes/Backend/ExtJs/backend/partner/controller/partner.js index 20ed0af88b1..76f8844381c 100644 --- a/themes/Backend/ExtJs/backend/partner/controller/partner.js +++ b/themes/Backend/ExtJs/backend/partner/controller/partner.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Partner diff --git a/themes/Backend/ExtJs/backend/partner/controller/statistic.js b/themes/Backend/ExtJs/backend/partner/controller/statistic.js index 3b4b4652cf0..52fbfa1d53b 100644 --- a/themes/Backend/ExtJs/backend/partner/controller/statistic.js +++ b/themes/Backend/ExtJs/backend/partner/controller/statistic.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Partner diff --git a/themes/Backend/ExtJs/backend/partner/model/detail.js b/themes/Backend/ExtJs/backend/partner/model/detail.js index 04af7b8a7b8..16cc3e67c02 100644 --- a/themes/Backend/ExtJs/backend/partner/model/detail.js +++ b/themes/Backend/ExtJs/backend/partner/model/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Partner diff --git a/themes/Backend/ExtJs/backend/partner/model/main.js b/themes/Backend/ExtJs/backend/partner/model/main.js index 23cee3295fb..58652834f05 100644 --- a/themes/Backend/ExtJs/backend/partner/model/main.js +++ b/themes/Backend/ExtJs/backend/partner/model/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Partner diff --git a/themes/Backend/ExtJs/backend/partner/model/statistic_chart.js b/themes/Backend/ExtJs/backend/partner/model/statistic_chart.js index dfe518a9f6e..8ad1fc3099c 100644 --- a/themes/Backend/ExtJs/backend/partner/model/statistic_chart.js +++ b/themes/Backend/ExtJs/backend/partner/model/statistic_chart.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Partner diff --git a/themes/Backend/ExtJs/backend/partner/model/statistic_list.js b/themes/Backend/ExtJs/backend/partner/model/statistic_list.js index 68905763b1c..38125e910bb 100644 --- a/themes/Backend/ExtJs/backend/partner/model/statistic_list.js +++ b/themes/Backend/ExtJs/backend/partner/model/statistic_list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Partner diff --git a/themes/Backend/ExtJs/backend/partner/store/detail.js b/themes/Backend/ExtJs/backend/partner/store/detail.js index 3b79c27f51a..42067e7a605 100644 --- a/themes/Backend/ExtJs/backend/partner/store/detail.js +++ b/themes/Backend/ExtJs/backend/partner/store/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Partner diff --git a/themes/Backend/ExtJs/backend/partner/store/list.js b/themes/Backend/ExtJs/backend/partner/store/list.js index a1287864703..d849b31803e 100644 --- a/themes/Backend/ExtJs/backend/partner/store/list.js +++ b/themes/Backend/ExtJs/backend/partner/store/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Partner diff --git a/themes/Backend/ExtJs/backend/partner/store/statistic_chart.js b/themes/Backend/ExtJs/backend/partner/store/statistic_chart.js index d0f115ea498..78a3c162758 100644 --- a/themes/Backend/ExtJs/backend/partner/store/statistic_chart.js +++ b/themes/Backend/ExtJs/backend/partner/store/statistic_chart.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Partner diff --git a/themes/Backend/ExtJs/backend/partner/store/statistic_list.js b/themes/Backend/ExtJs/backend/partner/store/statistic_list.js index 48e3c30113f..2dd7e2423c6 100644 --- a/themes/Backend/ExtJs/backend/partner/store/statistic_list.js +++ b/themes/Backend/ExtJs/backend/partner/store/statistic_list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Partner diff --git a/themes/Backend/ExtJs/backend/partner/view/main/window.js b/themes/Backend/ExtJs/backend/partner/view/main/window.js index bbd088d5b27..d13b84748b2 100644 --- a/themes/Backend/ExtJs/backend/partner/view/main/window.js +++ b/themes/Backend/ExtJs/backend/partner/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Partner diff --git a/themes/Backend/ExtJs/backend/partner/view/partner/detail.js b/themes/Backend/ExtJs/backend/partner/view/partner/detail.js index d2825d8d011..fd086a3b55c 100644 --- a/themes/Backend/ExtJs/backend/partner/view/partner/detail.js +++ b/themes/Backend/ExtJs/backend/partner/view/partner/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Partner diff --git a/themes/Backend/ExtJs/backend/partner/view/partner/list.js b/themes/Backend/ExtJs/backend/partner/view/partner/list.js index ba0a0e487b6..ef3e7233370 100644 --- a/themes/Backend/ExtJs/backend/partner/view/partner/list.js +++ b/themes/Backend/ExtJs/backend/partner/view/partner/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Partner diff --git a/themes/Backend/ExtJs/backend/partner/view/partner/window.js b/themes/Backend/ExtJs/backend/partner/view/partner/window.js index d473baa1014..f28b16e3087 100644 --- a/themes/Backend/ExtJs/backend/partner/view/partner/window.js +++ b/themes/Backend/ExtJs/backend/partner/view/partner/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Partner diff --git a/themes/Backend/ExtJs/backend/partner/view/statistic/chart.js b/themes/Backend/ExtJs/backend/partner/view/statistic/chart.js index da4305ba177..efe31f34998 100644 --- a/themes/Backend/ExtJs/backend/partner/view/statistic/chart.js +++ b/themes/Backend/ExtJs/backend/partner/view/statistic/chart.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/partner/view/statistic/list.js b/themes/Backend/ExtJs/backend/partner/view/statistic/list.js index 6e6136cd159..453bb51f169 100644 --- a/themes/Backend/ExtJs/backend/partner/view/statistic/list.js +++ b/themes/Backend/ExtJs/backend/partner/view/statistic/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Partner diff --git a/themes/Backend/ExtJs/backend/partner/view/statistic/window.js b/themes/Backend/ExtJs/backend/partner/view/statistic/window.js index 08820484a8e..31d449f0c21 100644 --- a/themes/Backend/ExtJs/backend/partner/view/statistic/window.js +++ b/themes/Backend/ExtJs/backend/partner/view/statistic/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Partner diff --git a/themes/Backend/ExtJs/backend/payment/app.js b/themes/Backend/ExtJs/backend/payment/app.js index 70d6a1a1522..a95c1a2e95e 100644 --- a/themes/Backend/ExtJs/backend/payment/app.js +++ b/themes/Backend/ExtJs/backend/payment/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Payment diff --git a/themes/Backend/ExtJs/backend/payment/controller/main.js b/themes/Backend/ExtJs/backend/payment/controller/main.js index a848b4157db..0e839a325a8 100644 --- a/themes/Backend/ExtJs/backend/payment/controller/main.js +++ b/themes/Backend/ExtJs/backend/payment/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Payment diff --git a/themes/Backend/ExtJs/backend/payment/controller/payment.js b/themes/Backend/ExtJs/backend/payment/controller/payment.js index eb1b5d236a7..35df3f391fb 100644 --- a/themes/Backend/ExtJs/backend/payment/controller/payment.js +++ b/themes/Backend/ExtJs/backend/payment/controller/payment.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Payment diff --git a/themes/Backend/ExtJs/backend/payment/model/country.js b/themes/Backend/ExtJs/backend/payment/model/country.js index c1482c059c0..3956acd26b1 100644 --- a/themes/Backend/ExtJs/backend/payment/model/country.js +++ b/themes/Backend/ExtJs/backend/payment/model/country.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Payment diff --git a/themes/Backend/ExtJs/backend/payment/model/payment.js b/themes/Backend/ExtJs/backend/payment/model/payment.js index f5e5eaaa2c0..c6bcf4da663 100644 --- a/themes/Backend/ExtJs/backend/payment/model/payment.js +++ b/themes/Backend/ExtJs/backend/payment/model/payment.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Payment diff --git a/themes/Backend/ExtJs/backend/payment/store/countries.js b/themes/Backend/ExtJs/backend/payment/store/countries.js index 31bb0aa9763..4e0d0686d15 100644 --- a/themes/Backend/ExtJs/backend/payment/store/countries.js +++ b/themes/Backend/ExtJs/backend/payment/store/countries.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Payment diff --git a/themes/Backend/ExtJs/backend/payment/store/payments.js b/themes/Backend/ExtJs/backend/payment/store/payments.js index 093dd5cf7d2..41938576d92 100644 --- a/themes/Backend/ExtJs/backend/payment/store/payments.js +++ b/themes/Backend/ExtJs/backend/payment/store/payments.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Payment diff --git a/themes/Backend/ExtJs/backend/payment/view/main/window.js b/themes/Backend/ExtJs/backend/payment/view/main/window.js index 3a27f7dcbe8..b0d5fed5808 100644 --- a/themes/Backend/ExtJs/backend/payment/view/main/window.js +++ b/themes/Backend/ExtJs/backend/payment/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Payment diff --git a/themes/Backend/ExtJs/backend/payment/view/payment/country_list.js b/themes/Backend/ExtJs/backend/payment/view/payment/country_list.js index fbf6d1ab224..a63346d07c6 100644 --- a/themes/Backend/ExtJs/backend/payment/view/payment/country_list.js +++ b/themes/Backend/ExtJs/backend/payment/view/payment/country_list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Payment diff --git a/themes/Backend/ExtJs/backend/payment/view/payment/form_panel.js b/themes/Backend/ExtJs/backend/payment/view/payment/form_panel.js index 86eee09ed89..c8fea6384f5 100644 --- a/themes/Backend/ExtJs/backend/payment/view/payment/form_panel.js +++ b/themes/Backend/ExtJs/backend/payment/view/payment/form_panel.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Payment diff --git a/themes/Backend/ExtJs/backend/payment/view/payment/subshop_list.js b/themes/Backend/ExtJs/backend/payment/view/payment/subshop_list.js index 76dbce90489..fba8d038383 100644 --- a/themes/Backend/ExtJs/backend/payment/view/payment/subshop_list.js +++ b/themes/Backend/ExtJs/backend/payment/view/payment/subshop_list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Payment diff --git a/themes/Backend/ExtJs/backend/payment/view/payment/surcharge.js b/themes/Backend/ExtJs/backend/payment/view/payment/surcharge.js index d4c0c607f05..8e87f1cc4e8 100644 --- a/themes/Backend/ExtJs/backend/payment/view/payment/surcharge.js +++ b/themes/Backend/ExtJs/backend/payment/view/payment/surcharge.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Payment diff --git a/themes/Backend/ExtJs/backend/payment/view/payment/tree.js b/themes/Backend/ExtJs/backend/payment/view/payment/tree.js index aea6c237eb2..45c2bca4f51 100644 --- a/themes/Backend/ExtJs/backend/payment/view/payment/tree.js +++ b/themes/Backend/ExtJs/backend/payment/view/payment/tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Payment diff --git a/themes/Backend/ExtJs/backend/performance/app.js b/themes/Backend/ExtJs/backend/performance/app.js index 7d7be591d9e..ec274504f17 100644 --- a/themes/Backend/ExtJs/backend/performance/app.js +++ b/themes/Backend/ExtJs/backend/performance/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Cache diff --git a/themes/Backend/ExtJs/backend/performance/controller/cache.js b/themes/Backend/ExtJs/backend/performance/controller/cache.js index 7828e981e48..276d9b5e374 100644 --- a/themes/Backend/ExtJs/backend/performance/controller/cache.js +++ b/themes/Backend/ExtJs/backend/performance/controller/cache.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Performance diff --git a/themes/Backend/ExtJs/backend/performance/controller/direct.js b/themes/Backend/ExtJs/backend/performance/controller/direct.js index 46c78e4d63b..63bafa180a1 100644 --- a/themes/Backend/ExtJs/backend/performance/controller/direct.js +++ b/themes/Backend/ExtJs/backend/performance/controller/direct.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Cache diff --git a/themes/Backend/ExtJs/backend/performance/controller/main.js b/themes/Backend/ExtJs/backend/performance/controller/main.js index 3d1e3ab9949..dc015a6ec8a 100644 --- a/themes/Backend/ExtJs/backend/performance/controller/main.js +++ b/themes/Backend/ExtJs/backend/performance/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/performance/controller/multi_request.js b/themes/Backend/ExtJs/backend/performance/controller/multi_request.js index 7de3a76f5ec..7e3d924d11c 100644 --- a/themes/Backend/ExtJs/backend/performance/controller/multi_request.js +++ b/themes/Backend/ExtJs/backend/performance/controller/multi_request.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Performance diff --git a/themes/Backend/ExtJs/backend/performance/controller/settings.js b/themes/Backend/ExtJs/backend/performance/controller/settings.js index e5ca0bac75a..0c257db73fb 100644 --- a/themes/Backend/ExtJs/backend/performance/controller/settings.js +++ b/themes/Backend/ExtJs/backend/performance/controller/settings.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shopware_Config diff --git a/themes/Backend/ExtJs/backend/performance/controller/start.js b/themes/Backend/ExtJs/backend/performance/controller/start.js index bc4b58be0e7..0d724c799e4 100644 --- a/themes/Backend/ExtJs/backend/performance/controller/start.js +++ b/themes/Backend/ExtJs/backend/performance/controller/start.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/performance/model/categories.js b/themes/Backend/ExtJs/backend/performance/model/categories.js index 51f94226ae7..aaa842e0a2d 100644 --- a/themes/Backend/ExtJs/backend/performance/model/categories.js +++ b/themes/Backend/ExtJs/backend/performance/model/categories.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Performance diff --git a/themes/Backend/ExtJs/backend/performance/model/check.js b/themes/Backend/ExtJs/backend/performance/model/check.js index 03e795f77ad..fa6e24cec2b 100644 --- a/themes/Backend/ExtJs/backend/performance/model/check.js +++ b/themes/Backend/ExtJs/backend/performance/model/check.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Performance diff --git a/themes/Backend/ExtJs/backend/performance/model/config.js b/themes/Backend/ExtJs/backend/performance/model/config.js index f11c52fee8f..af755705afd 100644 --- a/themes/Backend/ExtJs/backend/performance/model/config.js +++ b/themes/Backend/ExtJs/backend/performance/model/config.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Performance diff --git a/themes/Backend/ExtJs/backend/performance/model/customer.js b/themes/Backend/ExtJs/backend/performance/model/customer.js index b627a452348..ddb1ef01035 100644 --- a/themes/Backend/ExtJs/backend/performance/model/customer.js +++ b/themes/Backend/ExtJs/backend/performance/model/customer.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Performance diff --git a/themes/Backend/ExtJs/backend/performance/model/filter.js b/themes/Backend/ExtJs/backend/performance/model/filter.js index 983802090eb..b162a033770 100644 --- a/themes/Backend/ExtJs/backend/performance/model/filter.js +++ b/themes/Backend/ExtJs/backend/performance/model/filter.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Performance diff --git a/themes/Backend/ExtJs/backend/performance/model/http_cache.js b/themes/Backend/ExtJs/backend/performance/model/http_cache.js index 1342369638e..072a414204b 100644 --- a/themes/Backend/ExtJs/backend/performance/model/http_cache.js +++ b/themes/Backend/ExtJs/backend/performance/model/http_cache.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Performance diff --git a/themes/Backend/ExtJs/backend/performance/model/key_value.js b/themes/Backend/ExtJs/backend/performance/model/key_value.js index 7019d5622db..c760700f1cf 100644 --- a/themes/Backend/ExtJs/backend/performance/model/key_value.js +++ b/themes/Backend/ExtJs/backend/performance/model/key_value.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Performance diff --git a/themes/Backend/ExtJs/backend/performance/model/search.js b/themes/Backend/ExtJs/backend/performance/model/search.js index 86df85f01a3..4a65772557f 100644 --- a/themes/Backend/ExtJs/backend/performance/model/search.js +++ b/themes/Backend/ExtJs/backend/performance/model/search.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Performance diff --git a/themes/Backend/ExtJs/backend/performance/model/seo.js b/themes/Backend/ExtJs/backend/performance/model/seo.js index a084eded347..2d66d567857 100644 --- a/themes/Backend/ExtJs/backend/performance/model/seo.js +++ b/themes/Backend/ExtJs/backend/performance/model/seo.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Performance diff --git a/themes/Backend/ExtJs/backend/performance/model/sitemap.js b/themes/Backend/ExtJs/backend/performance/model/sitemap.js index 7c45aa832cd..43656cf7ae1 100644 --- a/themes/Backend/ExtJs/backend/performance/model/sitemap.js +++ b/themes/Backend/ExtJs/backend/performance/model/sitemap.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Performance diff --git a/themes/Backend/ExtJs/backend/performance/model/sitemap/custom_urls.js b/themes/Backend/ExtJs/backend/performance/model/sitemap/custom_urls.js index 2fef944a0af..6d615db164e 100644 --- a/themes/Backend/ExtJs/backend/performance/model/sitemap/custom_urls.js +++ b/themes/Backend/ExtJs/backend/performance/model/sitemap/custom_urls.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/performance/model/sitemap/custom_urls"} diff --git a/themes/Backend/ExtJs/backend/performance/model/sitemap/excluded_urls.js b/themes/Backend/ExtJs/backend/performance/model/sitemap/excluded_urls.js index 23383d8a54c..2012e8611b2 100644 --- a/themes/Backend/ExtJs/backend/performance/model/sitemap/excluded_urls.js +++ b/themes/Backend/ExtJs/backend/performance/model/sitemap/excluded_urls.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/performance/model/sitemap/excluded_urls"} diff --git a/themes/Backend/ExtJs/backend/performance/model/top_seller.js b/themes/Backend/ExtJs/backend/performance/model/top_seller.js index 529688aa053..bdabb18e480 100644 --- a/themes/Backend/ExtJs/backend/performance/model/top_seller.js +++ b/themes/Backend/ExtJs/backend/performance/model/top_seller.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Performance diff --git a/themes/Backend/ExtJs/backend/performance/model/various.js b/themes/Backend/ExtJs/backend/performance/model/various.js index 0d6dd66e41b..d7333e9bfc2 100644 --- a/themes/Backend/ExtJs/backend/performance/model/various.js +++ b/themes/Backend/ExtJs/backend/performance/model/various.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Performance diff --git a/themes/Backend/ExtJs/backend/performance/store/config.js b/themes/Backend/ExtJs/backend/performance/store/config.js index 4d60cf3707f..1ed7f763599 100644 --- a/themes/Backend/ExtJs/backend/performance/store/config.js +++ b/themes/Backend/ExtJs/backend/performance/store/config.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/performance/store/info.js b/themes/Backend/ExtJs/backend/performance/store/info.js index e6cdb042b27..7e8ca4b3dc0 100644 --- a/themes/Backend/ExtJs/backend/performance/store/info.js +++ b/themes/Backend/ExtJs/backend/performance/store/info.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/performance/store/info"} diff --git a/themes/Backend/ExtJs/backend/performance/store/shop.js b/themes/Backend/ExtJs/backend/performance/store/shop.js index 6cc264d0b03..f455bec9f5b 100644 --- a/themes/Backend/ExtJs/backend/performance/store/shop.js +++ b/themes/Backend/ExtJs/backend/performance/store/shop.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/performance/store/shop"} diff --git a/themes/Backend/ExtJs/backend/performance/view/main/categories.js b/themes/Backend/ExtJs/backend/performance/view/main/categories.js index 2b7b6efc2c8..41deb18d8a9 100644 --- a/themes/Backend/ExtJs/backend/performance/view/main/categories.js +++ b/themes/Backend/ExtJs/backend/performance/view/main/categories.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/performance/main"} diff --git a/themes/Backend/ExtJs/backend/performance/view/main/multi_request_dialog.js b/themes/Backend/ExtJs/backend/performance/view/main/multi_request_dialog.js index 86ad290604b..d697deea93f 100644 --- a/themes/Backend/ExtJs/backend/performance/view/main/multi_request_dialog.js +++ b/themes/Backend/ExtJs/backend/performance/view/main/multi_request_dialog.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/performance/main"} diff --git a/themes/Backend/ExtJs/backend/performance/view/main/multi_request_tasks.js b/themes/Backend/ExtJs/backend/performance/view/main/multi_request_tasks.js index cf0e6a0e76d..96b17b1314e 100644 --- a/themes/Backend/ExtJs/backend/performance/view/main/multi_request_tasks.js +++ b/themes/Backend/ExtJs/backend/performance/view/main/multi_request_tasks.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/performance/main"} diff --git a/themes/Backend/ExtJs/backend/performance/view/main/window.js b/themes/Backend/ExtJs/backend/performance/view/main/window.js index 113c7581127..4bf672fe54d 100644 --- a/themes/Backend/ExtJs/backend/performance/view/main/window.js +++ b/themes/Backend/ExtJs/backend/performance/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/cache/form.js b/themes/Backend/ExtJs/backend/performance/view/tabs/cache/form.js index 01d2a46fff7..ef262869e71 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/cache/form.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/cache/form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/performance/main"} diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/cache/info.js b/themes/Backend/ExtJs/backend/performance/view/tabs/cache/info.js index f375ffce078..5577607e822 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/cache/info.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/cache/info.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/performance/main"} diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/cache/main.js b/themes/Backend/ExtJs/backend/performance/view/tabs/cache/main.js index 3852989313e..3027562a64e 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/cache/main.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/cache/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package CanceledOrder diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/base_grid.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/base_grid.js index d6944bf8727..79d954f311e 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/base_grid.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/base_grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/performance/main"} diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/cache_time.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/cache_time.js index 80ca6d5308f..fdf4f844cea 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/cache_time.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/cache_time.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/performance/main"} diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/multi_request_button.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/multi_request_button.js index 9309d799833..b1ca8ed9c2a 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/multi_request_button.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/multi_request_button.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/no_cache.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/no_cache.js index 1efff521f99..b90b588f604 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/no_cache.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/no_cache.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/sitemap_custom_urls.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/sitemap_custom_urls.js index 62ed5969ccc..324f17adc97 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/sitemap_custom_urls.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/sitemap_custom_urls.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/performance/sitemap"} diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/sitemap_excluded_urls.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/sitemap_excluded_urls.js index a2955deebf6..7ff5c3a98b6 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/sitemap_excluded_urls.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/sitemap_excluded_urls.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/performance/sitemap"} diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/tree.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/tree.js index b49e7e2c384..e742185cf2d 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/tree.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Category diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/base.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/base.js index 05a89cf4245..bdc095021c3 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/base.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/base.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/categories.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/categories.js index 90491222db3..ac78ed53e9a 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/categories.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/categories.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/customers.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/customers.js index e182cd2da26..bcbfd044fc3 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/customers.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/customers.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/filter.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/filter.js index dd4560fcaf8..533e1e84257 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/filter.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/filter.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/home.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/home.js index 28f1dd8bc0c..88a466043d0 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/home.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/home.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/http_cache.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/http_cache.js index c00914dd7a8..7e5269b26c1 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/http_cache.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/http_cache.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/performance/main"} diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/search.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/search.js index 867ec599bf6..c24698ef07b 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/search.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/search.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/seo.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/seo.js index 1abf7aba5d8..59247457e3f 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/seo.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/seo.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/sitemap.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/sitemap.js index 3e55e598b23..22eb3c12f2d 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/sitemap.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/sitemap.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @package Performance * @subpackage Sitemap diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/theme_cache.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/theme_cache.js index 51128ee91f1..6152e7094e1 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/theme_cache.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/theme_cache.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/topseller.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/topseller.js index 97d29289d97..034ef676866 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/topseller.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/topseller.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * - * ""Shopware" is a registered trademark of shopware AG. + * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/various.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/various.js index 16a3f1d4e55..605c023bad8 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/various.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/various.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/main.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/main.js index 5f7279c5640..bb2f753c7ed 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/main.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/navigation.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/navigation.js index 4668607e0e4..52768b77169 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/navigation.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/navigation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Performance diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/start/main.js b/themes/Backend/ExtJs/backend/performance/view/tabs/start/main.js index e064d4b8412..5e64887a713 100644 --- a/themes/Backend/ExtJs/backend/performance/view/tabs/start/main.js +++ b/themes/Backend/ExtJs/backend/performance/view/tabs/start/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/performance/main"} diff --git a/themes/Backend/ExtJs/backend/plugin_manager/app.js b/themes/Backend/ExtJs/backend/plugin_manager/app.js index b9b5fb24b33..21e7e0e6a38 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/app.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/controller/main.js b/themes/Backend/ExtJs/backend/plugin_manager/controller/main.js index 77cf07a5fcb..1a90429198a 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/controller/main.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/controller/main.js @@ -3,23 +3,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/controller/navigation.js b/themes/Backend/ExtJs/backend/plugin_manager/controller/navigation.js index 53679e2bf2d..216c3fe0301 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/controller/navigation.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/controller/navigation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/controller/plugin.js b/themes/Backend/ExtJs/backend/plugin_manager/controller/plugin.js index 54c92f85f83..872ba6a7d35 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/controller/plugin.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/controller/plugin.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/model/address.js b/themes/Backend/ExtJs/backend/plugin_manager/model/address.js index 94ae18c2251..ae006ed4b1b 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/model/address.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/model/address.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/model/basket.js b/themes/Backend/ExtJs/backend/plugin_manager/model/basket.js index 0a4a62fec3a..696f4f649cd 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/model/basket.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/model/basket.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/model/basket_position.js b/themes/Backend/ExtJs/backend/plugin_manager/model/basket_position.js index e9a4c06c937..2e347900433 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/model/basket_position.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/model/basket_position.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/model/category.js b/themes/Backend/ExtJs/backend/plugin_manager/model/category.js index 2146f4ce37c..765f0515249 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/model/category.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/model/category.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/model/comment.js b/themes/Backend/ExtJs/backend/plugin_manager/model/comment.js index 8648a524279..d8fbafff5fa 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/model/comment.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/model/comment.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/model/domain.js b/themes/Backend/ExtJs/backend/plugin_manager/model/domain.js index 0c6e2bfc66c..7f4216db5e1 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/model/domain.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/model/domain.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/model/licence.js b/themes/Backend/ExtJs/backend/plugin_manager/model/licence.js index 70b43e4e4ff..4b2bcd5d2ad 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/model/licence.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/model/licence.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/model/picture.js b/themes/Backend/ExtJs/backend/plugin_manager/model/picture.js index 0a7682e7891..77726f6745b 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/model/picture.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/model/picture.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/model/plugin.js b/themes/Backend/ExtJs/backend/plugin_manager/model/plugin.js index 42dbe8e631f..571a3ff5eb5 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/model/plugin.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/model/plugin.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/model/price.js b/themes/Backend/ExtJs/backend/plugin_manager/model/price.js index 860c238e36b..1e95516e34e 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/model/price.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/model/price.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/model/producer.js b/themes/Backend/ExtJs/backend/plugin_manager/model/producer.js index 0c3d2616dea..1789d91d47a 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/model/producer.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/model/producer.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/store/basket.js b/themes/Backend/ExtJs/backend/plugin_manager/store/basket.js index 7ae13cd3b37..fa3fe5b84ac 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/store/basket.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/store/basket.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/store/category.js b/themes/Backend/ExtJs/backend/plugin_manager/store/category.js index cfd865dd5f1..f03edaf76be 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/store/category.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/store/category.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/store/expired_plugins.js b/themes/Backend/ExtJs/backend/plugin_manager/store/expired_plugins.js index e326c14b861..d8fcfffdea5 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/store/expired_plugins.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/store/expired_plugins.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/store/licence.js b/themes/Backend/ExtJs/backend/plugin_manager/store/licence.js index 29990f7282f..f1b76a7be06 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/store/licence.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/store/licence.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/store/local_plugin.js b/themes/Backend/ExtJs/backend/plugin_manager/store/local_plugin.js index fd1c8e59a67..290abfb39ea 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/store/local_plugin.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/store/local_plugin.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/store/store_plugin.js b/themes/Backend/ExtJs/backend/plugin_manager/store/store_plugin.js index e901688f680..7c044738b62 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/store/store_plugin.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/store/store_plugin.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/store/update_plugins.js b/themes/Backend/ExtJs/backend/plugin_manager/store/update_plugins.js index efb98dc752d..5864243e11d 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/store/update_plugins.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/store/update_plugins.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/account/checkout.js b/themes/Backend/ExtJs/backend/plugin_manager/view/account/checkout.js index 5e3affc0e18..fae4c46fe45 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/account/checkout.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/account/checkout.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/account/login.js b/themes/Backend/ExtJs/backend/plugin_manager/view/account/login.js index 091f11a75a1..c5f6cc3fae9 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/account/login.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/account/login.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/account/login_window.js b/themes/Backend/ExtJs/backend/plugin_manager/view/account/login_window.js index 46abf7f3e4e..3663c60b657 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/account/login_window.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/account/login_window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/account/upload.js b/themes/Backend/ExtJs/backend/plugin_manager/view/account/upload.js index 51dda60f760..c0051ddd9b1 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/account/upload.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/account/upload.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/components/container.js b/themes/Backend/ExtJs/backend/plugin_manager/view/components/container.js index 35ad4f187dc..d67dfa9968b 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/components/container.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/components/container.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/components/download_window.js b/themes/Backend/ExtJs/backend/plugin_manager/view/components/download_window.js index 6075bffeaf7..33ce36aa8d9 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/components/download_window.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/components/download_window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/components/expired_plugin.js b/themes/Backend/ExtJs/backend/plugin_manager/view/components/expired_plugin.js index 8eb2dfe4617..9b2ff371745 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/components/expired_plugin.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/components/expired_plugin.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/components/image_slider.js b/themes/Backend/ExtJs/backend/plugin_manager/view/components/image_slider.js index 15ee1704fd3..e35f220992a 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/components/image_slider.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/components/image_slider.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/components/listing.js b/themes/Backend/ExtJs/backend/plugin_manager/view/components/listing.js index 99a1dc130cd..4ec9216ca37 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/components/listing.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/components/listing.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/components/slider.js b/themes/Backend/ExtJs/backend/plugin_manager/view/components/slider.js index 3ae92e19d27..22494e29910 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/components/slider.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/components/slider.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/components/store_plugin.js b/themes/Backend/ExtJs/backend/plugin_manager/view/components/store_plugin.js index ff545150ce2..dde861124c8 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/components/store_plugin.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/components/store_plugin.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/components/tab.js b/themes/Backend/ExtJs/backend/plugin_manager/view/components/tab.js index ccf5108e9b8..132255b552d 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/components/tab.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/components/tab.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/components/tree.js b/themes/Backend/ExtJs/backend/plugin_manager/view/components/tree.js index c4b3ee1cb85..51249e6bee4 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/components/tree.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/components/tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/actions.js b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/actions.js index cac1be4f4f7..003db7d0b9b 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/actions.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/actions.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/comments.js b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/comments.js index 0737698208f..abacdbf0e3e 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/comments.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/comments.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/container.js b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/container.js index 4099837c93a..0b44c43ad1f 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/container.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/container.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/header.js b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/header.js index 928e08aeadb..565b43d4c35 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/header.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/header.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/meta.js b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/meta.js index a87f64ee851..2eba6f16da4 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/meta.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/meta.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/prices.js b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/prices.js index 16de4b798d0..123371e8c44 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/prices.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/prices.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/window.js b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/window.js index aa6d7bcde4a..fec453bb219 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/window.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/list/expired_plugins_page.js b/themes/Backend/ExtJs/backend/plugin_manager/view/list/expired_plugins_page.js index 857c66a2fe2..3183b5bab69 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/list/expired_plugins_page.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/list/expired_plugins_page.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/list/home_page.js b/themes/Backend/ExtJs/backend/plugin_manager/view/list/home_page.js index 7ce59f4dbeb..2233024b420 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/list/home_page.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/list/home_page.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/list/import_export_teaser_page.js b/themes/Backend/ExtJs/backend/plugin_manager/view/list/import_export_teaser_page.js index c37aeeb36d3..294f0b26d3f 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/list/import_export_teaser_page.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/list/import_export_teaser_page.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/list/licence_page.js b/themes/Backend/ExtJs/backend/plugin_manager/view/list/licence_page.js index bc7410c3da3..fd8e1773303 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/list/licence_page.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/list/licence_page.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/list/local_plugin_listing_page.js b/themes/Backend/ExtJs/backend/plugin_manager/view/list/local_plugin_listing_page.js index 24e8a8d8bbd..293426a8d4f 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/list/local_plugin_listing_page.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/list/local_plugin_listing_page.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/list/navigation.js b/themes/Backend/ExtJs/backend/plugin_manager/view/list/navigation.js index 7bd3661cdab..e97ddc86bfb 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/list/navigation.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/list/navigation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/list/premium_plugins_page.js b/themes/Backend/ExtJs/backend/plugin_manager/view/list/premium_plugins_page.js index 96032e1825c..e084ad2f95d 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/list/premium_plugins_page.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/list/premium_plugins_page.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/list/store_listing_page.js b/themes/Backend/ExtJs/backend/plugin_manager/view/list/store_listing_page.js index 1e74969699b..90cf2388284 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/list/store_listing_page.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/list/store_listing_page.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/list/update_page.js b/themes/Backend/ExtJs/backend/plugin_manager/view/list/update_page.js index 842abf3b099..b402aa49cbe 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/list/update_page.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/list/update_page.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/list/window.js b/themes/Backend/ExtJs/backend/plugin_manager/view/list/window.js index a456c8d0a6c..822f6c4069e 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/list/window.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/list/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/loading/mask.js b/themes/Backend/ExtJs/backend/plugin_manager/view/loading/mask.js index 206a8bc1b02..ddd27da6fdf 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/loading/mask.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/loading/mask.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/plugin_helper.js b/themes/Backend/ExtJs/backend/plugin_manager/view/plugin_helper.js index d610cd13d12..197cad07fb1 100644 --- a/themes/Backend/ExtJs/backend/plugin_manager/view/plugin_helper.js +++ b/themes/Backend/ExtJs/backend/plugin_manager/view/plugin_helper.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package PluginManager diff --git a/themes/Backend/ExtJs/backend/premium/app.js b/themes/Backend/ExtJs/backend/premium/app.js index 2160b23fd76..560d4a0cb86 100644 --- a/themes/Backend/ExtJs/backend/premium/app.js +++ b/themes/Backend/ExtJs/backend/premium/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Premium diff --git a/themes/Backend/ExtJs/backend/premium/controller/main.js b/themes/Backend/ExtJs/backend/premium/controller/main.js index 57cafe60600..330e008b00f 100644 --- a/themes/Backend/ExtJs/backend/premium/controller/main.js +++ b/themes/Backend/ExtJs/backend/premium/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Premium diff --git a/themes/Backend/ExtJs/backend/premium/controller/premium.js b/themes/Backend/ExtJs/backend/premium/controller/premium.js index 39f18576b8f..ad8495c6486 100644 --- a/themes/Backend/ExtJs/backend/premium/controller/premium.js +++ b/themes/Backend/ExtJs/backend/premium/controller/premium.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Premium diff --git a/themes/Backend/ExtJs/backend/premium/model/premium.js b/themes/Backend/ExtJs/backend/premium/model/premium.js index 85ced9a2406..d64d7f7fa8f 100644 --- a/themes/Backend/ExtJs/backend/premium/model/premium.js +++ b/themes/Backend/ExtJs/backend/premium/model/premium.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Premium diff --git a/themes/Backend/ExtJs/backend/premium/model/subshop.js b/themes/Backend/ExtJs/backend/premium/model/subshop.js index 22909c15d70..32cd25c7b80 100644 --- a/themes/Backend/ExtJs/backend/premium/model/subshop.js +++ b/themes/Backend/ExtJs/backend/premium/model/subshop.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Premium diff --git a/themes/Backend/ExtJs/backend/premium/store/premiums.js b/themes/Backend/ExtJs/backend/premium/store/premiums.js index 07d7ae14445..db204d49d4d 100644 --- a/themes/Backend/ExtJs/backend/premium/store/premiums.js +++ b/themes/Backend/ExtJs/backend/premium/store/premiums.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Premium diff --git a/themes/Backend/ExtJs/backend/premium/store/subshops.js b/themes/Backend/ExtJs/backend/premium/store/subshops.js index 2a5c284c4d9..cd1a2dee196 100644 --- a/themes/Backend/ExtJs/backend/premium/store/subshops.js +++ b/themes/Backend/ExtJs/backend/premium/store/subshops.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Premium diff --git a/themes/Backend/ExtJs/backend/premium/view/main/window.js b/themes/Backend/ExtJs/backend/premium/view/main/window.js index 071ab5a79ab..525761e188e 100644 --- a/themes/Backend/ExtJs/backend/premium/view/main/window.js +++ b/themes/Backend/ExtJs/backend/premium/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Premium diff --git a/themes/Backend/ExtJs/backend/premium/view/premium/detail.js b/themes/Backend/ExtJs/backend/premium/view/premium/detail.js index 0cb652a77e8..1d5271ad1a2 100644 --- a/themes/Backend/ExtJs/backend/premium/view/premium/detail.js +++ b/themes/Backend/ExtJs/backend/premium/view/premium/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Premium diff --git a/themes/Backend/ExtJs/backend/premium/view/premium/list.js b/themes/Backend/ExtJs/backend/premium/view/premium/list.js index 239d9bc317e..3e4b51681f9 100644 --- a/themes/Backend/ExtJs/backend/premium/view/premium/list.js +++ b/themes/Backend/ExtJs/backend/premium/view/premium/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Premium diff --git a/themes/Backend/ExtJs/backend/product_feed/app.js b/themes/Backend/ExtJs/backend/product_feed/app.js index 9ae1516c452..73328b4dbb8 100644 --- a/themes/Backend/ExtJs/backend/product_feed/app.js +++ b/themes/Backend/ExtJs/backend/product_feed/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/controller/feed.js b/themes/Backend/ExtJs/backend/product_feed/controller/feed.js index 315f4cac9ef..a1395221116 100644 --- a/themes/Backend/ExtJs/backend/product_feed/controller/feed.js +++ b/themes/Backend/ExtJs/backend/product_feed/controller/feed.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/controller/main.js b/themes/Backend/ExtJs/backend/product_feed/controller/main.js index 15cf9b12443..484ee54e664 100644 --- a/themes/Backend/ExtJs/backend/product_feed/controller/main.js +++ b/themes/Backend/ExtJs/backend/product_feed/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/model/category.js b/themes/Backend/ExtJs/backend/product_feed/model/category.js index fb70cddaaa4..df7354cf5aa 100644 --- a/themes/Backend/ExtJs/backend/product_feed/model/category.js +++ b/themes/Backend/ExtJs/backend/product_feed/model/category.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/model/category_for_combo_tree.js b/themes/Backend/ExtJs/backend/product_feed/model/category_for_combo_tree.js index 8391ab5b124..35c5cc9e478 100644 --- a/themes/Backend/ExtJs/backend/product_feed/model/category_for_combo_tree.js +++ b/themes/Backend/ExtJs/backend/product_feed/model/category_for_combo_tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/model/detail.js b/themes/Backend/ExtJs/backend/product_feed/model/detail.js index d2ba6901f16..a01827537f7 100644 --- a/themes/Backend/ExtJs/backend/product_feed/model/detail.js +++ b/themes/Backend/ExtJs/backend/product_feed/model/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/model/main.js b/themes/Backend/ExtJs/backend/product_feed/model/main.js index cb299d9fbbb..549092629fe 100644 --- a/themes/Backend/ExtJs/backend/product_feed/model/main.js +++ b/themes/Backend/ExtJs/backend/product_feed/model/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/model/shop.js b/themes/Backend/ExtJs/backend/product_feed/model/shop.js index 070535eb311..4251545af92 100644 --- a/themes/Backend/ExtJs/backend/product_feed/model/shop.js +++ b/themes/Backend/ExtJs/backend/product_feed/model/shop.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/store/article.js b/themes/Backend/ExtJs/backend/product_feed/store/article.js index 39a8e0b9c2f..71a49535d8a 100644 --- a/themes/Backend/ExtJs/backend/product_feed/store/article.js +++ b/themes/Backend/ExtJs/backend/product_feed/store/article.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/store/category.js b/themes/Backend/ExtJs/backend/product_feed/store/category.js index 615c58bcd63..564f02f4536 100644 --- a/themes/Backend/ExtJs/backend/product_feed/store/category.js +++ b/themes/Backend/ExtJs/backend/product_feed/store/category.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/store/category_for_combo_tree.js b/themes/Backend/ExtJs/backend/product_feed/store/category_for_combo_tree.js index 0f9a24419de..02dae2b0f6d 100644 --- a/themes/Backend/ExtJs/backend/product_feed/store/category_for_combo_tree.js +++ b/themes/Backend/ExtJs/backend/product_feed/store/category_for_combo_tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/store/detail.js b/themes/Backend/ExtJs/backend/product_feed/store/detail.js index e6b41442717..4d0cc79b36b 100644 --- a/themes/Backend/ExtJs/backend/product_feed/store/detail.js +++ b/themes/Backend/ExtJs/backend/product_feed/store/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/store/list.js b/themes/Backend/ExtJs/backend/product_feed/store/list.js index 489a0ab3eab..ee1b6c07692 100644 --- a/themes/Backend/ExtJs/backend/product_feed/store/list.js +++ b/themes/Backend/ExtJs/backend/product_feed/store/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/store/shop.js b/themes/Backend/ExtJs/backend/product_feed/store/shop.js index bea9978a103..e71f433f15a 100644 --- a/themes/Backend/ExtJs/backend/product_feed/store/shop.js +++ b/themes/Backend/ExtJs/backend/product_feed/store/shop.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/store/supplier.js b/themes/Backend/ExtJs/backend/product_feed/store/supplier.js index 28255d48476..05896df6aaf 100644 --- a/themes/Backend/ExtJs/backend/product_feed/store/supplier.js +++ b/themes/Backend/ExtJs/backend/product_feed/store/supplier.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/view/feed/detail.js b/themes/Backend/ExtJs/backend/product_feed/view/feed/detail.js index 0920af6e342..f09990016d8 100644 --- a/themes/Backend/ExtJs/backend/product_feed/view/feed/detail.js +++ b/themes/Backend/ExtJs/backend/product_feed/view/feed/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/view/feed/list.js b/themes/Backend/ExtJs/backend/product_feed/view/feed/list.js index 0b753fcae6a..86773e40be4 100644 --- a/themes/Backend/ExtJs/backend/product_feed/view/feed/list.js +++ b/themes/Backend/ExtJs/backend/product_feed/view/feed/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/article.js b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/article.js index bd90e034854..899db43f23b 100644 --- a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/article.js +++ b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/article.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/body.js b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/body.js index 159cd753145..47a3ce567c0 100644 --- a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/body.js +++ b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/body.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/category.js b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/category.js index 54b724a7ffd..e86cbce5751 100644 --- a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/category.js +++ b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/category.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/filter.js b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/filter.js index b6d87fe9a4e..6ca018c6e87 100644 --- a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/filter.js +++ b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/filter.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/footer.js b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/footer.js index edc41b8cca8..fc8bcc4a9ac 100644 --- a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/footer.js +++ b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/footer.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/format.js b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/format.js index 7feffbe4270..a491c4bef04 100644 --- a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/format.js +++ b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/format.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/header.js b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/header.js index 32c018e76b4..e2900c00012 100644 --- a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/header.js +++ b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/header.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/supplier.js b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/supplier.js index 2a07e39c164..c7bf92ad297 100644 --- a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/supplier.js +++ b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/supplier.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/view/feed/window.js b/themes/Backend/ExtJs/backend/product_feed/view/feed/window.js index e23c295e1af..667eaec11d8 100644 --- a/themes/Backend/ExtJs/backend/product_feed/view/feed/window.js +++ b/themes/Backend/ExtJs/backend/product_feed/view/feed/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_feed/view/main/window.js b/themes/Backend/ExtJs/backend/product_feed/view/main/window.js index 187040d29a9..7b4fc8fa6c6 100644 --- a/themes/Backend/ExtJs/backend/product_feed/view/main/window.js +++ b/themes/Backend/ExtJs/backend/product_feed/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductFeed diff --git a/themes/Backend/ExtJs/backend/product_stream/app.js b/themes/Backend/ExtJs/backend/product_stream/app.js index 0343433582c..267e10309ae 100644 --- a/themes/Backend/ExtJs/backend/product_stream/app.js +++ b/themes/Backend/ExtJs/backend/product_stream/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/controller/main.js b/themes/Backend/ExtJs/backend/product_stream/controller/main.js index 5050b9230c2..5a10b0c45ea 100644 --- a/themes/Backend/ExtJs/backend/product_stream/controller/main.js +++ b/themes/Backend/ExtJs/backend/product_stream/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/model/product.js b/themes/Backend/ExtJs/backend/product_stream/model/product.js index f9cdabb1462..887e5a3d4c5 100644 --- a/themes/Backend/ExtJs/backend/product_stream/model/product.js +++ b/themes/Backend/ExtJs/backend/product_stream/model/product.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/model/stream.js b/themes/Backend/ExtJs/backend/product_stream/model/stream.js index cff1967569c..37fa706650c 100644 --- a/themes/Backend/ExtJs/backend/product_stream/model/stream.js +++ b/themes/Backend/ExtJs/backend/product_stream/model/stream.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/store/attribute.js b/themes/Backend/ExtJs/backend/product_stream/store/attribute.js index 4338a4ed5a1..cc74ec6cf86 100644 --- a/themes/Backend/ExtJs/backend/product_stream/store/attribute.js +++ b/themes/Backend/ExtJs/backend/product_stream/store/attribute.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/store/preview.js b/themes/Backend/ExtJs/backend/product_stream/store/preview.js index b11e62b6fa2..a2fd6c76c20 100644 --- a/themes/Backend/ExtJs/backend/product_stream/store/preview.js +++ b/themes/Backend/ExtJs/backend/product_stream/store/preview.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/store/selected_products.js b/themes/Backend/ExtJs/backend/product_stream/store/selected_products.js index ed3096ac470..630c1cc502f 100644 --- a/themes/Backend/ExtJs/backend/product_stream/store/selected_products.js +++ b/themes/Backend/ExtJs/backend/product_stream/store/selected_products.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/store/stream.js b/themes/Backend/ExtJs/backend/product_stream/store/stream.js index 50a197b5d79..d451c0d42ad 100644 --- a/themes/Backend/ExtJs/backend/product_stream/store/stream.js +++ b/themes/Backend/ExtJs/backend/product_stream/store/stream.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/common/attributes.js b/themes/Backend/ExtJs/backend/product_stream/view/common/attributes.js index 53c8805bc37..70cb1b9d30c 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/common/attributes.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/common/attributes.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/common/settings.js b/themes/Backend/ExtJs/backend/product_stream/view/common/settings.js index 819072389b8..e8853e39eb5 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/common/settings.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/common/settings.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/abstract_condition.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/abstract_condition.js index c901ed22cb4..409af634783 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/abstract_condition.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/abstract_condition.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/attribute.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/attribute.js index 5b23d577544..e17df558d2d 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/attribute.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/attribute.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/category.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/category.js index d809a09130d..2cb9a8618d7 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/category.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/category.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/closeout.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/closeout.js index 0d7d3bc6deb..524ae81f680 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/closeout.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/closeout.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/create_date.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/create_date.js index c9e4baa4868..9885f7b7a9d 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/create_date.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/create_date.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/has_pseudo_price.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/has_pseudo_price.js index 1158abe501e..40ec0461c0c 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/has_pseudo_price.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/has_pseudo_price.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/height.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/height.js index b35f06200e3..25cc1a849fd 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/height.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/height.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/immediate_delivery.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/immediate_delivery.js index 3cb299419d0..cf7e3bc2c19 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/immediate_delivery.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/immediate_delivery.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/is_new.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/is_new.js index 429908986e9..101e4f9a033 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/is_new.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/is_new.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/length.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/length.js index c7c1f06ece8..0e5053eae3b 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/length.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/length.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/manufacturer.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/manufacturer.js index 440ec73034b..fdeb98c818a 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/manufacturer.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/manufacturer.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/price.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/price.js index 928a1cb0777..d505a363fb2 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/price.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/price.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/property.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/property.js index e0facb826dc..828cd4cfaca 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/property.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/property.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/release_date.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/release_date.js index cb83d032a5d..aa37a4a1bc0 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/release_date.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/release_date.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/sales.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/sales.js index bf4159a32c0..810009ce5a0 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/sales.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/sales.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/search_term.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/search_term.js index e1d94856a69..2f727738b9a 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/search_term.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/search_term.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/vote_average.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/vote_average.js index cbc52f02fd3..e52c5d86977 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/vote_average.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/vote_average.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/weight.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/weight.js index 3d3f8a9ef69..b303777dddd 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/weight.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/weight.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/width.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/width.js index f6edc2d291e..7fc306dec5b 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/width.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/width.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition_panel.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition_panel.js index dd7368ae819..7b3e54d4fff 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition_panel.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition_panel.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute.js index 3b3b16296c5..a366cc62cd0 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_date.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_date.js index 866cde7a4f2..f1c65d2640a 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_date.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_date.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_date_time.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_date_time.js index ba38ea12f86..4e124485ae2 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_date_time.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_date_time.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_window.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_window.js index 85ce5d72640..4e93346b760 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_window.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/create_date.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/create_date.js index 30bcd4c575c..6bb9e342bec 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/create_date.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/create_date.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/grid.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/grid.js index d873e14a3bb..9ae87ab84a4 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/grid.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/property.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/property.js index fffa1034390..cd4af4572f7 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/property.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/property.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/property_window.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/property_window.js index a966e4251ee..1fcd1f72c49 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/property_window.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/property_window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/range.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/range.js index d96131e755a..886f740b04f 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/range.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/range.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/release_date.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/release_date.js index 96b1d7c8cfa..92bb50b700f 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/release_date.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/release_date.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/sales.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/sales.js index 75a6cd95d99..debb18b4dca 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/sales.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/sales.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/search_term.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/search_term.js index 34e132ff5ba..c498fd98dac 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/search_term.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/search_term.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/vote_average.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/vote_average.js index 21aeaf24322..23b934f419a 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/vote_average.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/vote_average.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/preview_grid.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/preview_grid.js index 4719748ce65..6d2a8ab782b 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/preview_grid.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/preview_grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/window.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/window.js index 62cc9d51212..2e9e60e783a 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/window.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/list/list.js b/themes/Backend/ExtJs/backend/product_stream/view/list/list.js index 0578fd315e6..1aefd65bab7 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/list/list.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/list/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/list/window.js b/themes/Backend/ExtJs/backend/product_stream/view/list/window.js index 2e5bddb3dd6..cf4ad71c8f4 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/list/window.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/list/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/search_grid.js b/themes/Backend/ExtJs/backend/product_stream/view/search_grid.js index 460cfffcb92..7f21ec618c9 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/search_grid.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/search_grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/selected_list/product.js b/themes/Backend/ExtJs/backend/product_stream/view/selected_list/product.js index 97056785fe6..442f79d41e4 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/selected_list/product.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/selected_list/product.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/product_stream/view/selected_list/window.js b/themes/Backend/ExtJs/backend/product_stream/view/selected_list/window.js index b4f6b306821..35f8d1f0afd 100644 --- a/themes/Backend/ExtJs/backend/product_stream/view/selected_list/window.js +++ b/themes/Backend/ExtJs/backend/product_stream/view/selected_list/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package ProductStream diff --git a/themes/Backend/ExtJs/backend/property/app.js b/themes/Backend/ExtJs/backend/property/app.js index fc699aaee87..6ddcc2424e5 100644 --- a/themes/Backend/ExtJs/backend/property/app.js +++ b/themes/Backend/ExtJs/backend/property/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Property diff --git a/themes/Backend/ExtJs/backend/property/controller/main.js b/themes/Backend/ExtJs/backend/property/controller/main.js index 5c7d877cab3..21ff91b98a2 100644 --- a/themes/Backend/ExtJs/backend/property/controller/main.js +++ b/themes/Backend/ExtJs/backend/property/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Property diff --git a/themes/Backend/ExtJs/backend/property/model/group.js b/themes/Backend/ExtJs/backend/property/model/group.js index ecef66b95e7..4e64761bf7a 100644 --- a/themes/Backend/ExtJs/backend/property/model/group.js +++ b/themes/Backend/ExtJs/backend/property/model/group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Property diff --git a/themes/Backend/ExtJs/backend/property/model/option.js b/themes/Backend/ExtJs/backend/property/model/option.js index 82447138d6f..30755b22cfc 100644 --- a/themes/Backend/ExtJs/backend/property/model/option.js +++ b/themes/Backend/ExtJs/backend/property/model/option.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Property diff --git a/themes/Backend/ExtJs/backend/property/model/set.js b/themes/Backend/ExtJs/backend/property/model/set.js index 90502a9760e..03348227768 100644 --- a/themes/Backend/ExtJs/backend/property/model/set.js +++ b/themes/Backend/ExtJs/backend/property/model/set.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Property diff --git a/themes/Backend/ExtJs/backend/property/model/set_assign.js b/themes/Backend/ExtJs/backend/property/model/set_assign.js index 66903fd4e2e..7761824fef0 100644 --- a/themes/Backend/ExtJs/backend/property/model/set_assign.js +++ b/themes/Backend/ExtJs/backend/property/model/set_assign.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Property diff --git a/themes/Backend/ExtJs/backend/property/store/group.js b/themes/Backend/ExtJs/backend/property/store/group.js index 1692ead5948..74dfba173de 100644 --- a/themes/Backend/ExtJs/backend/property/store/group.js +++ b/themes/Backend/ExtJs/backend/property/store/group.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Property diff --git a/themes/Backend/ExtJs/backend/property/store/option.js b/themes/Backend/ExtJs/backend/property/store/option.js index 7ba23d3811c..11d61a217c3 100644 --- a/themes/Backend/ExtJs/backend/property/store/option.js +++ b/themes/Backend/ExtJs/backend/property/store/option.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Property diff --git a/themes/Backend/ExtJs/backend/property/store/set.js b/themes/Backend/ExtJs/backend/property/store/set.js index 3af74c78038..b85aaea46e9 100644 --- a/themes/Backend/ExtJs/backend/property/store/set.js +++ b/themes/Backend/ExtJs/backend/property/store/set.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Property diff --git a/themes/Backend/ExtJs/backend/property/store/set_assign.js b/themes/Backend/ExtJs/backend/property/store/set_assign.js index 7ecabb080fb..ae6397100b7 100644 --- a/themes/Backend/ExtJs/backend/property/store/set_assign.js +++ b/themes/Backend/ExtJs/backend/property/store/set_assign.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Property diff --git a/themes/Backend/ExtJs/backend/property/view/main/group_grid.js b/themes/Backend/ExtJs/backend/property/view/main/group_grid.js index f6006f3bfd3..3b34f3e4d9a 100644 --- a/themes/Backend/ExtJs/backend/property/view/main/group_grid.js +++ b/themes/Backend/ExtJs/backend/property/view/main/group_grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Property diff --git a/themes/Backend/ExtJs/backend/property/view/main/option_grid.js b/themes/Backend/ExtJs/backend/property/view/main/option_grid.js index 652e2065917..5e9783a22dd 100644 --- a/themes/Backend/ExtJs/backend/property/view/main/option_grid.js +++ b/themes/Backend/ExtJs/backend/property/view/main/option_grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Property diff --git a/themes/Backend/ExtJs/backend/property/view/main/set_assign_grid.js b/themes/Backend/ExtJs/backend/property/view/main/set_assign_grid.js index 0b2d49dc56e..a54e6e383a4 100644 --- a/themes/Backend/ExtJs/backend/property/view/main/set_assign_grid.js +++ b/themes/Backend/ExtJs/backend/property/view/main/set_assign_grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Property diff --git a/themes/Backend/ExtJs/backend/property/view/main/set_grid.js b/themes/Backend/ExtJs/backend/property/view/main/set_grid.js index 1260bbc40b9..0be7ef451c3 100644 --- a/themes/Backend/ExtJs/backend/property/view/main/set_grid.js +++ b/themes/Backend/ExtJs/backend/property/view/main/set_grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Snippet diff --git a/themes/Backend/ExtJs/backend/property/view/main/window.js b/themes/Backend/ExtJs/backend/property/view/main/window.js index fa3aac06da8..e2bd93cf767 100644 --- a/themes/Backend/ExtJs/backend/property/view/main/window.js +++ b/themes/Backend/ExtJs/backend/property/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Property diff --git a/themes/Backend/ExtJs/backend/risk_management/app.js b/themes/Backend/ExtJs/backend/risk_management/app.js index 7c5aaa33b5d..567c4dd9106 100644 --- a/themes/Backend/ExtJs/backend/risk_management/app.js +++ b/themes/Backend/ExtJs/backend/risk_management/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package RiskManagement diff --git a/themes/Backend/ExtJs/backend/risk_management/controller/main.js b/themes/Backend/ExtJs/backend/risk_management/controller/main.js index 0224dcb775e..0811504bffd 100644 --- a/themes/Backend/ExtJs/backend/risk_management/controller/main.js +++ b/themes/Backend/ExtJs/backend/risk_management/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package RiskManagement diff --git a/themes/Backend/ExtJs/backend/risk_management/controller/risk_management.js b/themes/Backend/ExtJs/backend/risk_management/controller/risk_management.js index f4f0a23bef0..436023884dc 100644 --- a/themes/Backend/ExtJs/backend/risk_management/controller/risk_management.js +++ b/themes/Backend/ExtJs/backend/risk_management/controller/risk_management.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package RiskManagement diff --git a/themes/Backend/ExtJs/backend/risk_management/model/areas.js b/themes/Backend/ExtJs/backend/risk_management/model/areas.js index cb3681619f2..a45d01ca75c 100644 --- a/themes/Backend/ExtJs/backend/risk_management/model/areas.js +++ b/themes/Backend/ExtJs/backend/risk_management/model/areas.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Countries diff --git a/themes/Backend/ExtJs/backend/risk_management/model/payment.js b/themes/Backend/ExtJs/backend/risk_management/model/payment.js index ab1c8bc4c24..eb400c04fd0 100644 --- a/themes/Backend/ExtJs/backend/risk_management/model/payment.js +++ b/themes/Backend/ExtJs/backend/risk_management/model/payment.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package RiskManagement diff --git a/themes/Backend/ExtJs/backend/risk_management/model/risk.js b/themes/Backend/ExtJs/backend/risk_management/model/risk.js index 64dd41c2d6a..f7df4e15f74 100644 --- a/themes/Backend/ExtJs/backend/risk_management/model/risk.js +++ b/themes/Backend/ExtJs/backend/risk_management/model/risk.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package RiskManagement diff --git a/themes/Backend/ExtJs/backend/risk_management/model/rule.js b/themes/Backend/ExtJs/backend/risk_management/model/rule.js index 79eb97e5291..412d7dcab73 100644 --- a/themes/Backend/ExtJs/backend/risk_management/model/rule.js +++ b/themes/Backend/ExtJs/backend/risk_management/model/rule.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package RiskManagement diff --git a/themes/Backend/ExtJs/backend/risk_management/model/subshop.js b/themes/Backend/ExtJs/backend/risk_management/model/subshop.js index 6f595abcda2..a6ff11c7600 100644 --- a/themes/Backend/ExtJs/backend/risk_management/model/subshop.js +++ b/themes/Backend/ExtJs/backend/risk_management/model/subshop.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Premium diff --git a/themes/Backend/ExtJs/backend/risk_management/store/areas.js b/themes/Backend/ExtJs/backend/risk_management/store/areas.js index e7949da40eb..76e159cc136 100644 --- a/themes/Backend/ExtJs/backend/risk_management/store/areas.js +++ b/themes/Backend/ExtJs/backend/risk_management/store/areas.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Countries diff --git a/themes/Backend/ExtJs/backend/risk_management/store/payments.js b/themes/Backend/ExtJs/backend/risk_management/store/payments.js index cbf77c7b9bc..5709e718eb2 100644 --- a/themes/Backend/ExtJs/backend/risk_management/store/payments.js +++ b/themes/Backend/ExtJs/backend/risk_management/store/payments.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package RiskManagement diff --git a/themes/Backend/ExtJs/backend/risk_management/store/risks.js b/themes/Backend/ExtJs/backend/risk_management/store/risks.js index 79cdb992293..c586abb03ce 100644 --- a/themes/Backend/ExtJs/backend/risk_management/store/risks.js +++ b/themes/Backend/ExtJs/backend/risk_management/store/risks.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package RiskManagement diff --git a/themes/Backend/ExtJs/backend/risk_management/store/rules.js b/themes/Backend/ExtJs/backend/risk_management/store/rules.js index 8f02a729c4c..63982d577f3 100644 --- a/themes/Backend/ExtJs/backend/risk_management/store/rules.js +++ b/themes/Backend/ExtJs/backend/risk_management/store/rules.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package RiskManagement diff --git a/themes/Backend/ExtJs/backend/risk_management/store/subshops.js b/themes/Backend/ExtJs/backend/risk_management/store/subshops.js index a374286af9f..c63045ae791 100644 --- a/themes/Backend/ExtJs/backend/risk_management/store/subshops.js +++ b/themes/Backend/ExtJs/backend/risk_management/store/subshops.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Premium diff --git a/themes/Backend/ExtJs/backend/risk_management/view/main/window.js b/themes/Backend/ExtJs/backend/risk_management/view/main/window.js index c48ff50ca47..193690ef5fb 100644 --- a/themes/Backend/ExtJs/backend/risk_management/view/main/window.js +++ b/themes/Backend/ExtJs/backend/risk_management/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package RiskManagement diff --git a/themes/Backend/ExtJs/backend/risk_management/view/risk_management/container.js b/themes/Backend/ExtJs/backend/risk_management/view/risk_management/container.js index e62790d59de..30507148a47 100644 --- a/themes/Backend/ExtJs/backend/risk_management/view/risk_management/container.js +++ b/themes/Backend/ExtJs/backend/risk_management/view/risk_management/container.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package RiskManagement diff --git a/themes/Backend/ExtJs/backend/risk_management/view/risk_management/panel.js b/themes/Backend/ExtJs/backend/risk_management/view/risk_management/panel.js index f294247939f..684a6eaed73 100644 --- a/themes/Backend/ExtJs/backend/risk_management/view/risk_management/panel.js +++ b/themes/Backend/ExtJs/backend/risk_management/view/risk_management/panel.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package RiskManagement diff --git a/themes/Backend/ExtJs/backend/shipping/app.js b/themes/Backend/ExtJs/backend/shipping/app.js index 0c84481b92e..d9d323ebcdd 100644 --- a/themes/Backend/ExtJs/backend/shipping/app.js +++ b/themes/Backend/ExtJs/backend/shipping/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/controller/categories_tree.js b/themes/Backend/ExtJs/backend/shipping/controller/categories_tree.js index 12e346041be..9d008167254 100644 --- a/themes/Backend/ExtJs/backend/shipping/controller/categories_tree.js +++ b/themes/Backend/ExtJs/backend/shipping/controller/categories_tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/controller/costs_matrix.js b/themes/Backend/ExtJs/backend/shipping/controller/costs_matrix.js index d1e7a88ac71..514f4bbd13d 100644 --- a/themes/Backend/ExtJs/backend/shipping/controller/costs_matrix.js +++ b/themes/Backend/ExtJs/backend/shipping/controller/costs_matrix.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/controller/default_form.js b/themes/Backend/ExtJs/backend/shipping/controller/default_form.js index 76f5a5ba76a..4706f9d6902 100644 --- a/themes/Backend/ExtJs/backend/shipping/controller/default_form.js +++ b/themes/Backend/ExtJs/backend/shipping/controller/default_form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/controller/main.js b/themes/Backend/ExtJs/backend/shipping/controller/main.js index c25ca5bff2d..91dcd5e3239 100644 --- a/themes/Backend/ExtJs/backend/shipping/controller/main.js +++ b/themes/Backend/ExtJs/backend/shipping/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/model/category_tree.js b/themes/Backend/ExtJs/backend/shipping/model/category_tree.js index c116d224cee..13cd1f80f0c 100644 --- a/themes/Backend/ExtJs/backend/shipping/model/category_tree.js +++ b/themes/Backend/ExtJs/backend/shipping/model/category_tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/model/costsmatrix.js b/themes/Backend/ExtJs/backend/shipping/model/costsmatrix.js index 92ebd02a2f3..869d4d0e17c 100644 --- a/themes/Backend/ExtJs/backend/shipping/model/costsmatrix.js +++ b/themes/Backend/ExtJs/backend/shipping/model/costsmatrix.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/model/dispatch.js b/themes/Backend/ExtJs/backend/shipping/model/dispatch.js index 3222cbb7920..517905d3c81 100644 --- a/themes/Backend/ExtJs/backend/shipping/model/dispatch.js +++ b/themes/Backend/ExtJs/backend/shipping/model/dispatch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/model/dispatch_list.js b/themes/Backend/ExtJs/backend/shipping/model/dispatch_list.js index a634e0570d3..ce62981fc9e 100644 --- a/themes/Backend/ExtJs/backend/shipping/model/dispatch_list.js +++ b/themes/Backend/ExtJs/backend/shipping/model/dispatch_list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/model/holiday.js b/themes/Backend/ExtJs/backend/shipping/model/holiday.js index b7901dc61fe..73950fe4135 100644 --- a/themes/Backend/ExtJs/backend/shipping/model/holiday.js +++ b/themes/Backend/ExtJs/backend/shipping/model/holiday.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/model/tax.js b/themes/Backend/ExtJs/backend/shipping/model/tax.js index 2211879e801..d2ea7f2af2d 100644 --- a/themes/Backend/ExtJs/backend/shipping/model/tax.js +++ b/themes/Backend/ExtJs/backend/shipping/model/tax.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/store/category_tree.js b/themes/Backend/ExtJs/backend/shipping/store/category_tree.js index 1dd8bc44c12..677f7a6551c 100644 --- a/themes/Backend/ExtJs/backend/shipping/store/category_tree.js +++ b/themes/Backend/ExtJs/backend/shipping/store/category_tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/store/costsmatrix.js b/themes/Backend/ExtJs/backend/shipping/store/costsmatrix.js index 8bac41f22a5..b84dec615f5 100644 --- a/themes/Backend/ExtJs/backend/shipping/store/costsmatrix.js +++ b/themes/Backend/ExtJs/backend/shipping/store/costsmatrix.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/store/country.js b/themes/Backend/ExtJs/backend/shipping/store/country.js index 93e6b98afe7..ac8da613ed1 100644 --- a/themes/Backend/ExtJs/backend/shipping/store/country.js +++ b/themes/Backend/ExtJs/backend/shipping/store/country.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/store/dispatch.js b/themes/Backend/ExtJs/backend/shipping/store/dispatch.js index 22748a601e0..d8dff48cb80 100644 --- a/themes/Backend/ExtJs/backend/shipping/store/dispatch.js +++ b/themes/Backend/ExtJs/backend/shipping/store/dispatch.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/store/dispatch_list.js b/themes/Backend/ExtJs/backend/shipping/store/dispatch_list.js index 1c4b75aee98..70634e9fc93 100644 --- a/themes/Backend/ExtJs/backend/shipping/store/dispatch_list.js +++ b/themes/Backend/ExtJs/backend/shipping/store/dispatch_list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/store/holiday.js b/themes/Backend/ExtJs/backend/shipping/store/holiday.js index 11b527a974a..bee5ea2a061 100644 --- a/themes/Backend/ExtJs/backend/shipping/store/holiday.js +++ b/themes/Backend/ExtJs/backend/shipping/store/holiday.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/store/payment.js b/themes/Backend/ExtJs/backend/shipping/store/payment.js index 2cc71f6b144..6bbc09ad728 100644 --- a/themes/Backend/ExtJs/backend/shipping/store/payment.js +++ b/themes/Backend/ExtJs/backend/shipping/store/payment.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/store/tax.js b/themes/Backend/ExtJs/backend/shipping/store/tax.js index 8ccf514cbb2..7488717e355 100644 --- a/themes/Backend/ExtJs/backend/shipping/store/tax.js +++ b/themes/Backend/ExtJs/backend/shipping/store/tax.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/view/edit/advanced.js b/themes/Backend/ExtJs/backend/shipping/view/edit/advanced.js index 14e5fa73393..3456c46665e 100644 --- a/themes/Backend/ExtJs/backend/shipping/view/edit/advanced.js +++ b/themes/Backend/ExtJs/backend/shipping/view/edit/advanced.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/view/edit/categories_tree.js b/themes/Backend/ExtJs/backend/shipping/view/edit/categories_tree.js index 5045a6730ef..9d7f11f6035 100644 --- a/themes/Backend/ExtJs/backend/shipping/view/edit/categories_tree.js +++ b/themes/Backend/ExtJs/backend/shipping/view/edit/categories_tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/view/edit/country.js b/themes/Backend/ExtJs/backend/shipping/view/edit/country.js index 156978fb3ad..07fa1ed0d1a 100644 --- a/themes/Backend/ExtJs/backend/shipping/view/edit/country.js +++ b/themes/Backend/ExtJs/backend/shipping/view/edit/country.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/view/edit/default/form_left.js b/themes/Backend/ExtJs/backend/shipping/view/edit/default/form_left.js index 2416a1c033f..1fe88a0fbf6 100644 --- a/themes/Backend/ExtJs/backend/shipping/view/edit/default/form_left.js +++ b/themes/Backend/ExtJs/backend/shipping/view/edit/default/form_left.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/view/edit/default/form_right.js b/themes/Backend/ExtJs/backend/shipping/view/edit/default/form_right.js index f6bdfedbda5..db424eaab66 100644 --- a/themes/Backend/ExtJs/backend/shipping/view/edit/default/form_right.js +++ b/themes/Backend/ExtJs/backend/shipping/view/edit/default/form_right.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/view/edit/dispatch_costs_matrix.js b/themes/Backend/ExtJs/backend/shipping/view/edit/dispatch_costs_matrix.js index 424705a5ceb..eefed114165 100644 --- a/themes/Backend/ExtJs/backend/shipping/view/edit/dispatch_costs_matrix.js +++ b/themes/Backend/ExtJs/backend/shipping/view/edit/dispatch_costs_matrix.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/view/edit/panel.js b/themes/Backend/ExtJs/backend/shipping/view/edit/panel.js index c41cc81c60f..9ee35373354 100644 --- a/themes/Backend/ExtJs/backend/shipping/view/edit/panel.js +++ b/themes/Backend/ExtJs/backend/shipping/view/edit/panel.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/view/edit/payment_means.js b/themes/Backend/ExtJs/backend/shipping/view/edit/payment_means.js index a9a66a002ec..da8292f62ff 100644 --- a/themes/Backend/ExtJs/backend/shipping/view/edit/payment_means.js +++ b/themes/Backend/ExtJs/backend/shipping/view/edit/payment_means.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/view/main.js b/themes/Backend/ExtJs/backend/shipping/view/main.js index 924323937dd..02fb983f6e0 100644 --- a/themes/Backend/ExtJs/backend/shipping/view/main.js +++ b/themes/Backend/ExtJs/backend/shipping/view/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/shipping/view/main/list.js b/themes/Backend/ExtJs/backend/shipping/view/main/list.js index d2732a614bd..71aae5b3367 100644 --- a/themes/Backend/ExtJs/backend/shipping/view/main/list.js +++ b/themes/Backend/ExtJs/backend/shipping/view/main/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Shipping diff --git a/themes/Backend/ExtJs/backend/site/app.js b/themes/Backend/ExtJs/backend/site/app.js index 39224651202..9b99fbe0e45 100644 --- a/themes/Backend/ExtJs/backend/site/app.js +++ b/themes/Backend/ExtJs/backend/site/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Site diff --git a/themes/Backend/ExtJs/backend/site/controller/form.js b/themes/Backend/ExtJs/backend/site/controller/form.js index d79210e0d9f..72309f03e0f 100644 --- a/themes/Backend/ExtJs/backend/site/controller/form.js +++ b/themes/Backend/ExtJs/backend/site/controller/form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Site diff --git a/themes/Backend/ExtJs/backend/site/controller/main.js b/themes/Backend/ExtJs/backend/site/controller/main.js index 5466b781a63..32331379157 100644 --- a/themes/Backend/ExtJs/backend/site/controller/main.js +++ b/themes/Backend/ExtJs/backend/site/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Site diff --git a/themes/Backend/ExtJs/backend/site/controller/tree.js b/themes/Backend/ExtJs/backend/site/controller/tree.js index b528e84eebf..e171e344f2d 100644 --- a/themes/Backend/ExtJs/backend/site/controller/tree.js +++ b/themes/Backend/ExtJs/backend/site/controller/tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Site diff --git a/themes/Backend/ExtJs/backend/site/model/groups.js b/themes/Backend/ExtJs/backend/site/model/groups.js index f2dc3635c0d..fc71cba89fd 100644 --- a/themes/Backend/ExtJs/backend/site/model/groups.js +++ b/themes/Backend/ExtJs/backend/site/model/groups.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Site diff --git a/themes/Backend/ExtJs/backend/site/model/nodes.js b/themes/Backend/ExtJs/backend/site/model/nodes.js index 97f914d2838..1d52d84f099 100644 --- a/themes/Backend/ExtJs/backend/site/model/nodes.js +++ b/themes/Backend/ExtJs/backend/site/model/nodes.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Site diff --git a/themes/Backend/ExtJs/backend/site/model/selected.js b/themes/Backend/ExtJs/backend/site/model/selected.js index c1c4b596219..f1c300da9ec 100644 --- a/themes/Backend/ExtJs/backend/site/model/selected.js +++ b/themes/Backend/ExtJs/backend/site/model/selected.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Site diff --git a/themes/Backend/ExtJs/backend/site/store/groups.js b/themes/Backend/ExtJs/backend/site/store/groups.js index 5e0c2a25411..adbb5a64cbd 100644 --- a/themes/Backend/ExtJs/backend/site/store/groups.js +++ b/themes/Backend/ExtJs/backend/site/store/groups.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Site diff --git a/themes/Backend/ExtJs/backend/site/store/nodes.js b/themes/Backend/ExtJs/backend/site/store/nodes.js index 34603435210..15cc2275354 100644 --- a/themes/Backend/ExtJs/backend/site/store/nodes.js +++ b/themes/Backend/ExtJs/backend/site/store/nodes.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Site diff --git a/themes/Backend/ExtJs/backend/site/store/selected.js b/themes/Backend/ExtJs/backend/site/store/selected.js index ee0e17313cb..04076e5ea69 100644 --- a/themes/Backend/ExtJs/backend/site/store/selected.js +++ b/themes/Backend/ExtJs/backend/site/store/selected.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Site diff --git a/themes/Backend/ExtJs/backend/site/store/shop.js b/themes/Backend/ExtJs/backend/site/store/shop.js index 35179165117..75b247aabaf 100644 --- a/themes/Backend/ExtJs/backend/site/store/shop.js +++ b/themes/Backend/ExtJs/backend/site/store/shop.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/site/store/shop"} diff --git a/themes/Backend/ExtJs/backend/site/view/main/window.js b/themes/Backend/ExtJs/backend/site/view/main/window.js index 9267dbc9fd9..365c36ae47f 100644 --- a/themes/Backend/ExtJs/backend/site/view/main/window.js +++ b/themes/Backend/ExtJs/backend/site/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Site diff --git a/themes/Backend/ExtJs/backend/site/view/site/form.js b/themes/Backend/ExtJs/backend/site/view/site/form.js index 3430dbe05f1..c0d171af70a 100644 --- a/themes/Backend/ExtJs/backend/site/view/site/form.js +++ b/themes/Backend/ExtJs/backend/site/view/site/form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Site diff --git a/themes/Backend/ExtJs/backend/site/view/site/group_dialog.js b/themes/Backend/ExtJs/backend/site/view/site/group_dialog.js index 97da05be3a1..e4eb61d9362 100644 --- a/themes/Backend/ExtJs/backend/site/view/site/group_dialog.js +++ b/themes/Backend/ExtJs/backend/site/view/site/group_dialog.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Site diff --git a/themes/Backend/ExtJs/backend/site/view/site/tree.js b/themes/Backend/ExtJs/backend/site/view/site/tree.js index 1a40e25ecc5..83487b114e2 100644 --- a/themes/Backend/ExtJs/backend/site/view/site/tree.js +++ b/themes/Backend/ExtJs/backend/site/view/site/tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Site diff --git a/themes/Backend/ExtJs/backend/snippet/app.js b/themes/Backend/ExtJs/backend/snippet/app.js index 0cb82a39158..9c68e1e7502 100644 --- a/themes/Backend/ExtJs/backend/snippet/app.js +++ b/themes/Backend/ExtJs/backend/snippet/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{block name="backend/snippet/app"} diff --git a/themes/Backend/ExtJs/backend/snippet/controller/main.js b/themes/Backend/ExtJs/backend/snippet/controller/main.js index 5366db7258f..2742cb81e4f 100644 --- a/themes/Backend/ExtJs/backend/snippet/controller/main.js +++ b/themes/Backend/ExtJs/backend/snippet/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/snippet/controller/main"} diff --git a/themes/Backend/ExtJs/backend/snippet/model/n_space.js b/themes/Backend/ExtJs/backend/snippet/model/n_space.js index 654cbb8bdcf..15444943ed7 100644 --- a/themes/Backend/ExtJs/backend/snippet/model/n_space.js +++ b/themes/Backend/ExtJs/backend/snippet/model/n_space.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/snippet/model/shoplocale.js b/themes/Backend/ExtJs/backend/snippet/model/shoplocale.js index 3c1f777b25d..d13a3506aa1 100644 --- a/themes/Backend/ExtJs/backend/snippet/model/shoplocale.js +++ b/themes/Backend/ExtJs/backend/snippet/model/shoplocale.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/snippet/model/snippet.js b/themes/Backend/ExtJs/backend/snippet/model/snippet.js index 9c8470596c8..74c23471f37 100644 --- a/themes/Backend/ExtJs/backend/snippet/model/snippet.js +++ b/themes/Backend/ExtJs/backend/snippet/model/snippet.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/snippet/store/n_space.js b/themes/Backend/ExtJs/backend/snippet/store/n_space.js index 1fabac23d86..ea3d39492d0 100644 --- a/themes/Backend/ExtJs/backend/snippet/store/n_space.js +++ b/themes/Backend/ExtJs/backend/snippet/store/n_space.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/snippet/store/shoplocale.js b/themes/Backend/ExtJs/backend/snippet/store/shoplocale.js index 54291e3b986..888cf08b220 100644 --- a/themes/Backend/ExtJs/backend/snippet/store/shoplocale.js +++ b/themes/Backend/ExtJs/backend/snippet/store/shoplocale.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/snippet/store/snippet.js b/themes/Backend/ExtJs/backend/snippet/store/snippet.js index d0ec7720385..08e0e1d604b 100644 --- a/themes/Backend/ExtJs/backend/snippet/store/snippet.js +++ b/themes/Backend/ExtJs/backend/snippet/store/snippet.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/snippet/view/main/create_form.js b/themes/Backend/ExtJs/backend/snippet/view/main/create_form.js index bc60d8babf3..20a6fab9a37 100644 --- a/themes/Backend/ExtJs/backend/snippet/view/main/create_form.js +++ b/themes/Backend/ExtJs/backend/snippet/view/main/create_form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/snippet/view/main"} diff --git a/themes/Backend/ExtJs/backend/snippet/view/main/edit_form.js b/themes/Backend/ExtJs/backend/snippet/view/main/edit_form.js index 9b3151e7019..57d54b037a7 100644 --- a/themes/Backend/ExtJs/backend/snippet/view/main/edit_form.js +++ b/themes/Backend/ExtJs/backend/snippet/view/main/edit_form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/snippet/view/main"} diff --git a/themes/Backend/ExtJs/backend/snippet/view/main/form.js b/themes/Backend/ExtJs/backend/snippet/view/main/form.js index aed5547ca99..541a36a82c3 100644 --- a/themes/Backend/ExtJs/backend/snippet/view/main/form.js +++ b/themes/Backend/ExtJs/backend/snippet/view/main/form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/snippet/view/main"} diff --git a/themes/Backend/ExtJs/backend/snippet/view/main/grid.js b/themes/Backend/ExtJs/backend/snippet/view/main/grid.js index fe24e1b721d..48eb3bca47e 100644 --- a/themes/Backend/ExtJs/backend/snippet/view/main/grid.js +++ b/themes/Backend/ExtJs/backend/snippet/view/main/grid.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/snippet/view/main"} diff --git a/themes/Backend/ExtJs/backend/snippet/view/main/import_export.js b/themes/Backend/ExtJs/backend/snippet/view/main/import_export.js index 4de2f395f26..4417ce08b69 100644 --- a/themes/Backend/ExtJs/backend/snippet/view/main/import_export.js +++ b/themes/Backend/ExtJs/backend/snippet/view/main/import_export.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/snippet/view/main"} diff --git a/themes/Backend/ExtJs/backend/snippet/view/main/navigation.js b/themes/Backend/ExtJs/backend/snippet/view/main/navigation.js index b56b466405b..49af9222fb9 100644 --- a/themes/Backend/ExtJs/backend/snippet/view/main/navigation.js +++ b/themes/Backend/ExtJs/backend/snippet/view/main/navigation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/snippet/view/main"} diff --git a/themes/Backend/ExtJs/backend/snippet/view/main/snippet_panel.js b/themes/Backend/ExtJs/backend/snippet/view/main/snippet_panel.js index 0a612527906..52679fcea3c 100644 --- a/themes/Backend/ExtJs/backend/snippet/view/main/snippet_panel.js +++ b/themes/Backend/ExtJs/backend/snippet/view/main/snippet_panel.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/snippet/view/main"} diff --git a/themes/Backend/ExtJs/backend/snippet/view/main/translate_form.js b/themes/Backend/ExtJs/backend/snippet/view/main/translate_form.js index 01de071bc07..c897511439a 100644 --- a/themes/Backend/ExtJs/backend/snippet/view/main/translate_form.js +++ b/themes/Backend/ExtJs/backend/snippet/view/main/translate_form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/snippet/view/main"} diff --git a/themes/Backend/ExtJs/backend/snippet/view/main/translate_window.js b/themes/Backend/ExtJs/backend/snippet/view/main/translate_window.js index b57641fb736..f2b053d520a 100644 --- a/themes/Backend/ExtJs/backend/snippet/view/main/translate_window.js +++ b/themes/Backend/ExtJs/backend/snippet/view/main/translate_window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/snippet/view/main"} diff --git a/themes/Backend/ExtJs/backend/snippet/view/main/window.js b/themes/Backend/ExtJs/backend/snippet/view/main/window.js index 9b98cef70eb..84dd9898933 100644 --- a/themes/Backend/ExtJs/backend/snippet/view/main/window.js +++ b/themes/Backend/ExtJs/backend/snippet/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/snippet/view/main"} diff --git a/themes/Backend/ExtJs/backend/supplier/app.js b/themes/Backend/ExtJs/backend/supplier/app.js index 50a170f3c3e..e08e1502e91 100644 --- a/themes/Backend/ExtJs/backend/supplier/app.js +++ b/themes/Backend/ExtJs/backend/supplier/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Supplier diff --git a/themes/Backend/ExtJs/backend/supplier/controller/main.js b/themes/Backend/ExtJs/backend/supplier/controller/main.js index c78b7f7fcad..461eade7b20 100644 --- a/themes/Backend/ExtJs/backend/supplier/controller/main.js +++ b/themes/Backend/ExtJs/backend/supplier/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Supplier diff --git a/themes/Backend/ExtJs/backend/supplier/model/supplier.js b/themes/Backend/ExtJs/backend/supplier/model/supplier.js index 14d2f10db9e..313f57b5f26 100644 --- a/themes/Backend/ExtJs/backend/supplier/model/supplier.js +++ b/themes/Backend/ExtJs/backend/supplier/model/supplier.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Supplier diff --git a/themes/Backend/ExtJs/backend/supplier/store/supplier.js b/themes/Backend/ExtJs/backend/supplier/store/supplier.js index 71d98203262..1debb8341ed 100644 --- a/themes/Backend/ExtJs/backend/supplier/store/supplier.js +++ b/themes/Backend/ExtJs/backend/supplier/store/supplier.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Supplier diff --git a/themes/Backend/ExtJs/backend/supplier/view/main.js b/themes/Backend/ExtJs/backend/supplier/view/main.js index 074f6b11ba6..7b261a3ad76 100644 --- a/themes/Backend/ExtJs/backend/supplier/view/main.js +++ b/themes/Backend/ExtJs/backend/supplier/view/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Supplier diff --git a/themes/Backend/ExtJs/backend/supplier/view/main/create.js b/themes/Backend/ExtJs/backend/supplier/view/main/create.js index f169075cf6c..c57437f91bb 100644 --- a/themes/Backend/ExtJs/backend/supplier/view/main/create.js +++ b/themes/Backend/ExtJs/backend/supplier/view/main/create.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Supplier diff --git a/themes/Backend/ExtJs/backend/supplier/view/main/detail.js b/themes/Backend/ExtJs/backend/supplier/view/main/detail.js index 30d7a3b0dcc..53a7ac210bd 100644 --- a/themes/Backend/ExtJs/backend/supplier/view/main/detail.js +++ b/themes/Backend/ExtJs/backend/supplier/view/main/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Supplier diff --git a/themes/Backend/ExtJs/backend/supplier/view/main/edit.js b/themes/Backend/ExtJs/backend/supplier/view/main/edit.js index b49a8ccd2e3..335487518f6 100644 --- a/themes/Backend/ExtJs/backend/supplier/view/main/edit.js +++ b/themes/Backend/ExtJs/backend/supplier/view/main/edit.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Supplier diff --git a/themes/Backend/ExtJs/backend/supplier/view/main/list.js b/themes/Backend/ExtJs/backend/supplier/view/main/list.js index 636df4a286c..72963ad26f4 100644 --- a/themes/Backend/ExtJs/backend/supplier/view/main/list.js +++ b/themes/Backend/ExtJs/backend/supplier/view/main/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Supplier diff --git a/themes/Backend/ExtJs/backend/supplier/view/main/toolbar.js b/themes/Backend/ExtJs/backend/supplier/view/main/toolbar.js index 6f22a2c973e..af6eee17679 100644 --- a/themes/Backend/ExtJs/backend/supplier/view/main/toolbar.js +++ b/themes/Backend/ExtJs/backend/supplier/view/main/toolbar.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Supplier diff --git a/themes/Backend/ExtJs/backend/systeminfo/app.js b/themes/Backend/ExtJs/backend/systeminfo/app.js index cef58f37c38..d94653efa85 100644 --- a/themes/Backend/ExtJs/backend/systeminfo/app.js +++ b/themes/Backend/ExtJs/backend/systeminfo/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/systeminfo/controller/main.js b/themes/Backend/ExtJs/backend/systeminfo/controller/main.js index edc7c703eee..f7ce78bc4a9 100644 --- a/themes/Backend/ExtJs/backend/systeminfo/controller/main.js +++ b/themes/Backend/ExtJs/backend/systeminfo/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/systeminfo/controller/systeminfo.js b/themes/Backend/ExtJs/backend/systeminfo/controller/systeminfo.js index 545b22c552a..76dd89e7ef3 100644 --- a/themes/Backend/ExtJs/backend/systeminfo/controller/systeminfo.js +++ b/themes/Backend/ExtJs/backend/systeminfo/controller/systeminfo.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/systeminfo/model/config.js b/themes/Backend/ExtJs/backend/systeminfo/model/config.js index e428732a175..af08daabe07 100644 --- a/themes/Backend/ExtJs/backend/systeminfo/model/config.js +++ b/themes/Backend/ExtJs/backend/systeminfo/model/config.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/systeminfo/model/file.js b/themes/Backend/ExtJs/backend/systeminfo/model/file.js index 6985d3de776..2cd7bcacc90 100644 --- a/themes/Backend/ExtJs/backend/systeminfo/model/file.js +++ b/themes/Backend/ExtJs/backend/systeminfo/model/file.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/systeminfo/model/optimizer.js b/themes/Backend/ExtJs/backend/systeminfo/model/optimizer.js index 1130ca7a7cd..6eded94332a 100644 --- a/themes/Backend/ExtJs/backend/systeminfo/model/optimizer.js +++ b/themes/Backend/ExtJs/backend/systeminfo/model/optimizer.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * Shopware Model - Version list systeminfo backend module. * This model represents a single shopware-config diff --git a/themes/Backend/ExtJs/backend/systeminfo/model/path.js b/themes/Backend/ExtJs/backend/systeminfo/model/path.js index 6b8f9f13354..637f3bd346c 100644 --- a/themes/Backend/ExtJs/backend/systeminfo/model/path.js +++ b/themes/Backend/ExtJs/backend/systeminfo/model/path.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * Shopware Model - Path list systeminfo backend module. * This model represents a single shopware-path diff --git a/themes/Backend/ExtJs/backend/systeminfo/model/version.js b/themes/Backend/ExtJs/backend/systeminfo/model/version.js index 9edc825e26b..c472be80180 100644 --- a/themes/Backend/ExtJs/backend/systeminfo/model/version.js +++ b/themes/Backend/ExtJs/backend/systeminfo/model/version.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * Shopware Model - Version list systeminfo backend module. * This model represents a single shopware-config diff --git a/themes/Backend/ExtJs/backend/systeminfo/store/configs.js b/themes/Backend/ExtJs/backend/systeminfo/store/configs.js index e3ba44cab01..f2ea42a3df3 100644 --- a/themes/Backend/ExtJs/backend/systeminfo/store/configs.js +++ b/themes/Backend/ExtJs/backend/systeminfo/store/configs.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/systeminfo/store/files.js b/themes/Backend/ExtJs/backend/systeminfo/store/files.js index 922eab40d6c..512bb7e425e 100644 --- a/themes/Backend/ExtJs/backend/systeminfo/store/files.js +++ b/themes/Backend/ExtJs/backend/systeminfo/store/files.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/systeminfo/store/optimizers.js b/themes/Backend/ExtJs/backend/systeminfo/store/optimizers.js index 6518554e8de..567fdc1d43c 100644 --- a/themes/Backend/ExtJs/backend/systeminfo/store/optimizers.js +++ b/themes/Backend/ExtJs/backend/systeminfo/store/optimizers.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/systeminfo/store/paths.js b/themes/Backend/ExtJs/backend/systeminfo/store/paths.js index c0e775789cd..91a118ef6ff 100644 --- a/themes/Backend/ExtJs/backend/systeminfo/store/paths.js +++ b/themes/Backend/ExtJs/backend/systeminfo/store/paths.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/systeminfo/store/versions.js b/themes/Backend/ExtJs/backend/systeminfo/store/versions.js index cf6d8ddad1e..1f126ec7f83 100644 --- a/themes/Backend/ExtJs/backend/systeminfo/store/versions.js +++ b/themes/Backend/ExtJs/backend/systeminfo/store/versions.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/systeminfo/view/main/window.js b/themes/Backend/ExtJs/backend/systeminfo/view/main/window.js index f20e66b59d4..1fc925ed5c6 100644 --- a/themes/Backend/ExtJs/backend/systeminfo/view/main/window.js +++ b/themes/Backend/ExtJs/backend/systeminfo/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/configlist.js b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/configlist.js index c582fe5ab5b..6ca71fa8700 100644 --- a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/configlist.js +++ b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/configlist.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/filelist.js b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/filelist.js index ee84ebb76f1..a30e6d947a7 100644 --- a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/filelist.js +++ b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/filelist.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/optimizerlist.js b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/optimizerlist.js index 8f47fcb4e2b..97fa698f66d 100644 --- a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/optimizerlist.js +++ b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/optimizerlist.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/pathlist.js b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/pathlist.js index a7cb0fd3d09..336361d98b5 100644 --- a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/pathlist.js +++ b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/pathlist.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/phpinfo.js b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/phpinfo.js index 18872274757..5414b26b8f6 100644 --- a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/phpinfo.js +++ b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/phpinfo.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/timezone.js b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/timezone.js index d7df2b9839b..fe26734420f 100644 --- a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/timezone.js +++ b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/timezone.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/versionlist.js b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/versionlist.js index 6da0cdcea1c..3d4838f181d 100644 --- a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/versionlist.js +++ b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/versionlist.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Systeminfo diff --git a/themes/Backend/ExtJs/backend/tax/app.js b/themes/Backend/ExtJs/backend/tax/app.js index 97ef43c0f5e..adae69c57a9 100644 --- a/themes/Backend/ExtJs/backend/tax/app.js +++ b/themes/Backend/ExtJs/backend/tax/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * Shopware UI - Country Manager bootstrapper * diff --git a/themes/Backend/ExtJs/backend/tax/controller/main.js b/themes/Backend/ExtJs/backend/tax/controller/main.js index da745a3b2d6..ae7e40f6a21 100644 --- a/themes/Backend/ExtJs/backend/tax/controller/main.js +++ b/themes/Backend/ExtJs/backend/tax/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * Shopware UI - User Manager Main Controller * diff --git a/themes/Backend/ExtJs/backend/tax/model/areas.js b/themes/Backend/ExtJs/backend/tax/model/areas.js index 0f4e8af7dfc..2c32715f663 100644 --- a/themes/Backend/ExtJs/backend/tax/model/areas.js +++ b/themes/Backend/ExtJs/backend/tax/model/areas.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Tax diff --git a/themes/Backend/ExtJs/backend/tax/model/countries.js b/themes/Backend/ExtJs/backend/tax/model/countries.js index 2c5d830b037..c45e0edc47a 100644 --- a/themes/Backend/ExtJs/backend/tax/model/countries.js +++ b/themes/Backend/ExtJs/backend/tax/model/countries.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Tax diff --git a/themes/Backend/ExtJs/backend/tax/model/groups.js b/themes/Backend/ExtJs/backend/tax/model/groups.js index 8691c5eacc7..b2e7195d64e 100644 --- a/themes/Backend/ExtJs/backend/tax/model/groups.js +++ b/themes/Backend/ExtJs/backend/tax/model/groups.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Tax diff --git a/themes/Backend/ExtJs/backend/tax/model/rules.js b/themes/Backend/ExtJs/backend/tax/model/rules.js index 01cf9d6e0d5..d337dc00222 100644 --- a/themes/Backend/ExtJs/backend/tax/model/rules.js +++ b/themes/Backend/ExtJs/backend/tax/model/rules.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Tax diff --git a/themes/Backend/ExtJs/backend/tax/model/states.js b/themes/Backend/ExtJs/backend/tax/model/states.js index e5f7e4f7de6..14183a00d5e 100644 --- a/themes/Backend/ExtJs/backend/tax/model/states.js +++ b/themes/Backend/ExtJs/backend/tax/model/states.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Tax diff --git a/themes/Backend/ExtJs/backend/tax/store/areas.js b/themes/Backend/ExtJs/backend/tax/store/areas.js index d0b14715778..59219cf741a 100644 --- a/themes/Backend/ExtJs/backend/tax/store/areas.js +++ b/themes/Backend/ExtJs/backend/tax/store/areas.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Tax diff --git a/themes/Backend/ExtJs/backend/tax/store/countries.js b/themes/Backend/ExtJs/backend/tax/store/countries.js index a4ef3752772..77249fdf5a8 100644 --- a/themes/Backend/ExtJs/backend/tax/store/countries.js +++ b/themes/Backend/ExtJs/backend/tax/store/countries.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Tax diff --git a/themes/Backend/ExtJs/backend/tax/store/groups.js b/themes/Backend/ExtJs/backend/tax/store/groups.js index 318a217317c..810f6cda890 100644 --- a/themes/Backend/ExtJs/backend/tax/store/groups.js +++ b/themes/Backend/ExtJs/backend/tax/store/groups.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Tax diff --git a/themes/Backend/ExtJs/backend/tax/store/rules.js b/themes/Backend/ExtJs/backend/tax/store/rules.js index 827a224f863..a6573a6833d 100644 --- a/themes/Backend/ExtJs/backend/tax/store/rules.js +++ b/themes/Backend/ExtJs/backend/tax/store/rules.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Tax diff --git a/themes/Backend/ExtJs/backend/tax/store/states.js b/themes/Backend/ExtJs/backend/tax/store/states.js index c510c945c11..9be8b108012 100644 --- a/themes/Backend/ExtJs/backend/tax/store/states.js +++ b/themes/Backend/ExtJs/backend/tax/store/states.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Tax diff --git a/themes/Backend/ExtJs/backend/tax/view/main/rules.js b/themes/Backend/ExtJs/backend/tax/view/main/rules.js index bbfbdac6385..1da4d24576d 100644 --- a/themes/Backend/ExtJs/backend/tax/view/main/rules.js +++ b/themes/Backend/ExtJs/backend/tax/view/main/rules.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Tax diff --git a/themes/Backend/ExtJs/backend/tax/view/main/tree.js b/themes/Backend/ExtJs/backend/tax/view/main/tree.js index a93f00947ee..b5d73177801 100644 --- a/themes/Backend/ExtJs/backend/tax/view/main/tree.js +++ b/themes/Backend/ExtJs/backend/tax/view/main/tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Site diff --git a/themes/Backend/ExtJs/backend/tax/view/main/window.js b/themes/Backend/ExtJs/backend/tax/view/main/window.js index 55589031948..fd31f906bc8 100644 --- a/themes/Backend/ExtJs/backend/tax/view/main/window.js +++ b/themes/Backend/ExtJs/backend/tax/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Customer diff --git a/themes/Backend/ExtJs/backend/theme/app.js b/themes/Backend/ExtJs/backend/theme/app.js index 9070e939a6e..db1b8648e81 100644 --- a/themes/Backend/ExtJs/backend/theme/app.js +++ b/themes/Backend/ExtJs/backend/theme/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/controller/detail.js b/themes/Backend/ExtJs/backend/theme/controller/detail.js index 0c973ca3fa7..02c8b977ba8 100644 --- a/themes/Backend/ExtJs/backend/theme/controller/detail.js +++ b/themes/Backend/ExtJs/backend/theme/controller/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/controller/list.js b/themes/Backend/ExtJs/backend/theme/controller/list.js index 18af29a7a02..96631686784 100644 --- a/themes/Backend/ExtJs/backend/theme/controller/list.js +++ b/themes/Backend/ExtJs/backend/theme/controller/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/controller/settings.js b/themes/Backend/ExtJs/backend/theme/controller/settings.js index 2bcf8ffcfff..5f55c9d429a 100644 --- a/themes/Backend/ExtJs/backend/theme/controller/settings.js +++ b/themes/Backend/ExtJs/backend/theme/controller/settings.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/model/config_set.js b/themes/Backend/ExtJs/backend/theme/model/config_set.js index da68768b9b3..869eb00f154 100644 --- a/themes/Backend/ExtJs/backend/theme/model/config_set.js +++ b/themes/Backend/ExtJs/backend/theme/model/config_set.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/model/config_value.js b/themes/Backend/ExtJs/backend/theme/model/config_value.js index 634559207ab..79469e549bd 100644 --- a/themes/Backend/ExtJs/backend/theme/model/config_value.js +++ b/themes/Backend/ExtJs/backend/theme/model/config_value.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/model/element.js b/themes/Backend/ExtJs/backend/theme/model/element.js index 8fd12b04754..c033273aff2 100644 --- a/themes/Backend/ExtJs/backend/theme/model/element.js +++ b/themes/Backend/ExtJs/backend/theme/model/element.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/model/layout.js b/themes/Backend/ExtJs/backend/theme/model/layout.js index a0bad3864ba..fa2b1605b7a 100644 --- a/themes/Backend/ExtJs/backend/theme/model/layout.js +++ b/themes/Backend/ExtJs/backend/theme/model/layout.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/model/settings.js b/themes/Backend/ExtJs/backend/theme/model/settings.js index 7b40668745b..449f1518db6 100644 --- a/themes/Backend/ExtJs/backend/theme/model/settings.js +++ b/themes/Backend/ExtJs/backend/theme/model/settings.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/model/theme.js b/themes/Backend/ExtJs/backend/theme/model/theme.js index 31e61831444..993526ab1ab 100644 --- a/themes/Backend/ExtJs/backend/theme/model/theme.js +++ b/themes/Backend/ExtJs/backend/theme/model/theme.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/store/config_sets.js b/themes/Backend/ExtJs/backend/theme/store/config_sets.js index 2cc4cdb1743..e41fdf9c5d7 100644 --- a/themes/Backend/ExtJs/backend/theme/store/config_sets.js +++ b/themes/Backend/ExtJs/backend/theme/store/config_sets.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/store/theme.js b/themes/Backend/ExtJs/backend/theme/store/theme.js index c48ea661994..6ddcba154db 100644 --- a/themes/Backend/ExtJs/backend/theme/store/theme.js +++ b/themes/Backend/ExtJs/backend/theme/store/theme.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/view/config_sets/window.js b/themes/Backend/ExtJs/backend/theme/view/config_sets/window.js index eb37e3377b2..842ea209513 100644 --- a/themes/Backend/ExtJs/backend/theme/view/config_sets/window.js +++ b/themes/Backend/ExtJs/backend/theme/view/config_sets/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/theme/main"} diff --git a/themes/Backend/ExtJs/backend/theme/view/create/theme.js b/themes/Backend/ExtJs/backend/theme/view/create/theme.js index 4273c51a323..30560316d67 100644 --- a/themes/Backend/ExtJs/backend/theme/view/create/theme.js +++ b/themes/Backend/ExtJs/backend/theme/view/create/theme.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/view/create/window.js b/themes/Backend/ExtJs/backend/theme/view/create/window.js index 37cc8eeba8b..e69db032ec8 100644 --- a/themes/Backend/ExtJs/backend/theme/view/create/window.js +++ b/themes/Backend/ExtJs/backend/theme/view/create/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/containers/field_set.js b/themes/Backend/ExtJs/backend/theme/view/detail/containers/field_set.js index 16d8f5925b4..64d0dd7a4b7 100644 --- a/themes/Backend/ExtJs/backend/theme/view/detail/containers/field_set.js +++ b/themes/Backend/ExtJs/backend/theme/view/detail/containers/field_set.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ Ext.define('Shopware.apps.Theme.view.detail.containers.FieldSet', { diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/containers/tab.js b/themes/Backend/ExtJs/backend/theme/view/detail/containers/tab.js index da4e9776b5f..f5c09067e51 100644 --- a/themes/Backend/ExtJs/backend/theme/view/detail/containers/tab.js +++ b/themes/Backend/ExtJs/backend/theme/view/detail/containers/tab.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ Ext.define('Shopware.apps.Theme.view.detail.containers.Tab', { diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/containers/tab_panel.js b/themes/Backend/ExtJs/backend/theme/view/detail/containers/tab_panel.js index 830af518624..507064fcb21 100644 --- a/themes/Backend/ExtJs/backend/theme/view/detail/containers/tab_panel.js +++ b/themes/Backend/ExtJs/backend/theme/view/detail/containers/tab_panel.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ Ext.define('Shopware.apps.Theme.view.detail.containers.TabPanel', { diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/checkbox_field.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/checkbox_field.js index 2f11c4f3fe3..6aa48abc03e 100644 --- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/checkbox_field.js +++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/checkbox_field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/color_picker.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/color_picker.js index 7f79448d6d3..06234115523 100644 --- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/color_picker.js +++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/color_picker.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/theme/main"} diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/date_field.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/date_field.js index d144dd063c9..9627b6cbf26 100644 --- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/date_field.js +++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/date_field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/em_field.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/em_field.js index ad4fbe6f496..56847c2dfec 100644 --- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/em_field.js +++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/em_field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/media_selection.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/media_selection.js index ec203d7fc7c..46f5ee23356 100644 --- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/media_selection.js +++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/media_selection.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/no_url_field.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/no_url_field.js index 20c0dc16d1e..c93314d7dbb 100644 --- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/no_url_field.js +++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/no_url_field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/percent_field.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/percent_field.js index c1c1e6d6404..b8a373ec0cc 100644 --- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/percent_field.js +++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/percent_field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/pixel_field.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/pixel_field.js index 29afb97bfd2..e529c1e738f 100644 --- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/pixel_field.js +++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/pixel_field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/select_field.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/select_field.js index 6c77f6cb7bb..bf1db1e3582 100644 --- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/select_field.js +++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/select_field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/suffix.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/suffix.js index da106fa7ee2..94d4daa279d 100644 --- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/suffix.js +++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/suffix.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/text_area_field.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/text_area_field.js index b3114b044e4..3369eae3a26 100644 --- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/text_area_field.js +++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/text_area_field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/text_field.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/text_field.js index 9cb7c83b45c..c89d470ab09 100644 --- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/text_field.js +++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/text_field.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/theme.js b/themes/Backend/ExtJs/backend/theme/view/detail/theme.js index e1e38b1032a..23774e1a54b 100644 --- a/themes/Backend/ExtJs/backend/theme/view/detail/theme.js +++ b/themes/Backend/ExtJs/backend/theme/view/detail/theme.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/window.js b/themes/Backend/ExtJs/backend/theme/view/detail/window.js index bcb90f1b161..ec9e760283a 100644 --- a/themes/Backend/ExtJs/backend/theme/view/detail/window.js +++ b/themes/Backend/ExtJs/backend/theme/view/detail/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/view/list/extensions/info.js b/themes/Backend/ExtJs/backend/theme/view/list/extensions/info.js index 4b9267ab260..be43813ec8e 100644 --- a/themes/Backend/ExtJs/backend/theme/view/list/extensions/info.js +++ b/themes/Backend/ExtJs/backend/theme/view/list/extensions/info.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/view/list/theme.js b/themes/Backend/ExtJs/backend/theme/view/list/theme.js index d3e1c877be5..15f78af245d 100644 --- a/themes/Backend/ExtJs/backend/theme/view/list/theme.js +++ b/themes/Backend/ExtJs/backend/theme/view/list/theme.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/view/list/window.js b/themes/Backend/ExtJs/backend/theme/view/list/window.js index 837ebce22f2..3d824dde393 100644 --- a/themes/Backend/ExtJs/backend/theme/view/list/window.js +++ b/themes/Backend/ExtJs/backend/theme/view/list/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/view/settings/settings.js b/themes/Backend/ExtJs/backend/theme/view/settings/settings.js index 5fb7105cfb2..3d10fb30c15 100644 --- a/themes/Backend/ExtJs/backend/theme/view/settings/settings.js +++ b/themes/Backend/ExtJs/backend/theme/view/settings/settings.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ /** diff --git a/themes/Backend/ExtJs/backend/theme/view/settings/window.js b/themes/Backend/ExtJs/backend/theme/view/settings/window.js index bff220b1c0c..87e87ab7c62 100644 --- a/themes/Backend/ExtJs/backend/theme/view/settings/window.js +++ b/themes/Backend/ExtJs/backend/theme/view/settings/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. */ //{namespace name="backend/theme/main"} diff --git a/themes/Backend/ExtJs/backend/translation/app.js b/themes/Backend/ExtJs/backend/translation/app.js index 3a31ae398d9..422f307aa84 100644 --- a/themes/Backend/ExtJs/backend/translation/app.js +++ b/themes/Backend/ExtJs/backend/translation/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Translation diff --git a/themes/Backend/ExtJs/backend/translation/controller/main.js b/themes/Backend/ExtJs/backend/translation/controller/main.js index 9f8cc1b7a34..db17d85e141 100644 --- a/themes/Backend/ExtJs/backend/translation/controller/main.js +++ b/themes/Backend/ExtJs/backend/translation/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Translation diff --git a/themes/Backend/ExtJs/backend/translation/model/language.js b/themes/Backend/ExtJs/backend/translation/model/language.js index 6ea354a6afd..b5a51acf620 100644 --- a/themes/Backend/ExtJs/backend/translation/model/language.js +++ b/themes/Backend/ExtJs/backend/translation/model/language.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Translation diff --git a/themes/Backend/ExtJs/backend/translation/store/language.js b/themes/Backend/ExtJs/backend/translation/store/language.js index 85d7aa3825b..3bdf1050f72 100644 --- a/themes/Backend/ExtJs/backend/translation/store/language.js +++ b/themes/Backend/ExtJs/backend/translation/store/language.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Translation diff --git a/themes/Backend/ExtJs/backend/translation/view/main/form.js b/themes/Backend/ExtJs/backend/translation/view/main/form.js index 9c64646da69..85084a6077c 100644 --- a/themes/Backend/ExtJs/backend/translation/view/main/form.js +++ b/themes/Backend/ExtJs/backend/translation/view/main/form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Translation diff --git a/themes/Backend/ExtJs/backend/translation/view/main/navigation.js b/themes/Backend/ExtJs/backend/translation/view/main/navigation.js index e954606b3e5..c11a0bf760e 100644 --- a/themes/Backend/ExtJs/backend/translation/view/main/navigation.js +++ b/themes/Backend/ExtJs/backend/translation/view/main/navigation.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Translation diff --git a/themes/Backend/ExtJs/backend/translation/view/main/services.js b/themes/Backend/ExtJs/backend/translation/view/main/services.js index 576563bfd41..3a7098de5d4 100644 --- a/themes/Backend/ExtJs/backend/translation/view/main/services.js +++ b/themes/Backend/ExtJs/backend/translation/view/main/services.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Translation diff --git a/themes/Backend/ExtJs/backend/translation/view/main/toolbar.js b/themes/Backend/ExtJs/backend/translation/view/main/toolbar.js index d4511f3a37b..2ebcfc60e1e 100644 --- a/themes/Backend/ExtJs/backend/translation/view/main/toolbar.js +++ b/themes/Backend/ExtJs/backend/translation/view/main/toolbar.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Translation diff --git a/themes/Backend/ExtJs/backend/translation/view/main/window.js b/themes/Backend/ExtJs/backend/translation/view/main/window.js index 7033463badd..166a6076665 100644 --- a/themes/Backend/ExtJs/backend/translation/view/main/window.js +++ b/themes/Backend/ExtJs/backend/translation/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Translation diff --git a/themes/Backend/ExtJs/backend/user_manager/app.js b/themes/Backend/ExtJs/backend/user_manager/app.js index f2374256fe2..45a58f737cd 100644 --- a/themes/Backend/ExtJs/backend/user_manager/app.js +++ b/themes/Backend/ExtJs/backend/user_manager/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/controller/main.js b/themes/Backend/ExtJs/backend/user_manager/controller/main.js index 1e02269e3db..4879de67bcb 100644 --- a/themes/Backend/ExtJs/backend/user_manager/controller/main.js +++ b/themes/Backend/ExtJs/backend/user_manager/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/controller/roles.js b/themes/Backend/ExtJs/backend/user_manager/controller/roles.js index af45780e127..4ead14413ee 100644 --- a/themes/Backend/ExtJs/backend/user_manager/controller/roles.js +++ b/themes/Backend/ExtJs/backend/user_manager/controller/roles.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/controller/rules.js b/themes/Backend/ExtJs/backend/user_manager/controller/rules.js index 32d4a0dd5c0..9dbe4b5de55 100644 --- a/themes/Backend/ExtJs/backend/user_manager/controller/rules.js +++ b/themes/Backend/ExtJs/backend/user_manager/controller/rules.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/controller/user.js b/themes/Backend/ExtJs/backend/user_manager/controller/user.js index 8c86f4516ee..5bbe81b4a54 100644 --- a/themes/Backend/ExtJs/backend/user_manager/controller/user.js +++ b/themes/Backend/ExtJs/backend/user_manager/controller/user.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/model/detail.js b/themes/Backend/ExtJs/backend/user_manager/model/detail.js index eae256fc4bb..0ac9155abd1 100644 --- a/themes/Backend/ExtJs/backend/user_manager/model/detail.js +++ b/themes/Backend/ExtJs/backend/user_manager/model/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/model/locale.js b/themes/Backend/ExtJs/backend/user_manager/model/locale.js index df3e4a2c5b0..34f37313ca9 100644 --- a/themes/Backend/ExtJs/backend/user_manager/model/locale.js +++ b/themes/Backend/ExtJs/backend/user_manager/model/locale.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Login diff --git a/themes/Backend/ExtJs/backend/user_manager/model/privilege.js b/themes/Backend/ExtJs/backend/user_manager/model/privilege.js index 7d0f3bdb06d..98e8876fc92 100644 --- a/themes/Backend/ExtJs/backend/user_manager/model/privilege.js +++ b/themes/Backend/ExtJs/backend/user_manager/model/privilege.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/model/resource.js b/themes/Backend/ExtJs/backend/user_manager/model/resource.js index 87e6ce58cde..b7015e79f71 100644 --- a/themes/Backend/ExtJs/backend/user_manager/model/resource.js +++ b/themes/Backend/ExtJs/backend/user_manager/model/resource.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/model/roles.js b/themes/Backend/ExtJs/backend/user_manager/model/roles.js index f8db47e9a95..6f1138dbf02 100644 --- a/themes/Backend/ExtJs/backend/user_manager/model/roles.js +++ b/themes/Backend/ExtJs/backend/user_manager/model/roles.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/model/rules.js b/themes/Backend/ExtJs/backend/user_manager/model/rules.js index f0d94202a28..18b5376ac26 100644 --- a/themes/Backend/ExtJs/backend/user_manager/model/rules.js +++ b/themes/Backend/ExtJs/backend/user_manager/model/rules.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/model/user.js b/themes/Backend/ExtJs/backend/user_manager/model/user.js index 65457d18325..1324f00a164 100644 --- a/themes/Backend/ExtJs/backend/user_manager/model/user.js +++ b/themes/Backend/ExtJs/backend/user_manager/model/user.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/model/user_detail.js b/themes/Backend/ExtJs/backend/user_manager/model/user_detail.js index 57735a4a5c7..d750c12f13c 100644 --- a/themes/Backend/ExtJs/backend/user_manager/model/user_detail.js +++ b/themes/Backend/ExtJs/backend/user_manager/model/user_detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/store/detail.js b/themes/Backend/ExtJs/backend/user_manager/store/detail.js index c3032eed2a6..4d2e242a9cf 100644 --- a/themes/Backend/ExtJs/backend/user_manager/store/detail.js +++ b/themes/Backend/ExtJs/backend/user_manager/store/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/store/locale.js b/themes/Backend/ExtJs/backend/user_manager/store/locale.js index 41282f047bf..8b7730d5251 100644 --- a/themes/Backend/ExtJs/backend/user_manager/store/locale.js +++ b/themes/Backend/ExtJs/backend/user_manager/store/locale.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Login diff --git a/themes/Backend/ExtJs/backend/user_manager/store/roles.js b/themes/Backend/ExtJs/backend/user_manager/store/roles.js index efeb7e938f8..42007e821d9 100644 --- a/themes/Backend/ExtJs/backend/user_manager/store/roles.js +++ b/themes/Backend/ExtJs/backend/user_manager/store/roles.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/store/rules.js b/themes/Backend/ExtJs/backend/user_manager/store/rules.js index 65aa5a7b9f8..f809617d249 100644 --- a/themes/Backend/ExtJs/backend/user_manager/store/rules.js +++ b/themes/Backend/ExtJs/backend/user_manager/store/rules.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/store/user.js b/themes/Backend/ExtJs/backend/user_manager/store/user.js index 42238e79bc0..7671c8b346f 100644 --- a/themes/Backend/ExtJs/backend/user_manager/store/user.js +++ b/themes/Backend/ExtJs/backend/user_manager/store/user.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/store/user_detail.js b/themes/Backend/ExtJs/backend/user_manager/store/user_detail.js index 6eed165aa9d..a725f3c64b1 100644 --- a/themes/Backend/ExtJs/backend/user_manager/store/user_detail.js +++ b/themes/Backend/ExtJs/backend/user_manager/store/user_detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/view/main/window.js b/themes/Backend/ExtJs/backend/user_manager/view/main/window.js index ecb0e064f94..37bfcf17d89 100644 --- a/themes/Backend/ExtJs/backend/user_manager/view/main/window.js +++ b/themes/Backend/ExtJs/backend/user_manager/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/view/roles/form.js b/themes/Backend/ExtJs/backend/user_manager/view/roles/form.js index d2b674aacfd..89a8789a466 100644 --- a/themes/Backend/ExtJs/backend/user_manager/view/roles/form.js +++ b/themes/Backend/ExtJs/backend/user_manager/view/roles/form.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/view/roles/list.js b/themes/Backend/ExtJs/backend/user_manager/view/roles/list.js index 2883770cfec..78832f04237 100644 --- a/themes/Backend/ExtJs/backend/user_manager/view/roles/list.js +++ b/themes/Backend/ExtJs/backend/user_manager/view/roles/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/view/rules/add.js b/themes/Backend/ExtJs/backend/user_manager/view/rules/add.js index 49f28baa319..88184c572a8 100644 --- a/themes/Backend/ExtJs/backend/user_manager/view/rules/add.js +++ b/themes/Backend/ExtJs/backend/user_manager/view/rules/add.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/view/rules/tree.js b/themes/Backend/ExtJs/backend/user_manager/view/rules/tree.js index 08b4db3e731..e8e2a3d5ac4 100644 --- a/themes/Backend/ExtJs/backend/user_manager/view/rules/tree.js +++ b/themes/Backend/ExtJs/backend/user_manager/view/rules/tree.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/view/user/create.js b/themes/Backend/ExtJs/backend/user_manager/view/user/create.js index 7c3843c39ad..63941c29ab2 100644 --- a/themes/Backend/ExtJs/backend/user_manager/view/user/create.js +++ b/themes/Backend/ExtJs/backend/user_manager/view/user/create.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/user_manager/view/user/list.js b/themes/Backend/ExtJs/backend/user_manager/view/user/list.js index 404d7d5fb7b..d0a8bb819de 100644 --- a/themes/Backend/ExtJs/backend/user_manager/view/user/list.js +++ b/themes/Backend/ExtJs/backend/user_manager/view/user/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package UserManager diff --git a/themes/Backend/ExtJs/backend/vote/app.js b/themes/Backend/ExtJs/backend/vote/app.js index f414a11ee25..7229da86730 100755 --- a/themes/Backend/ExtJs/backend/vote/app.js +++ b/themes/Backend/ExtJs/backend/vote/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Vote diff --git a/themes/Backend/ExtJs/backend/vote/controller/main.js b/themes/Backend/ExtJs/backend/vote/controller/main.js index a971d042951..7300961cad9 100755 --- a/themes/Backend/ExtJs/backend/vote/controller/main.js +++ b/themes/Backend/ExtJs/backend/vote/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Vote diff --git a/themes/Backend/ExtJs/backend/vote/model/accept_response.js b/themes/Backend/ExtJs/backend/vote/model/accept_response.js index 6e3c204f54b..c9bef12eafa 100644 --- a/themes/Backend/ExtJs/backend/vote/model/accept_response.js +++ b/themes/Backend/ExtJs/backend/vote/model/accept_response.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Vote diff --git a/themes/Backend/ExtJs/backend/vote/model/vote.js b/themes/Backend/ExtJs/backend/vote/model/vote.js index 235cbb9c1de..2282355da03 100755 --- a/themes/Backend/ExtJs/backend/vote/model/vote.js +++ b/themes/Backend/ExtJs/backend/vote/model/vote.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Vote diff --git a/themes/Backend/ExtJs/backend/vote/store/vote.js b/themes/Backend/ExtJs/backend/vote/store/vote.js index 222b2f5fb38..0dda8a406e5 100755 --- a/themes/Backend/ExtJs/backend/vote/store/vote.js +++ b/themes/Backend/ExtJs/backend/vote/store/vote.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Vote diff --git a/themes/Backend/ExtJs/backend/vote/view/detail/vote.js b/themes/Backend/ExtJs/backend/vote/view/detail/vote.js index 69bc5a369b6..6e409d6beaa 100755 --- a/themes/Backend/ExtJs/backend/vote/view/detail/vote.js +++ b/themes/Backend/ExtJs/backend/vote/view/detail/vote.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Vote diff --git a/themes/Backend/ExtJs/backend/vote/view/detail/window.js b/themes/Backend/ExtJs/backend/vote/view/detail/window.js index ba2360326a1..081e20d2bbf 100755 --- a/themes/Backend/ExtJs/backend/vote/view/detail/window.js +++ b/themes/Backend/ExtJs/backend/vote/view/detail/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Vote diff --git a/themes/Backend/ExtJs/backend/vote/view/list/extensions/filter.js b/themes/Backend/ExtJs/backend/vote/view/list/extensions/filter.js index 72e350f4126..66449140bbc 100644 --- a/themes/Backend/ExtJs/backend/vote/view/list/extensions/filter.js +++ b/themes/Backend/ExtJs/backend/vote/view/list/extensions/filter.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Vote diff --git a/themes/Backend/ExtJs/backend/vote/view/list/extensions/info.js b/themes/Backend/ExtJs/backend/vote/view/list/extensions/info.js index 389e6f712b3..5c3af3e401c 100644 --- a/themes/Backend/ExtJs/backend/vote/view/list/extensions/info.js +++ b/themes/Backend/ExtJs/backend/vote/view/list/extensions/info.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Vote diff --git a/themes/Backend/ExtJs/backend/vote/view/list/progress.js b/themes/Backend/ExtJs/backend/vote/view/list/progress.js index 5d6407176be..3fda9b615fa 100644 --- a/themes/Backend/ExtJs/backend/vote/view/list/progress.js +++ b/themes/Backend/ExtJs/backend/vote/view/list/progress.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Vote diff --git a/themes/Backend/ExtJs/backend/vote/view/list/vote.js b/themes/Backend/ExtJs/backend/vote/view/list/vote.js index 0a023f804a8..0a8e28c616c 100755 --- a/themes/Backend/ExtJs/backend/vote/view/list/vote.js +++ b/themes/Backend/ExtJs/backend/vote/view/list/vote.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Vote diff --git a/themes/Backend/ExtJs/backend/vote/view/list/window.js b/themes/Backend/ExtJs/backend/vote/view/list/window.js index 2683c6e872b..af27a688ff1 100755 --- a/themes/Backend/ExtJs/backend/vote/view/list/window.js +++ b/themes/Backend/ExtJs/backend/vote/view/list/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Vote diff --git a/themes/Backend/ExtJs/backend/vote/view/point_helper.js b/themes/Backend/ExtJs/backend/vote/view/point_helper.js index 1725ed389df..733b4410c65 100644 --- a/themes/Backend/ExtJs/backend/vote/view/point_helper.js +++ b/themes/Backend/ExtJs/backend/vote/view/point_helper.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Vote diff --git a/themes/Backend/ExtJs/backend/voucher/app.js b/themes/Backend/ExtJs/backend/voucher/app.js index e8e2cf0d23a..1ead7f3063d 100644 --- a/themes/Backend/ExtJs/backend/voucher/app.js +++ b/themes/Backend/ExtJs/backend/voucher/app.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Voucher diff --git a/themes/Backend/ExtJs/backend/voucher/controller/code.js b/themes/Backend/ExtJs/backend/voucher/controller/code.js index dccda460cd0..b5905b7f1fd 100644 --- a/themes/Backend/ExtJs/backend/voucher/controller/code.js +++ b/themes/Backend/ExtJs/backend/voucher/controller/code.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Voucher diff --git a/themes/Backend/ExtJs/backend/voucher/controller/main.js b/themes/Backend/ExtJs/backend/voucher/controller/main.js index ba69d6ae99a..a463dd054f2 100644 --- a/themes/Backend/ExtJs/backend/voucher/controller/main.js +++ b/themes/Backend/ExtJs/backend/voucher/controller/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Voucher diff --git a/themes/Backend/ExtJs/backend/voucher/controller/voucher.js b/themes/Backend/ExtJs/backend/voucher/controller/voucher.js index bee5270254a..7013911a698 100644 --- a/themes/Backend/ExtJs/backend/voucher/controller/voucher.js +++ b/themes/Backend/ExtJs/backend/voucher/controller/voucher.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Voucher diff --git a/themes/Backend/ExtJs/backend/voucher/model/code.js b/themes/Backend/ExtJs/backend/voucher/model/code.js index 6b61e14a1d7..7bb8471712a 100644 --- a/themes/Backend/ExtJs/backend/voucher/model/code.js +++ b/themes/Backend/ExtJs/backend/voucher/model/code.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Voucher diff --git a/themes/Backend/ExtJs/backend/voucher/model/detail.js b/themes/Backend/ExtJs/backend/voucher/model/detail.js index bb6d4b3f74d..00f997a56ef 100644 --- a/themes/Backend/ExtJs/backend/voucher/model/detail.js +++ b/themes/Backend/ExtJs/backend/voucher/model/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Voucher diff --git a/themes/Backend/ExtJs/backend/voucher/model/main.js b/themes/Backend/ExtJs/backend/voucher/model/main.js index ee944ba719d..6f1ea3edc1a 100644 --- a/themes/Backend/ExtJs/backend/voucher/model/main.js +++ b/themes/Backend/ExtJs/backend/voucher/model/main.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Voucher diff --git a/themes/Backend/ExtJs/backend/voucher/model/tax.js b/themes/Backend/ExtJs/backend/voucher/model/tax.js index 9be4e139e5b..de7c7900614 100644 --- a/themes/Backend/ExtJs/backend/voucher/model/tax.js +++ b/themes/Backend/ExtJs/backend/voucher/model/tax.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Voucher diff --git a/themes/Backend/ExtJs/backend/voucher/store/code.js b/themes/Backend/ExtJs/backend/voucher/store/code.js index 74a728c49a4..c355b7e2b73 100644 --- a/themes/Backend/ExtJs/backend/voucher/store/code.js +++ b/themes/Backend/ExtJs/backend/voucher/store/code.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Voucher diff --git a/themes/Backend/ExtJs/backend/voucher/store/detail.js b/themes/Backend/ExtJs/backend/voucher/store/detail.js index 3f3a5d3ed08..27b1b3a4820 100644 --- a/themes/Backend/ExtJs/backend/voucher/store/detail.js +++ b/themes/Backend/ExtJs/backend/voucher/store/detail.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Voucher diff --git a/themes/Backend/ExtJs/backend/voucher/store/list.js b/themes/Backend/ExtJs/backend/voucher/store/list.js index 43880e3b00c..c8aa266815a 100644 --- a/themes/Backend/ExtJs/backend/voucher/store/list.js +++ b/themes/Backend/ExtJs/backend/voucher/store/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Voucher diff --git a/themes/Backend/ExtJs/backend/voucher/store/tax.js b/themes/Backend/ExtJs/backend/voucher/store/tax.js index 3e5e36a475c..ae4e6ef2d8c 100644 --- a/themes/Backend/ExtJs/backend/voucher/store/tax.js +++ b/themes/Backend/ExtJs/backend/voucher/store/tax.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Voucher diff --git a/themes/Backend/ExtJs/backend/voucher/view/code/list.js b/themes/Backend/ExtJs/backend/voucher/view/code/list.js index 80a7cf33583..7153d445e64 100644 --- a/themes/Backend/ExtJs/backend/voucher/view/code/list.js +++ b/themes/Backend/ExtJs/backend/voucher/view/code/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Voucher diff --git a/themes/Backend/ExtJs/backend/voucher/view/code/progress.js b/themes/Backend/ExtJs/backend/voucher/view/code/progress.js index 0f05515314f..8e361cff714 100644 --- a/themes/Backend/ExtJs/backend/voucher/view/code/progress.js +++ b/themes/Backend/ExtJs/backend/voucher/view/code/progress.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Order diff --git a/themes/Backend/ExtJs/backend/voucher/view/main/window.js b/themes/Backend/ExtJs/backend/voucher/view/main/window.js index f8ccc56dffc..f06b096bf08 100644 --- a/themes/Backend/ExtJs/backend/voucher/view/main/window.js +++ b/themes/Backend/ExtJs/backend/voucher/view/main/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Voucher diff --git a/themes/Backend/ExtJs/backend/voucher/view/voucher/base_configuration.js b/themes/Backend/ExtJs/backend/voucher/view/voucher/base_configuration.js index fee4761c085..25581bc5c09 100644 --- a/themes/Backend/ExtJs/backend/voucher/view/voucher/base_configuration.js +++ b/themes/Backend/ExtJs/backend/voucher/view/voucher/base_configuration.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Voucher diff --git a/themes/Backend/ExtJs/backend/voucher/view/voucher/list.js b/themes/Backend/ExtJs/backend/voucher/view/voucher/list.js index a675584bf21..fd4e8927bd1 100644 --- a/themes/Backend/ExtJs/backend/voucher/view/voucher/list.js +++ b/themes/Backend/ExtJs/backend/voucher/view/voucher/list.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Voucher diff --git a/themes/Backend/ExtJs/backend/voucher/view/voucher/window.js b/themes/Backend/ExtJs/backend/voucher/view/voucher/window.js index d62c5b8f9df..89ccdba2c20 100644 --- a/themes/Backend/ExtJs/backend/voucher/view/voucher/window.js +++ b/themes/Backend/ExtJs/backend/voucher/view/voucher/window.js @@ -2,23 +2,22 @@ * Shopware 5 * Copyright (c) shopware AG * - * According to our dual licensing model, this program can be used either - * under the terms of the GNU Affero General Public License, version 3, - * or under a proprietary license. + * According to our licensing model, this program can be used + * under the terms of the GNU Affero General Public License, version 3. * * The texts of the GNU Affero General Public License with an additional - * permission and of our proprietary license can be found at and - * in the LICENSE file you have received along with this program. + * permission can be found at and in the LICENSE file you have received + * along with this program. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. * * "Shopware" is a registered trademark of shopware AG. * The licensing of the program under the AGPLv3 does not imply a - * trademark license. Therefore any rights, title and interest in - * our trademarks remain entirely with us. + * trademark license. Therefore, any rights, title and interest in + * our trademarks remain entirely with the shopware AG. * * @category Shopware * @package Voucher From e00f2e4e4556065d3045f3d3e3e70fb687a3b0db Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 7 Sep 2023 13:50:29 +0200 Subject: [PATCH 463/730] chore: Update PHPStan and its plugins --- composer.json | 8 +-- composer.lock | 72 +++++++++---------- .../Shopware/Controllers/Backend/Article.php | 4 +- .../Shopware/Models/Category/Repository.php | 2 +- .../Components/SepaPaymentMethod.php | 2 +- .../ContentTypeBundle/XmlReaderTest.php | 1 + 6 files changed, 44 insertions(+), 45 deletions(-) diff --git a/composer.json b/composer.json index f5e1f1630bf..11d8505aafd 100644 --- a/composer.json +++ b/composer.json @@ -113,13 +113,13 @@ "php-parallel-lint/php-var-dump-check": "^0.5", "phpspec/prophecy-phpunit": "^2.0", "phpstan/extension-installer": "1.3.1", - "phpstan/phpstan": "1.10.25", - "phpstan/phpstan-doctrine": "1.3.40", - "phpstan/phpstan-phpunit": "1.3.13", + "phpstan/phpstan": "1.10.33", + "phpstan/phpstan-doctrine": "1.3.43", + "phpstan/phpstan-phpunit": "1.3.14", "phpstan/phpstan-symfony": "1.3.2", "phpunit/phpunit": "^9.6", "sensiolabs/behat-page-object-extension": "2.3.7", - "staabm/phpstan-dba": "0.2.74", + "staabm/phpstan-dba": "0.2.75", "symfony/browser-kit": "~4.4.27", "symfony/dom-crawler": "~4.4.30" }, diff --git a/composer.lock b/composer.lock index 3b5d33cf433..d55dc1a84fb 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": "f4dfab328a0da35017a2056195de7422", + "content-hash": "c42fe5f11e2fb6f6ea0600d5847c7b05", "packages": [ { "name": "aws/aws-crt-php", @@ -8581,16 +8581,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.22.1", + "version": "1.23.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "65c39594fbd8c67abfc68bb323f86447bab79cc0" + "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/65c39594fbd8c67abfc68bb323f86447bab79cc0", - "reference": "65c39594fbd8c67abfc68bb323f86447bab79cc0", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/846ae76eef31c6d7790fac9bc399ecee45160b26", + "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26", "shasum": "" }, "require": { @@ -8622,22 +8622,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.22.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.23.1" }, - "time": "2023-06-29T20:46:06+00:00" + "time": "2023-08-03T16:32:59+00:00" }, { "name": "phpstan/phpstan", - "version": "1.10.25", + "version": "1.10.33", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "578f4e70d117f9a90699324c555922800ac38d8c" + "reference": "03b1cf9f814ba0863c4e9affea49a4d1ed9a2ed1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/578f4e70d117f9a90699324c555922800ac38d8c", - "reference": "578f4e70d117f9a90699324c555922800ac38d8c", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/03b1cf9f814ba0863c4e9affea49a4d1ed9a2ed1", + "reference": "03b1cf9f814ba0863c4e9affea49a4d1ed9a2ed1", "shasum": "" }, "require": { @@ -8686,20 +8686,20 @@ "type": "tidelift" } ], - "time": "2023-07-06T12:11:37+00:00" + "time": "2023-09-04T12:20:53+00:00" }, { "name": "phpstan/phpstan-doctrine", - "version": "1.3.40", + "version": "1.3.43", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-doctrine.git", - "reference": "f741919a720af6f84249abc62befeb15eee7bc88" + "reference": "c5015035755ad2d5013bd6bf98ff423ca6150822" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/f741919a720af6f84249abc62befeb15eee7bc88", - "reference": "f741919a720af6f84249abc62befeb15eee7bc88", + "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/c5015035755ad2d5013bd6bf98ff423ca6150822", + "reference": "c5015035755ad2d5013bd6bf98ff423ca6150822", "shasum": "" }, "require": { @@ -8727,8 +8727,8 @@ "nesbot/carbon": "^2.49", "nikic/php-parser": "^4.13.2", "php-parallel-lint/php-parallel-lint": "^1.2", - "phpstan/phpstan-phpunit": "^1.0", - "phpstan/phpstan-strict-rules": "^1.0", + "phpstan/phpstan-phpunit": "^1.3.13", + "phpstan/phpstan-strict-rules": "^1.5.1", "phpunit/phpunit": "^9.5.10", "ramsey/uuid-doctrine": "^1.5.0", "symfony/cache": "^4.4.35" @@ -8754,22 +8754,22 @@ "description": "Doctrine extensions for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-doctrine/issues", - "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.40" + "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.43" }, - "time": "2023-05-11T11:26:04+00:00" + "time": "2023-09-01T15:01:13+00:00" }, { "name": "phpstan/phpstan-phpunit", - "version": "1.3.13", + "version": "1.3.14", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-phpunit.git", - "reference": "d8bdab0218c5eb0964338d24a8511b65e9c94fa5" + "reference": "614acc10c522e319639bf38b0698a4a566665f04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/d8bdab0218c5eb0964338d24a8511b65e9c94fa5", - "reference": "d8bdab0218c5eb0964338d24a8511b65e9c94fa5", + "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/614acc10c522e319639bf38b0698a4a566665f04", + "reference": "614acc10c522e319639bf38b0698a4a566665f04", "shasum": "" }, "require": { @@ -8782,7 +8782,7 @@ "require-dev": { "nikic/php-parser": "^4.13.0", "php-parallel-lint/php-parallel-lint": "^1.2", - "phpstan/phpstan-strict-rules": "^1.0", + "phpstan/phpstan-strict-rules": "^1.5.1", "phpunit/phpunit": "^9.5" }, "type": "phpstan-extension", @@ -8806,9 +8806,9 @@ "description": "PHPUnit extensions and rules for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-phpunit/issues", - "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.13" + "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.14" }, - "time": "2023-05-26T11:05:59+00:00" + "time": "2023-08-25T09:46:39+00:00" }, { "name": "phpstan/phpstan-symfony", @@ -10344,16 +10344,16 @@ }, { "name": "staabm/phpstan-dba", - "version": "0.2.74", + "version": "0.2.75", "source": { "type": "git", "url": "https://github.com/staabm/phpstan-dba.git", - "reference": "1bd0de3d457e3a49218e9eb3182ceefcd6b1b4b9" + "reference": "812b436d601c007e07cba93985a4bc87eccf6be0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/staabm/phpstan-dba/zipball/1bd0de3d457e3a49218e9eb3182ceefcd6b1b4b9", - "reference": "1bd0de3d457e3a49218e9eb3182ceefcd6b1b4b9", + "url": "https://api.github.com/repos/staabm/phpstan-dba/zipball/812b436d601c007e07cba93985a4bc87eccf6be0", + "reference": "812b436d601c007e07cba93985a4bc87eccf6be0", "shasum": "" }, "require": { @@ -10376,8 +10376,8 @@ "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-strict-rules": "^1.1", "phpunit/phpunit": "^8.5|^9.5", - "symplify/easy-coding-standard": "^11.3", - "tomasvotruba/unused-public": "^0.1.10", + "symplify/easy-coding-standard": "^11.4", + "tomasvotruba/unused-public": "^0.2.0", "vlucas/phpdotenv": "^5.4" }, "type": "phpstan-extension", @@ -10407,9 +10407,9 @@ ], "support": { "issues": "https://github.com/staabm/phpstan-dba/issues", - "source": "https://github.com/staabm/phpstan-dba/tree/0.2.74" + "source": "https://github.com/staabm/phpstan-dba/tree/0.2.75" }, - "time": "2023-06-27T13:58:51+00:00" + "time": "2023-07-30T09:15:23+00:00" }, { "name": "symfony/browser-kit", @@ -10926,5 +10926,5 @@ "composer-runtime-api": "^2.0" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/engine/Shopware/Controllers/Backend/Article.php b/engine/Shopware/Controllers/Backend/Article.php index 56adc272a27..2de95b6646b 100644 --- a/engine/Shopware/Controllers/Backend/Article.php +++ b/engine/Shopware/Controllers/Backend/Article.php @@ -1835,9 +1835,7 @@ public function deleteUnusedSerialsAction() */ public function getFreeSerialCount($esdId) { - $query = $this->getRepository()->getFreeSerialsCountByEsdQuery($esdId); - - return $query->getSingleScalarResult(); + return (int) $this->getRepository()->getFreeSerialsCountByEsdQuery($esdId)->getSingleScalarResult(); } /** diff --git a/engine/Shopware/Models/Category/Repository.php b/engine/Shopware/Models/Category/Repository.php index 66d0918bc87..ea627cb1432 100644 --- a/engine/Shopware/Models/Category/Repository.php +++ b/engine/Shopware/Models/Category/Repository.php @@ -470,7 +470,7 @@ public function getChildrenCountList($id) $builder = $this->getCategoriesByParentBuilder($id); $builder->select('COUNT(categories) as categoriesCount'); - return $builder->getQuery()->getSingleScalarResult(); + return (int) $builder->getQuery()->getSingleScalarResult(); } /** diff --git a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php index 3610f527800..e04a6249b39 100644 --- a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php +++ b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php @@ -264,7 +264,7 @@ private function sendSepaEmail(string $orderNumber, int $userId, array $data): v ], ]); - $customerEmail = Shopware()->Models()->createQueryBuilder() + $customerEmail = (string) Shopware()->Models()->createQueryBuilder() ->select('customer.email') ->from(Customer::class, 'customer') ->where('customer.id = ?1') diff --git a/tests/Unit/Bundle/ContentTypeBundle/XmlReaderTest.php b/tests/Unit/Bundle/ContentTypeBundle/XmlReaderTest.php index 08badf5c004..554feb44b7d 100644 --- a/tests/Unit/Bundle/ContentTypeBundle/XmlReaderTest.php +++ b/tests/Unit/Bundle/ContentTypeBundle/XmlReaderTest.php @@ -49,6 +49,7 @@ public function testReadValidXml(): void static::assertArrayHasKey('store', $data); $store = $data['store']; + static::assertIsArray($store); // Minimum required fields static::assertArrayHasKey('name', $store); From 382a8135058bb24fc073b40190e743222ac08482 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 7 Sep 2023 14:28:37 +0200 Subject: [PATCH 464/730] chore: Update CS fixer --- .../Enlight/Components/Cron/Adapter/DBAL.php | 5 +- .../Enlight/Components/Cron/Manager.php | 4 - .../Enlight/Config/Writer/FileAbstract.php | 5 +- engine/Library/Enlight/Controller/Action.php | 6 - .../Library/Enlight/Event/Handler/Plugin.php | 1 + engine/Library/Enlight/View/Default.php | 2 - .../Repository/Searcher/GenericSearcher.php | 1 - .../Exception/StoreException.php | 7 +- .../Service/InstallerService.php | 4 - .../PluginInstallerBundle/StoreClient.php | 1 - .../FacetResult/MediaListItem.php | 1 - .../Gateway/DBAL/VariantMediaGateway.php | 3 - .../StoreFrontBundle/Struct/ListProduct.php | 6 - .../Commands/StoreDownloadCommand.php | 28 +- .../Components/Api/Resource/Cache.php | 2 - .../Components/Api/Resource/Country.php | 2 - .../DependencyInjection/Bridge/Config.php | 3 +- .../HttpClient/RequestException.php | 7 +- .../Components/Model/LazyFetchModelEntity.php | 5 +- .../Components/Model/ModelManager.php | 2 - .../Shopware/Components/Plugin/Namespace.php | 1 - .../Shopware/Components/Theme/Generator.php | 4 - .../Shopware/Components/Theme/Installer.php | 2 - .../Components/Theme/JavascriptDefinition.php | 3 - engine/Shopware/Components/Theme/Service.php | 3 - .../Shopware/Controllers/Backend/Article.php | 1 + .../Shopware/Controllers/Backend/Banner.php | 1 + .../Controllers/Backend/MediaManager.php | 2 - .../Shopware/Controllers/Backend/Partner.php | 1 + engine/Shopware/Core/sArticles.php | 1 - engine/Shopware/Core/sOrder.php | 2 - engine/Shopware/Core/sRewriteTable.php | 21 +- engine/Shopware/Models/Emotion/Emotion.php | 3 - engine/Shopware/Models/Form/Form.php | 42 +- .../Components/Steps/ErrorResult.php | 5 +- .../Default/Core/HttpCache/Bootstrap.php | 2 - recovery/update/src/Steps/ErrorResult.php | 5 +- vendor-bin/cs-fixer/composer.json | 4 +- vendor-bin/cs-fixer/composer.lock | 455 ++++-------------- 39 files changed, 163 insertions(+), 490 deletions(-) diff --git a/engine/Library/Enlight/Components/Cron/Adapter/DBAL.php b/engine/Library/Enlight/Components/Cron/Adapter/DBAL.php index d8a96ed0f43..819397c7d37 100644 --- a/engine/Library/Enlight/Components/Cron/Adapter/DBAL.php +++ b/engine/Library/Enlight/Components/Cron/Adapter/DBAL.php @@ -49,10 +49,7 @@ class Enlight_Components_Cron_Adapter_DBAL implements Enlight_Components_Cron_Ad */ private $overdueJobsList; - /** - * @param Connection $connection - */ - public function __construct(Doctrine\DBAL\Connection $connection) + public function __construct(Connection $connection) { $this->connection = $connection; } diff --git a/engine/Library/Enlight/Components/Cron/Manager.php b/engine/Library/Enlight/Components/Cron/Manager.php index 17709d1263d..0df8ac60065 100644 --- a/engine/Library/Enlight/Components/Cron/Manager.php +++ b/engine/Library/Enlight/Components/Cron/Manager.php @@ -116,8 +116,6 @@ public function disableJob(Enlight_Components_Cron_Job $job) /** * Deactivate a given Cron Job * - * @param \Enlight_Components_Cron_Job $job - * * @throws Enlight_Exception * * @return Enlight_Components_Cron_Manager @@ -132,8 +130,6 @@ public function deleteJob(Enlight_Components_Cron_Job $job) /** * Updates a cron job * - * @param \Enlight_Components_Cron_Job $job - * * @throws Enlight_Exception * * @return Enlight_Components_Cron_Manager diff --git a/engine/Library/Enlight/Config/Writer/FileAbstract.php b/engine/Library/Enlight/Config/Writer/FileAbstract.php index 13497ff48c3..3ac866343e4 100644 --- a/engine/Library/Enlight/Config/Writer/FileAbstract.php +++ b/engine/Library/Enlight/Config/Writer/FileAbstract.php @@ -80,9 +80,8 @@ public function setExclusiveLock($exclusiveLock) /** * Write configuration to file. * - * @param string $filename - * @param Enlight_Config $config - * @param bool $exclusiveLock + * @param string $filename + * @param bool $exclusiveLock * * @return void */ diff --git a/engine/Library/Enlight/Controller/Action.php b/engine/Library/Enlight/Controller/Action.php index 4a17c414778..c942b5278c3 100644 --- a/engine/Library/Enlight/Controller/Action.php +++ b/engine/Library/Enlight/Controller/Action.php @@ -238,7 +238,6 @@ public function dispatch($action) * @param string $action * @param string $controller * @param string $module - * @param array $params */ public function forward($action, $controller = null, $module = null, ?array $params = null) { @@ -294,9 +293,6 @@ public function setView(Enlight_View $view) return $this; } - /** - * @param Container $loader - */ public function setContainer(?Container $loader = null) { $this->container = $loader; @@ -305,8 +301,6 @@ public function setContainer(?Container $loader = null) /** * Set front instance * - * @param Enlight_Controller_Front $front - * * @throws Exception * * @return Enlight_Controller_Action diff --git a/engine/Library/Enlight/Event/Handler/Plugin.php b/engine/Library/Enlight/Event/Handler/Plugin.php index 9d5046fb2c9..f279e7e3b82 100644 --- a/engine/Library/Enlight/Event/Handler/Plugin.php +++ b/engine/Library/Enlight/Event/Handler/Plugin.php @@ -159,6 +159,7 @@ public function execute(Enlight_Event_EventArgs $args) if ($plugin === null || !method_exists($plugin, $this->listener)) { $name = $this->plugin instanceof Enlight_Plugin_Bootstrap ? $this->plugin->getName() : $this->plugin; trigger_error('Listener "' . $this->listener . '" in "' . $name . '" is not callable.', E_USER_ERROR); + // throw new Enlight_Exception('Listener "' . $this->listener . '" in "' . $name . '" is not callable.'); return; } diff --git a/engine/Library/Enlight/View/Default.php b/engine/Library/Enlight/View/Default.php index 5af6899e33d..c136b20d6a8 100644 --- a/engine/Library/Enlight/View/Default.php +++ b/engine/Library/Enlight/View/Default.php @@ -124,8 +124,6 @@ public function addTemplateDir($templateDir, $key = null) /** * Sets the current template instance into the internal property. * - * @param Enlight_Template_Default $template - * * @return Enlight_View_Default */ public function setTemplate(?Enlight_Template_Default $template = null) diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/GenericSearcher.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/GenericSearcher.php index df905ed2736..c393b5d3515 100644 --- a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/GenericSearcher.php +++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/GenericSearcher.php @@ -50,7 +50,6 @@ class GenericSearcher implements SearcherInterface /** * @param class-string $entity - * @param SearchBuilder $searchBuilder */ public function __construct($entity, ModelManager $entityManager, ?SearchBuilder $searchBuilder = null) { diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/StoreException.php b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/StoreException.php index d358f73779c..811bfead6c2 100644 --- a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/StoreException.php +++ b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/StoreException.php @@ -34,10 +34,9 @@ class StoreException extends RuntimeException private $sbpCode; /** - * @param string $sbpCode - * @param string $message - * @param int $code - * @param Exception $previous + * @param string $sbpCode + * @param string $message + * @param int $code */ public function __construct( $sbpCode, diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/InstallerService.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/InstallerService.php index b5844be1030..046af8dc7e9 100644 --- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/InstallerService.php +++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/InstallerService.php @@ -261,8 +261,6 @@ public function deactivatePlugin(Plugin $plugin) } /** - * @param Shop $shop - * * @return array */ public function getPluginConfig(Plugin $plugin, ?Shop $shop = null) @@ -272,7 +270,6 @@ public function getPluginConfig(Plugin $plugin, ?Shop $shop = null) /** * @param array $elements - * @param Shop $shop */ public function savePluginConfig(Plugin $plugin, $elements, ?Shop $shop = null) { @@ -286,7 +283,6 @@ public function savePluginConfig(Plugin $plugin, $elements, ?Shop $shop = null) /** * @param string $name - * @param Shop $shop * * @throws Exception */ diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/StoreClient.php b/engine/Shopware/Bundle/PluginInstallerBundle/StoreClient.php index 73a43efa4e1..c98c8d0201f 100644 --- a/engine/Shopware/Bundle/PluginInstallerBundle/StoreClient.php +++ b/engine/Shopware/Bundle/PluginInstallerBundle/StoreClient.php @@ -314,7 +314,6 @@ private function getRequest(string $resource, array $params, array $headers = [] /** * @param array $params * @param array $headers - * @param AccessTokenStruct $token * * @throws StoreException * @throws Exception diff --git a/engine/Shopware/Bundle/SearchBundle/FacetResult/MediaListItem.php b/engine/Shopware/Bundle/SearchBundle/FacetResult/MediaListItem.php index 3e2297ab389..19835bc5c3e 100644 --- a/engine/Shopware/Bundle/SearchBundle/FacetResult/MediaListItem.php +++ b/engine/Shopware/Bundle/SearchBundle/FacetResult/MediaListItem.php @@ -37,7 +37,6 @@ class MediaListItem extends ValueListItem * @param int|string $id * @param string $label * @param bool $active - * @param Media $media * @param Attribute[] $attributes */ public function __construct($id, $label, $active, ?Media $media = null, $attributes = []) diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/VariantMediaGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/VariantMediaGateway.php index 075048f9f23..fc7eac67329 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/VariantMediaGateway.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/VariantMediaGateway.php @@ -37,9 +37,6 @@ class VariantMediaGateway implements VariantMediaGatewayInterface private FieldHelper $fieldHelper; - /** - * @var Hydrator\MediaHydrator - */ private MediaHydrator $hydrator; public function __construct( diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/ListProduct.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/ListProduct.php index 9eb08f2bd45..c04382285b0 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/ListProduct.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/ListProduct.php @@ -867,9 +867,6 @@ public function getPriceGroup() return $this->priceGroup; } - /** - * @param PriceGroup $priceGroup - */ public function setPriceGroup(?PriceGroup $priceGroup = null) { $this->priceGroup = $priceGroup; @@ -1011,9 +1008,6 @@ public function getEsd() return $this->esd; } - /** - * @param Esd $esd - */ public function setEsd(?Esd $esd = null) { $this->esd = $esd; diff --git a/engine/Shopware/Commands/StoreDownloadCommand.php b/engine/Shopware/Commands/StoreDownloadCommand.php index c5fdf9b28d9..75c238d9192 100644 --- a/engine/Shopware/Commands/StoreDownloadCommand.php +++ b/engine/Shopware/Commands/StoreDownloadCommand.php @@ -29,11 +29,13 @@ use Shopware\Bundle\PluginInstallerBundle\Context\LicenceRequest; use Shopware\Bundle\PluginInstallerBundle\Context\PluginsByTechnicalNameRequest; use Shopware\Bundle\PluginInstallerBundle\Exception\StoreException; +use Shopware\Bundle\PluginInstallerBundle\Service\InstallerService; use Shopware\Bundle\PluginInstallerBundle\Service\PluginStoreService; use Shopware\Bundle\PluginInstallerBundle\StoreClient; use Shopware\Bundle\PluginInstallerBundle\Struct\AccessTokenStruct; use Shopware\Bundle\PluginInstallerBundle\Struct\LicenceStruct; use Shopware\Bundle\PluginInstallerBundle\Struct\PluginStruct; +use Shopware\Components\Model\ModelManager; use Shopware\Models\Plugin\Plugin; use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface; use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext; @@ -76,7 +78,7 @@ public function completeArgumentValues($argumentName, CompletionContext $context $context = new LicenceRequest('en_GB', $this->getVersionFromArguments($context->getWords()), $this->getDomainFromArguments($context->getWords()), $token); /** @var PluginStoreService $pluginStoreService */ - $pluginStoreService = $this->container->get(\Shopware\Bundle\PluginInstallerBundle\Service\PluginStoreService::class); + $pluginStoreService = $this->container->get(PluginStoreService::class); return array_map(function (LicenceStruct $licence) { return $licence->getTechnicalName(); @@ -136,7 +138,7 @@ protected function execute(InputInterface $input, OutputInterface $output) try { /** @var PluginStoreService $pluginStoreService */ - $pluginStoreService = $this->container->get(\Shopware\Bundle\PluginInstallerBundle\Service\PluginStoreService::class); + $pluginStoreService = $this->container->get(PluginStoreService::class); $licences = $pluginStoreService->getLicences($context); $licences = array_filter( $licences, @@ -192,7 +194,7 @@ function (LicenceStruct $license) use ($technicalName) { try { $this->clearOpcodeCache(); - $this->container->get(\Shopware\Bundle\PluginInstallerBundle\Service\InstallerService::class)->refreshPluginList(); + $this->container->get(InstallerService::class)->refreshPluginList(); $this->io->success('Process completed successfully.'); } catch (Exception $e) { @@ -221,7 +223,7 @@ private function handleDummyUpdate(PluginStruct $plugin, $domain, $version) $model = $this->getPluginModel($plugin->getTechnicalName()); if ($plugin->isActive()) { - $this->container->get(\Shopware\Bundle\PluginInstallerBundle\Service\InstallerService::class)->deactivatePlugin($model); + $this->container->get(InstallerService::class)->deactivatePlugin($model); } $this->container->get('shopware_plugininstaller.plugin_download_service') @@ -244,9 +246,8 @@ private function handleDummyInstall(PluginStruct $plugin, $domain, $version) } /** - * @param string $domain - * @param string $version - * @param AccessTokenStruct $token + * @param string $domain + * @param string $version * * @throws Exception */ @@ -262,7 +263,7 @@ private function handleLicenceUpdate(PluginStruct $plugin, $domain, $version, ?A $model = $this->getPluginModel($plugin->getTechnicalName()); if ($plugin->isActive()) { - $this->container->get(\Shopware\Bundle\PluginInstallerBundle\Service\InstallerService::class) + $this->container->get(InstallerService::class) ->deactivatePlugin($model); } @@ -272,9 +273,8 @@ private function handleLicenceUpdate(PluginStruct $plugin, $domain, $version, ?A } /** - * @param string $domain - * @param string $version - * @param AccessTokenStruct $token + * @param string $domain + * @param string $version */ private function handleLicenceInstall(PluginStruct $plugin, $domain, $version, ?AccessTokenStruct $token = null) { @@ -292,7 +292,7 @@ private function handleLicenceInstall(PluginStruct $plugin, $domain, $version, ? */ private function getPluginModel($technicalName) { - $repo = $this->container->get(\Shopware\Components\Model\ModelManager::class)->getRepository(Plugin::class); + $repo = $this->container->get(ModelManager::class)->getRepository(Plugin::class); return $repo->findOneBy(['name' => $technicalName]); } @@ -343,7 +343,7 @@ private function checkAuthentication(): AccessTokenStruct $this->io->comment('Connection to store...'); /** @var StoreClient $storeClient */ - $storeClient = $this->container->get(\Shopware\Bundle\PluginInstallerBundle\StoreClient::class); + $storeClient = $this->container->get(StoreClient::class); $token = $storeClient->getAccessToken($username, $password); $this->io->comment('Authenticated successfully.'); @@ -467,7 +467,7 @@ private function getAuthenticationFromArguments(array $arguments) try { /** @var StoreClient $storeClient */ - $storeClient = $this->container->get(\Shopware\Bundle\PluginInstallerBundle\StoreClient::class); + $storeClient = $this->container->get(StoreClient::class); return $storeClient->getAccessToken($username, $password); } catch (Exception $e) { diff --git a/engine/Shopware/Components/Api/Resource/Cache.php b/engine/Shopware/Components/Api/Resource/Cache.php index d10bfdcfe9e..374666ea53e 100644 --- a/engine/Shopware/Components/Api/Resource/Cache.php +++ b/engine/Shopware/Components/Api/Resource/Cache.php @@ -59,8 +59,6 @@ class Cache extends Resource implements BatchInterface /** * Sets the Container. - * - * @param Container $container */ public function setContainer(?Container $container = null) { diff --git a/engine/Shopware/Components/Api/Resource/Country.php b/engine/Shopware/Components/Api/Resource/Country.php index 1adcbe3889a..b93d89ea215 100644 --- a/engine/Shopware/Components/Api/Resource/Country.php +++ b/engine/Shopware/Components/Api/Resource/Country.php @@ -213,8 +213,6 @@ public function delete($id) } /** - * @param CountryModel $country - * * @throws ParameterMissingException * @throws NotFoundException * @throws CustomValidationException diff --git a/engine/Shopware/Components/DependencyInjection/Bridge/Config.php b/engine/Shopware/Components/DependencyInjection/Bridge/Config.php index 5e4cdc0dafb..59c1777e694 100644 --- a/engine/Shopware/Components/DependencyInjection/Bridge/Config.php +++ b/engine/Shopware/Components/DependencyInjection/Bridge/Config.php @@ -31,8 +31,7 @@ class Config { /** - * @param Connection $db - * @param array $config + * @param array $config * * @return Shopware_Components_Config|null */ diff --git a/engine/Shopware/Components/HttpClient/RequestException.php b/engine/Shopware/Components/HttpClient/RequestException.php index 908a451cbf4..6cfcc415e25 100644 --- a/engine/Shopware/Components/HttpClient/RequestException.php +++ b/engine/Shopware/Components/HttpClient/RequestException.php @@ -33,10 +33,9 @@ class RequestException extends Exception private $body; /** - * @param string $message - * @param int $code - * @param Exception $previous - * @param string $body + * @param string $message + * @param int $code + * @param string $body */ public function __construct($message = '', $code = 0, ?Exception $previous = null, $body = null) { diff --git a/engine/Shopware/Components/Model/LazyFetchModelEntity.php b/engine/Shopware/Components/Model/LazyFetchModelEntity.php index 4391ef57ce2..773e9e63904 100644 --- a/engine/Shopware/Components/Model/LazyFetchModelEntity.php +++ b/engine/Shopware/Components/Model/LazyFetchModelEntity.php @@ -57,9 +57,8 @@ public function isProxy($object) /** * @template TModel of object * - * @param TModel|null $object - * @param array $condition - * @param EntityManagerInterface $em + * @param TModel|null $object + * @param array $condition * * @throws Exception * diff --git a/engine/Shopware/Components/Model/ModelManager.php b/engine/Shopware/Components/Model/ModelManager.php index 7e320a411c7..61611de7107 100644 --- a/engine/Shopware/Components/Model/ModelManager.php +++ b/engine/Shopware/Components/Model/ModelManager.php @@ -73,8 +73,6 @@ public function __construct( /** * Factory method to create EntityManager instances. * - * @param EventManager $eventManager - * * @throws ORMException * * @return ModelManager diff --git a/engine/Shopware/Components/Plugin/Namespace.php b/engine/Shopware/Components/Plugin/Namespace.php index 17e811f855c..f0a428ffdd7 100644 --- a/engine/Shopware/Components/Plugin/Namespace.php +++ b/engine/Shopware/Components/Plugin/Namespace.php @@ -151,7 +151,6 @@ public function initPlugin($name, $config) * Registers a plugin in the collection. * * @param Enlight_Plugin_Bootstrap|Shopware_Components_Plugin_Bootstrap $plugin - * @param DateTimeInterface $refreshDate * * @return Enlight_Plugin_PluginManager|Shopware_Components_Plugin_Namespace */ diff --git a/engine/Shopware/Components/Theme/Generator.php b/engine/Shopware/Components/Theme/Generator.php index d0784b6e29f..336646067bc 100644 --- a/engine/Shopware/Components/Theme/Generator.php +++ b/engine/Shopware/Components/Theme/Generator.php @@ -189,8 +189,6 @@ public function __construct(PathResolver $pathResolver, Filesystem $fileSystem, * Function which generates a new shopware theme * into the engine/Shopware/Themes directory. * - * @param Template $parent - * * @throws Exception */ public function generateTheme(array $data, ?Template $parent = null) @@ -272,8 +270,6 @@ private function getThemeDirectory($name) /** * Generates the Theme.php file for the theme. - * - * @param Template $parent */ private function generateThemePhp(array $data, ?Template $parent = null) { diff --git a/engine/Shopware/Components/Theme/Installer.php b/engine/Shopware/Components/Theme/Installer.php index 8bc141d9f7a..958baafab4a 100644 --- a/engine/Shopware/Components/Theme/Installer.php +++ b/engine/Shopware/Components/Theme/Installer.php @@ -162,8 +162,6 @@ private function synchronizeThemes() * Helper function which iterates the engine\Shopware\Themes directory * and registers all stored themes within the directory as \Shopware\Models\Shop\Template. * - * @param \Shopware\Models\Plugin\Plugin $plugin - * * @throws \Doctrine\ORM\OptimisticLockException * @throws \Doctrine\ORM\ORMInvalidArgumentException * diff --git a/engine/Shopware/Components/Theme/JavascriptDefinition.php b/engine/Shopware/Components/Theme/JavascriptDefinition.php index 130dbb508dd..57fbcdee838 100644 --- a/engine/Shopware/Components/Theme/JavascriptDefinition.php +++ b/engine/Shopware/Components/Theme/JavascriptDefinition.php @@ -40,9 +40,6 @@ class JavascriptDefinition * @var Theme */ private $theme; - /** - * @param Theme $theme - */ public function __construct(array $files = [], ?Theme $theme = null) { $this->files = $files; diff --git a/engine/Shopware/Components/Theme/Service.php b/engine/Shopware/Components/Theme/Service.php index 0db7e088acb..26ae534ad24 100644 --- a/engine/Shopware/Components/Theme/Service.php +++ b/engine/Shopware/Components/Theme/Service.php @@ -122,8 +122,6 @@ public function saveSystemConfiguration($data) * If a shop instance passed, the function selects additionally the * element values of the passed shop. * - * @param Shop $shop - * * @return array */ public function getLayout(Template $template, ?Shop $shop = null) @@ -148,7 +146,6 @@ public function getLayout(Template $template, ?Shop $shop = null) * will also be returned. * If provided, only option in $optionNames will be returned * - * @param Shop $shop * @param array $optionNames * * @return array diff --git a/engine/Shopware/Controllers/Backend/Article.php b/engine/Shopware/Controllers/Backend/Article.php index 2de95b6646b..0a21a9d1109 100644 --- a/engine/Shopware/Controllers/Backend/Article.php +++ b/engine/Shopware/Controllers/Backend/Article.php @@ -4352,6 +4352,7 @@ protected function interpretNumberSyntax(Product $article, ProductVariant $detai $name[] = $counter; } } + // Return all command results, concat with a dot return implode('.', $name); } diff --git a/engine/Shopware/Controllers/Backend/Banner.php b/engine/Shopware/Controllers/Backend/Banner.php index 9637068d782..c8e320478e3 100644 --- a/engine/Shopware/Controllers/Backend/Banner.php +++ b/engine/Shopware/Controllers/Backend/Banner.php @@ -348,6 +348,7 @@ private function prepareDateAndTime($date, $time) } $datePart = new DateTime($date); $timePart = new DateTime($time); + // Fill the timePart with the datePart return $timePart->setDate((int) $datePart->format('Y'), (int) $datePart->format('m'), (int) $datePart->format('d')); } diff --git a/engine/Shopware/Controllers/Backend/MediaManager.php b/engine/Shopware/Controllers/Backend/MediaManager.php index 6843818bbd3..d3f35a7087b 100644 --- a/engine/Shopware/Controllers/Backend/MediaManager.php +++ b/engine/Shopware/Controllers/Backend/MediaManager.php @@ -1100,8 +1100,6 @@ private function getAlbumNodeProperties(Album $album): array /** * @throws NonUniqueResultException - * - * @return Settings */ private function getAlbumSettings(int $albumId): ?Settings { diff --git a/engine/Shopware/Controllers/Backend/Partner.php b/engine/Shopware/Controllers/Backend/Partner.php index c35638a8a41..b0087d93752 100644 --- a/engine/Shopware/Controllers/Backend/Partner.php +++ b/engine/Shopware/Controllers/Backend/Partner.php @@ -401,6 +401,7 @@ private function getToDate(): DateTime } else { $toDate = new DateTime($toDate); } + // To get the right value cause 2012-02-02 is smaller than 2012-02-02 15:33:12 return $toDate->add(new DateInterval('P1D')); } diff --git a/engine/Shopware/Core/sArticles.php b/engine/Shopware/Core/sArticles.php index f6ce57b6161..cd62667bb09 100644 --- a/engine/Shopware/Core/sArticles.php +++ b/engine/Shopware/Core/sArticles.php @@ -415,7 +415,6 @@ public function sGetArticlesBySupplier($supplierID = null) /** * @param int|null $categoryId - * @param Criteria $criteria * * @throws Enlight_Exception * diff --git a/engine/Shopware/Core/sOrder.php b/engine/Shopware/Core/sOrder.php index e7bc835fb04..3abfe12022e 100644 --- a/engine/Shopware/Core/sOrder.php +++ b/engine/Shopware/Core/sOrder.php @@ -239,8 +239,6 @@ class sOrder implements Enlight_Hook /** * Injects all dependencies which are required for this class. * - * @param ContextServiceInterface $contextService - * * @throws Exception */ public function __construct( diff --git a/engine/Shopware/Core/sRewriteTable.php b/engine/Shopware/Core/sRewriteTable.php index 7f44c3a72cd..d3e3be895bd 100644 --- a/engine/Shopware/Core/sRewriteTable.php +++ b/engine/Shopware/Core/sRewriteTable.php @@ -133,17 +133,6 @@ class sRewriteTable implements Enlight_Hook private $translationComponent; /** - * @param Enlight_Components_Db_Adapter_Pdo_Mysql $db - * @param Shopware_Components_Config $config - * @param ModelManager $modelManager - * @param sSystem $systemModule - * @param Enlight_Template_Manager $template - * @param Shopware_Components_Modules $moduleManager - * @param SlugInterface $slug - * @param ContextServiceInterface $contextService - * @param ShopPageServiceInterface $shopPageService - * @param Shopware_Components_Translation $translationComponent - * * @throws Exception */ public function __construct( @@ -991,9 +980,8 @@ private function sCategoryPathByProductId($productId, $parentId = null) /** * Generates and inserts the form seo urls * - * @param int $offset - * @param int $limit - * @param ShopContextInterface $context + * @param int $offset + * @param int $limit * * @throws Exception */ @@ -1043,9 +1031,8 @@ private function insertFormUrls($offset, $limit, ?ShopContextInterface $context /** * Generates and inserts static page urls * - * @param int $offset - * @param int $limit - * @param ShopContextInterface $context + * @param int $offset + * @param int $limit * * @throws Exception * @throws SmartyException diff --git a/engine/Shopware/Models/Emotion/Emotion.php b/engine/Shopware/Models/Emotion/Emotion.php index 61774b308f8..a04d3d7312d 100644 --- a/engine/Shopware/Models/Emotion/Emotion.php +++ b/engine/Shopware/Models/Emotion/Emotion.php @@ -739,9 +739,6 @@ public function getTemplate() return $this->template; } - /** - * @param Template $template - */ public function setTemplate(?Template $template = null) { $this->template = $template; diff --git a/engine/Shopware/Models/Form/Form.php b/engine/Shopware/Models/Form/Form.php index 61bcfd29051..2fca22dc4f2 100644 --- a/engine/Shopware/Models/Form/Form.php +++ b/engine/Shopware/Models/Form/Form.php @@ -23,8 +23,10 @@ namespace Shopware\Models\Form; +use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\Mapping as ORM; use Shopware\Components\Model\ModelEntity; +use Shopware\Models\Attribute\Form as FormAttribute; /** * Shopware field model represents a single form @@ -51,7 +53,7 @@ class Form extends ModelEntity /** * INVERSE SIDE * - * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Form\Field> + * @var ArrayCollection * * @ORM\OneToMany(targetEntity="Shopware\Models\Form\Field", mappedBy="form", orphanRemoval=true, cascade={"persist"}) */ @@ -60,7 +62,7 @@ class Form extends ModelEntity /** * INVERSE SIDE * - * @var \Shopware\Models\Attribute\Form|null + * @var FormAttribute|null * * @ORM\OneToOne(targetEntity="Shopware\Models\Attribute\Form", mappedBy="form", orphanRemoval=true, cascade={"persist"}) */ @@ -168,13 +170,13 @@ class Form extends ModelEntity public function __construct() { - $this->fields = new \Doctrine\Common\Collections\ArrayCollection(); + $this->fields = new ArrayCollection(); } /** * Returns a clone of this form incl. it's fields * - * @return \Shopware\Models\Form\Form + * @return Form */ public function getClone() { @@ -192,7 +194,7 @@ public function getClone() } /** - * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Form\Field> + * @return ArrayCollection */ public function getFields() { @@ -200,21 +202,19 @@ public function getFields() } /** - * @param \Shopware\Models\Form\Field[]|null $fields + * @param Field[]|null $fields * * @return Form */ public function setFields($fields) { - return $this->setOneToMany($fields, \Shopware\Models\Form\Field::class, 'fields', 'form'); + return $this->setOneToMany($fields, Field::class, 'fields', 'form'); } /** * Adds a field * - * @param \Shopware\Models\Form\Field $field - * - * @return \Shopware\Models\Form\Form + * @return Form */ public function addField(Field $field) { @@ -263,7 +263,7 @@ public function getName() /** * @param string $name * - * @return \Shopware\Models\Form\Form + * @return Form */ public function setName($name) { @@ -275,7 +275,7 @@ public function setName($name) /** * @param string $text * - * @return \Shopware\Models\Form\Form + * @return Form */ public function setText($text) { @@ -295,7 +295,7 @@ public function getText() /** * @param string $email * - * @return \Shopware\Models\Form\Form + * @return Form */ public function setEmail($email) { @@ -315,7 +315,7 @@ public function getEmail() /** * @param string $emailTemplate * - * @return \Shopware\Models\Form\Form + * @return Form */ public function setEmailTemplate($emailTemplate) { @@ -335,7 +335,7 @@ public function getEmailTemplate() /** * @param string $emailSubject * - * @return \Shopware\Models\Form\Form + * @return Form */ public function setEmailSubject($emailSubject) { @@ -355,7 +355,7 @@ public function getEmailSubject() /** * @param string $text2 * - * @return \Shopware\Models\Form\Form + * @return Form */ public function setText2($text2) { @@ -375,7 +375,7 @@ public function getText2() /** * @param int $ticketTypeid * - * @return \Shopware\Models\Form\Form + * @return Form */ public function setTicketTypeid($ticketTypeid) { @@ -395,7 +395,7 @@ public function getTicketTypeid() /** * @param string $isocode * - * @return \Shopware\Models\Form\Form + * @return Form */ public function setIsocode($isocode) { @@ -461,7 +461,7 @@ public function getMetaKeywords() } /** - * @return \Shopware\Models\Attribute\Form|null + * @return FormAttribute|null */ public function getAttribute() { @@ -469,13 +469,13 @@ public function getAttribute() } /** - * @param \Shopware\Models\Attribute\Form|array|null $attribute + * @param FormAttribute|array|null $attribute * * @return Form */ public function setAttribute($attribute) { - return $this->setOneToOne($attribute, \Shopware\Models\Attribute\Form::class, 'attribute', 'form'); + return $this->setOneToOne($attribute, FormAttribute::class, 'attribute', 'form'); } /** diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ErrorResult.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ErrorResult.php index a69f8559202..d2b9e902405 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ErrorResult.php +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ErrorResult.php @@ -43,9 +43,8 @@ class ErrorResult private $args; /** - * @param string $message - * @param Exception $exception - * @param array $args + * @param string $message + * @param array $args */ public function __construct($message, ?Exception $exception = null, $args = []) { diff --git a/engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php index 9a58a28b52d..f501b888bfe 100644 --- a/engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php @@ -299,8 +299,6 @@ public function installForm() * Fallback to auto-detection if proxy-url is not configured and $request is given. * Returns null if $request is not given or auto-detection fails. * - * @param Request $request - * * @return string|null */ public function getProxyUrl(?Request $request = null) diff --git a/recovery/update/src/Steps/ErrorResult.php b/recovery/update/src/Steps/ErrorResult.php index 6b0dbbc43bb..7d610b0758c 100644 --- a/recovery/update/src/Steps/ErrorResult.php +++ b/recovery/update/src/Steps/ErrorResult.php @@ -43,9 +43,8 @@ class ErrorResult private $args; /** - * @param string $message - * @param Exception $exception - * @param array $args + * @param string $message + * @param array $args */ public function __construct($message, ?Exception $exception = null, $args = []) { diff --git a/vendor-bin/cs-fixer/composer.json b/vendor-bin/cs-fixer/composer.json index c260e499734..db67a05bcf4 100644 --- a/vendor-bin/cs-fixer/composer.json +++ b/vendor-bin/cs-fixer/composer.json @@ -1,7 +1,7 @@ { "require-dev": { - "friendsofphp/php-cs-fixer": "3.21.0", - "kubawerlos/php-cs-fixer-custom-fixers": "3.15.0" + "friendsofphp/php-cs-fixer": "3.25.1", + "kubawerlos/php-cs-fixer-custom-fixers": "3.16.2" }, "sort-packages": true } diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock index 3c1045e834f..77bcf5c9086 100644 --- a/vendor-bin/cs-fixer/composer.lock +++ b/vendor-bin/cs-fixer/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": "948da8f09bc935c5c94227dfee539961", + "content-hash": "ee8272804887920c734e475b3cf38cf6", "packages": [], "packages-dev": [ { @@ -80,16 +80,16 @@ }, { "name": "composer/semver", - "version": "3.3.2", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9" + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9", + "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", "shasum": "" }, "require": { @@ -139,9 +139,9 @@ "versioning" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.3.2" + "source": "https://github.com/composer/semver/tree/3.4.0" }, "funding": [ { @@ -157,7 +157,7 @@ "type": "tidelift" } ], - "time": "2022-04-01T19:23:25+00:00" + "time": "2023-08-31T09:50:34+00:00" }, { "name": "composer/xdebug-handler", @@ -225,226 +225,23 @@ ], "time": "2022-02-25T21:32:43+00:00" }, - { - "name": "doctrine/annotations", - "version": "2.0.1", - "source": { - "type": "git", - "url": "https://github.com/doctrine/annotations.git", - "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f", - "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f", - "shasum": "" - }, - "require": { - "doctrine/lexer": "^2 || ^3", - "ext-tokenizer": "*", - "php": "^7.2 || ^8.0", - "psr/cache": "^1 || ^2 || ^3" - }, - "require-dev": { - "doctrine/cache": "^2.0", - "doctrine/coding-standard": "^10", - "phpstan/phpstan": "^1.8.0", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "symfony/cache": "^5.4 || ^6", - "vimeo/psalm": "^4.10" - }, - "suggest": { - "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "Docblock Annotations Parser", - "homepage": "https://www.doctrine-project.org/projects/annotations.html", - "keywords": [ - "annotations", - "docblock", - "parser" - ], - "support": { - "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/2.0.1" - }, - "time": "2023-02-02T22:02:53+00:00" - }, - { - "name": "doctrine/deprecations", - "version": "v1.1.1", - "source": { - "type": "git", - "url": "https://github.com/doctrine/deprecations.git", - "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", - "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "doctrine/coding-standard": "^9", - "phpstan/phpstan": "1.4.10 || 1.10.15", - "phpstan/phpstan-phpunit": "^1.0", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "psalm/plugin-phpunit": "0.18.4", - "psr/log": "^1 || ^2 || ^3", - "vimeo/psalm": "4.30.0 || 5.12.0" - }, - "suggest": { - "psr/log": "Allows logging deprecations via PSR-3 logger implementation" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.", - "homepage": "https://www.doctrine-project.org/", - "support": { - "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/v1.1.1" - }, - "time": "2023-06-03T09:27:29+00:00" - }, - { - "name": "doctrine/lexer", - "version": "2.1.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/lexer.git", - "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/39ab8fcf5a51ce4b85ca97c7a7d033eb12831124", - "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124", - "shasum": "" - }, - "require": { - "doctrine/deprecations": "^1.0", - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "doctrine/coding-standard": "^9 || ^10", - "phpstan/phpstan": "^1.3", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "psalm/plugin-phpunit": "^0.18.3", - "vimeo/psalm": "^4.11 || ^5.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Common\\Lexer\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.", - "homepage": "https://www.doctrine-project.org/projects/lexer.html", - "keywords": [ - "annotations", - "docblock", - "lexer", - "parser", - "php" - ], - "support": { - "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/2.1.0" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", - "type": "tidelift" - } - ], - "time": "2022-12-14T08:49:07+00:00" - }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.21.0", + "version": "v3.25.1", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "f29a0598c022baf99d2136da533820fec63167ed" + "reference": "8e21d69801de6b5ecb0dbe0bcdf967b335b1260b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/f29a0598c022baf99d2136da533820fec63167ed", - "reference": "f29a0598c022baf99d2136da533820fec63167ed", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/8e21d69801de6b5ecb0dbe0bcdf967b335b1260b", + "reference": "8e21d69801de6b5ecb0dbe0bcdf967b335b1260b", "shasum": "" }, "require": { "composer/semver": "^3.3", "composer/xdebug-handler": "^3.0.3", - "doctrine/annotations": "^2", - "doctrine/lexer": "^2 || ^3", "ext-json": "*", "ext-tokenizer": "*", "php": "^7.4 || ^8.0", @@ -461,6 +258,7 @@ "symfony/stopwatch": "^5.4 || ^6.0" }, "require-dev": { + "facile-it/paraunit": "^1.3 || ^2.0", "justinrainbow/json-schema": "^5.2", "keradus/cli-executor": "^2.0", "mikey179/vfsstream": "^1.6.11", @@ -512,7 +310,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.21.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.25.1" }, "funding": [ { @@ -520,26 +318,26 @@ "type": "github" } ], - "time": "2023-07-05T21:28:10+00:00" + "time": "2023-09-04T01:22:52+00:00" }, { "name": "kubawerlos/php-cs-fixer-custom-fixers", - "version": "v3.15.0", + "version": "v3.16.2", "source": { "type": "git", "url": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers.git", - "reference": "82c08eed3cc42dab45241cfd70e99b94cd54ca7e" + "reference": "d3f2590069d06ba49ad24cac03f802e8ad0aaeba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kubawerlos/php-cs-fixer-custom-fixers/zipball/82c08eed3cc42dab45241cfd70e99b94cd54ca7e", - "reference": "82c08eed3cc42dab45241cfd70e99b94cd54ca7e", + "url": "https://api.github.com/repos/kubawerlos/php-cs-fixer-custom-fixers/zipball/d3f2590069d06ba49ad24cac03f802e8ad0aaeba", + "reference": "d3f2590069d06ba49ad24cac03f802e8ad0aaeba", "shasum": "" }, "require": { "ext-filter": "*", "ext-tokenizer": "*", - "friendsofphp/php-cs-fixer": "^3.19", + "friendsofphp/php-cs-fixer": "^3.22", "php": "^7.4 || ^8.0" }, "require-dev": { @@ -564,58 +362,9 @@ "description": "A set of custom fixers for PHP CS Fixer", "support": { "issues": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/issues", - "source": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.15.0" + "source": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.16.2" }, - "time": "2023-06-26T21:00:04+00:00" - }, - { - "name": "psr/cache", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/cache.git", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Cache\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for caching libraries", - "keywords": [ - "cache", - "psr", - "psr-6" - ], - "support": { - "source": "https://github.com/php-fig/cache/tree/master" - }, - "time": "2016-08-06T20:24:11+00:00" + "time": "2023-08-06T13:50:15+00:00" }, { "name": "psr/container", @@ -833,16 +582,16 @@ }, { "name": "symfony/console", - "version": "v5.4.24", + "version": "v5.4.28", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8" + "reference": "f4f71842f24c2023b91237c72a365306f3c58827" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8", - "reference": "560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8", + "url": "https://api.github.com/repos/symfony/console/zipball/f4f71842f24c2023b91237c72a365306f3c58827", + "reference": "f4f71842f24c2023b91237c72a365306f3c58827", "shasum": "" }, "require": { @@ -912,7 +661,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.24" + "source": "https://github.com/symfony/console/tree/v5.4.28" }, "funding": [ { @@ -928,7 +677,7 @@ "type": "tidelift" } ], - "time": "2023-05-26T05:13:16+00:00" + "time": "2023-08-07T06:12:30+00:00" }, { "name": "symfony/deprecation-contracts", @@ -999,16 +748,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v5.4.22", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "1df20e45d56da29a4b1d8259dd6e950acbf1b13f" + "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1df20e45d56da29a4b1d8259dd6e950acbf1b13f", - "reference": "1df20e45d56da29a4b1d8259dd6e950acbf1b13f", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/5dcc00e03413f05c1e7900090927bb7247cb0aac", + "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac", "shasum": "" }, "require": { @@ -1064,7 +813,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.22" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.26" }, "funding": [ { @@ -1080,7 +829,7 @@ "type": "tidelift" } ], - "time": "2023-03-17T11:31:58+00:00" + "time": "2023-07-06T06:34:20+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -1227,16 +976,16 @@ }, { "name": "symfony/finder", - "version": "v5.4.21", + "version": "v5.4.27", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "078e9a5e1871fcfe6a5ce421b539344c21afef19" + "reference": "ff4bce3c33451e7ec778070e45bd23f74214cd5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/078e9a5e1871fcfe6a5ce421b539344c21afef19", - "reference": "078e9a5e1871fcfe6a5ce421b539344c21afef19", + "url": "https://api.github.com/repos/symfony/finder/zipball/ff4bce3c33451e7ec778070e45bd23f74214cd5d", + "reference": "ff4bce3c33451e7ec778070e45bd23f74214cd5d", "shasum": "" }, "require": { @@ -1270,7 +1019,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.21" + "source": "https://github.com/symfony/finder/tree/v5.4.27" }, "funding": [ { @@ -1286,7 +1035,7 @@ "type": "tidelift" } ], - "time": "2023-02-16T09:33:00+00:00" + "time": "2023-07-31T08:02:31+00:00" }, { "name": "symfony/options-resolver", @@ -1359,16 +1108,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", "shasum": "" }, "require": { @@ -1383,7 +1132,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1421,7 +1170,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" }, "funding": [ { @@ -1437,20 +1186,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354" + "reference": "875e90aeea2777b6f135677f618529449334a612" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", + "reference": "875e90aeea2777b6f135677f618529449334a612", "shasum": "" }, "require": { @@ -1462,7 +1211,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1502,7 +1251,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" }, "funding": [ { @@ -1518,20 +1267,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", "shasum": "" }, "require": { @@ -1543,7 +1292,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1586,7 +1335,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" }, "funding": [ { @@ -1602,20 +1351,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" + "reference": "42292d99c55abe617799667f454222c54c60e229" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", + "reference": "42292d99c55abe617799667f454222c54c60e229", "shasum": "" }, "require": { @@ -1630,7 +1379,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1669,7 +1418,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" }, "funding": [ { @@ -1685,20 +1434,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-07-28T09:04:16+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" + "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fe2f306d1d9d346a7fee353d0d5012e401e984b5", + "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5", "shasum": "" }, "require": { @@ -1707,7 +1456,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1748,7 +1497,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.28.0" }, "funding": [ { @@ -1764,20 +1513,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", "shasum": "" }, "require": { @@ -1786,7 +1535,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1831,7 +1580,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" }, "funding": [ { @@ -1847,20 +1596,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a" + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a", - "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b", + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b", "shasum": "" }, "require": { @@ -1869,7 +1618,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1910,7 +1659,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0" }, "funding": [ { @@ -1926,20 +1675,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/process", - "version": "v5.4.24", + "version": "v5.4.28", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "e3c46cc5689c8782944274bb30702106ecbe3b64" + "reference": "45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/e3c46cc5689c8782944274bb30702106ecbe3b64", - "reference": "e3c46cc5689c8782944274bb30702106ecbe3b64", + "url": "https://api.github.com/repos/symfony/process/zipball/45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b", + "reference": "45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b", "shasum": "" }, "require": { @@ -1972,7 +1721,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.24" + "source": "https://github.com/symfony/process/tree/v5.4.28" }, "funding": [ { @@ -1988,7 +1737,7 @@ "type": "tidelift" } ], - "time": "2023-05-17T11:26:05+00:00" + "time": "2023-08-07T10:36:04+00:00" }, { "name": "symfony/service-contracts", @@ -2137,16 +1886,16 @@ }, { "name": "symfony/string", - "version": "v5.4.22", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "8036a4c76c0dd29e60b6a7cafcacc50cf088ea62" + "reference": "1181fe9270e373537475e826873b5867b863883c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/8036a4c76c0dd29e60b6a7cafcacc50cf088ea62", - "reference": "8036a4c76c0dd29e60b6a7cafcacc50cf088ea62", + "url": "https://api.github.com/repos/symfony/string/zipball/1181fe9270e373537475e826873b5867b863883c", + "reference": "1181fe9270e373537475e826873b5867b863883c", "shasum": "" }, "require": { @@ -2203,7 +1952,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.22" + "source": "https://github.com/symfony/string/tree/v5.4.26" }, "funding": [ { @@ -2219,7 +1968,7 @@ "type": "tidelift" } ], - "time": "2023-03-14T06:11:53+00:00" + "time": "2023-06-28T12:46:07+00:00" } ], "aliases": [], @@ -2229,5 +1978,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From 9dfab44404de3d4a6e0517b7f7d491d14dad6d35 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 7 Sep 2023 14:36:39 +0200 Subject: [PATCH 465/730] chore: Update mpdf/mpdf to 8.2.0 --- UPGRADE-5.7.md | 1 + composer.json | 2 +- composer.lock | 66 ++++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 61 insertions(+), 8 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 0726b94b92f..fea85e6c495 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -12,6 +12,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Changed the test kernel, so PHPUnit tests do no longer ignore PHP warnings and notices and are failing instead * Updated `google/cloud-storage` to version 1.33.0 * Updated `doctrine/orm` to version 2.15.3 +* Updated `mpdf/mpdf` to version 8.2.0 * Updated `phpunit/phpunit` to version 9.6.10 * Updated `setasign/fpdf` to version 1.8.6 * Updated `symfony/serializer` to version 5.4.25 diff --git a/composer.json b/composer.json index 11d8505aafd..fcf917a5e86 100644 --- a/composer.json +++ b/composer.json @@ -62,7 +62,7 @@ "league/flysystem": "~1.1.4", "league/flysystem-aws-s3-v3": "1.0.30", "monolog/monolog": "2.9.1", - "mpdf/mpdf": "8.1.6", + "mpdf/mpdf": "8.2.0", "ongr/elasticsearch-dsl": "7.2.2", "psr/link": "1.0.0", "psr/log": "1.1.4", diff --git a/composer.lock b/composer.lock index d55dc1a84fb..36b2fcfc7f7 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": "c42fe5f11e2fb6f6ea0600d5847c7b05", + "content-hash": "b7e90429b6b083093bdf74d2efa6c87b", "packages": [ { "name": "aws/aws-crt-php", @@ -2854,26 +2854,27 @@ }, { "name": "mpdf/mpdf", - "version": "v8.1.6", + "version": "v8.2.0", "source": { "type": "git", "url": "https://github.com/mpdf/mpdf.git", - "reference": "146c7c1dfd21c826b9d5bbfe3c15e52fd933c90f" + "reference": "170a236a588d177c2aa7447ce490a030ca68e6f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mpdf/mpdf/zipball/146c7c1dfd21c826b9d5bbfe3c15e52fd933c90f", - "reference": "146c7c1dfd21c826b9d5bbfe3c15e52fd933c90f", + "url": "https://api.github.com/repos/mpdf/mpdf/zipball/170a236a588d177c2aa7447ce490a030ca68e6f4", + "reference": "170a236a588d177c2aa7447ce490a030ca68e6f4", "shasum": "" }, "require": { "ext-gd": "*", "ext-mbstring": "*", + "mpdf/psr-http-message-shim": "^1.0 || ^2.0", "mpdf/psr-log-aware-trait": "^2.0 || ^3.0", "myclabs/deep-copy": "^1.7", "paragonie/random_compat": "^1.4|^2.0|^9.99.99", "php": "^5.6 || ^7.0 || ~8.0.0 || ~8.1.0 || ~8.2.0", - "psr/http-message": "^1.0", + "psr/http-message": "^1.0 || ^2.0", "psr/log": "^1.0 || ^2.0 || ^3.0", "setasign/fpdi": "^2.1" }, @@ -2891,6 +2892,9 @@ }, "type": "library", "autoload": { + "files": [ + "src/functions.php" + ], "psr-4": { "Mpdf\\": "src/" } @@ -2927,7 +2931,55 @@ "type": "custom" } ], - "time": "2023-05-03T19:36:43+00:00" + "time": "2023-09-01T11:44:52+00:00" + }, + { + "name": "mpdf/psr-http-message-shim", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/mpdf/psr-http-message-shim.git", + "reference": "3206e6b80b6d2479e148ee497e9f2bebadc919db" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mpdf/psr-http-message-shim/zipball/3206e6b80b6d2479e148ee497e9f2bebadc919db", + "reference": "3206e6b80b6d2479e148ee497e9f2bebadc919db", + "shasum": "" + }, + "require": { + "psr/http-message": "^1.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Mpdf\\PsrHttpMessageShim\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mark Dorison", + "email": "mark@chromatichq.com" + }, + { + "name": "Kristofer Widholm", + "email": "kristofer@chromatichq.com" + }, + { + "name": "Nigel Cunningham", + "email": "nigel.cunningham@technocrat.com.au" + } + ], + "description": "Shim to allow support of different psr/message versions.", + "support": { + "issues": "https://github.com/mpdf/psr-http-message-shim/issues", + "source": "https://github.com/mpdf/psr-http-message-shim/tree/1.0.0" + }, + "time": "2023-09-01T05:59:47+00:00" }, { "name": "mpdf/psr-log-aware-trait", From 704e0f3d660a61594da11290b51addc2a6832185 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 7 Sep 2023 14:40:36 +0200 Subject: [PATCH 466/730] chore: Update wikimedia/less.php to 4.1.1 --- UPGRADE-5.7.md | 1 + composer.json | 2 +- composer.lock | 16 ++++++++-------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index fea85e6c495..91a3abb05ae 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -17,6 +17,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `setasign/fpdf` to version 1.8.6 * Updated `symfony/serializer` to version 5.4.25 * Updated `voku/anti-xss` to version 4.1.42 +* Updated `wikimedia/less.php` to version 4.1.1 * Updated several indirect dependencies * Updated npm dependencies in `themes/package.json` * Updated npm dependencies in `themes/Frontend/Responsive/package.json` diff --git a/composer.json b/composer.json index fcf917a5e86..9390d428d33 100644 --- a/composer.json +++ b/composer.json @@ -89,7 +89,7 @@ "symfony/validator": "~4.4.34", "symfony/web-link": "~4.4.27", "voku/anti-xss": "~4.1.41", - "wikimedia/less.php": "4.1.0" + "wikimedia/less.php": "4.1.1" }, "replace": { "paragonie/random_compat": "*", diff --git a/composer.lock b/composer.lock index 36b2fcfc7f7..4c6d17cd390 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": "b7e90429b6b083093bdf74d2efa6c87b", + "content-hash": "02c3d7601a15fcd9d75ee07e0d24d4a7", "packages": [ { "name": "aws/aws-crt-php", @@ -7407,16 +7407,16 @@ }, { "name": "wikimedia/less.php", - "version": "v4.1.0", + "version": "v4.1.1", "source": { "type": "git", "url": "https://github.com/wikimedia/less.php.git", - "reference": "80694e356d0ea4237e7643d90e60a772b0fe4214" + "reference": "7c814ca156716e7b46ad84ac038bf298ff91cbb4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/less.php/zipball/80694e356d0ea4237e7643d90e60a772b0fe4214", - "reference": "80694e356d0ea4237e7643d90e60a772b0fe4214", + "url": "https://api.github.com/repos/wikimedia/less.php/zipball/7c814ca156716e7b46ad84ac038bf298ff91cbb4", + "reference": "7c814ca156716e7b46ad84ac038bf298ff91cbb4", "shasum": "" }, "require": { @@ -7424,7 +7424,7 @@ }, "require-dev": { "mediawiki/mediawiki-codesniffer": "41.0.0", - "mediawiki/mediawiki-phan-config": "0.12.0", + "mediawiki/mediawiki-phan-config": "0.12.1", "mediawiki/minus-x": "1.1.1", "php-parallel-lint/php-console-highlighter": "1.0.0", "php-parallel-lint/php-parallel-lint": "1.3.2", @@ -7476,9 +7476,9 @@ ], "support": { "issues": "https://github.com/wikimedia/less.php/issues", - "source": "https://github.com/wikimedia/less.php/tree/v4.1.0" + "source": "https://github.com/wikimedia/less.php/tree/v4.1.1" }, - "time": "2023-04-10T22:43:59+00:00" + "time": "2023-08-01T14:54:27+00:00" } ], "packages-dev": [ From e42d0b16376a3cac7f0b3b391bf0451492ae877d Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 7 Sep 2023 14:44:31 +0200 Subject: [PATCH 467/730] chore: Update PHPUnit to 9.6.11 --- UPGRADE-5.7.md | 2 +- composer.lock | 37 +++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 91a3abb05ae..976541f56ce 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -13,7 +13,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `google/cloud-storage` to version 1.33.0 * Updated `doctrine/orm` to version 2.15.3 * Updated `mpdf/mpdf` to version 8.2.0 -* Updated `phpunit/phpunit` to version 9.6.10 +* Updated `phpunit/phpuit` to version 9.6.11 * Updated `setasign/fpdf` to version 1.8.6 * Updated `symfony/serializer` to version 5.4.25 * Updated `voku/anti-xss` to version 4.1.42 diff --git a/composer.lock b/composer.lock index 4c6d17cd390..0859dab4daa 100644 --- a/composer.lock +++ b/composer.lock @@ -8935,16 +8935,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.26", + "version": "9.2.27", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1" + "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", - "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/b0a88255cb70d52653d80c890bd7f38740ea50d1", + "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1", "shasum": "" }, "require": { @@ -9000,7 +9000,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.26" + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.27" }, "funding": [ { @@ -9008,7 +9009,7 @@ "type": "github" } ], - "time": "2023-03-06T12:58:08+00:00" + "time": "2023-07-26T13:44:30+00:00" }, { "name": "phpunit/php-file-iterator", @@ -9253,16 +9254,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.10", + "version": "9.6.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328" + "reference": "810500e92855eba8a7a5319ae913be2da6f957b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a6d351645c3fe5a30f5e86be6577d946af65a328", - "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/810500e92855eba8a7a5319ae913be2da6f957b0", + "reference": "810500e92855eba8a7a5319ae913be2da6f957b0", "shasum": "" }, "require": { @@ -9336,7 +9337,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.10" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.11" }, "funding": [ { @@ -9352,7 +9353,7 @@ "type": "tidelift" } ], - "time": "2023-07-10T04:04:23+00:00" + "time": "2023-08-19T07:10:56+00:00" }, { "name": "sebastian/cli-parser", @@ -9860,16 +9861,16 @@ }, { "name": "sebastian/global-state", - "version": "5.0.5", + "version": "5.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2" + "reference": "bde739e7565280bda77be70044ac1047bc007e34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", + "reference": "bde739e7565280bda77be70044ac1047bc007e34", "shasum": "" }, "require": { @@ -9912,7 +9913,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" }, "funding": [ { @@ -9920,7 +9921,7 @@ "type": "github" } ], - "time": "2022-02-14T08:28:10+00:00" + "time": "2023-08-02T09:26:13+00:00" }, { "name": "sebastian/lines-of-code", From 7d012b7fbc4527ac975673cd99a8174027118fec Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 7 Sep 2023 14:47:07 +0200 Subject: [PATCH 468/730] chore: Update setasign/fpdi to 2.4.1 --- UPGRADE-5.7.md | 1 + composer.json | 2 +- composer.lock | 16 ++++++++-------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 976541f56ce..5a9c57201e2 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -15,6 +15,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `mpdf/mpdf` to version 8.2.0 * Updated `phpunit/phpuit` to version 9.6.11 * Updated `setasign/fpdf` to version 1.8.6 +* Updated `setasign/fpdi` to version 2.4.1 * Updated `symfony/serializer` to version 5.4.25 * Updated `voku/anti-xss` to version 4.1.42 * Updated `wikimedia/less.php` to version 4.1.1 diff --git a/composer.json b/composer.json index 9390d428d33..a4f7ce6a77e 100644 --- a/composer.json +++ b/composer.json @@ -68,7 +68,7 @@ "psr/log": "1.1.4", "ramsey/uuid": "4.2.3", "setasign/fpdf": "1.8.6", - "setasign/fpdi": "2.3.7", + "setasign/fpdi": "2.4.1", "stecman/symfony-console-completion": "0.11.0", "superbalist/flysystem-google-storage": "7.2.2", "symfony/config": "~4.4.34", diff --git a/composer.lock b/composer.lock index 0859dab4daa..cb6d67512e8 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": "02c3d7601a15fcd9d75ee07e0d24d4a7", + "content-hash": "9dc2cb8bfb08b55930a2767900a7db52", "packages": [ { "name": "aws/aws-crt-php", @@ -3970,16 +3970,16 @@ }, { "name": "setasign/fpdi", - "version": "v2.3.7", + "version": "v2.4.1", "source": { "type": "git", "url": "https://github.com/Setasign/FPDI.git", - "reference": "bccc892d5fa1f48c43f8ba7db5ed4ba6f30c8c05" + "reference": "f4ba73e5bc053ccc90b81717c5df1cb2ea7bae7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Setasign/FPDI/zipball/bccc892d5fa1f48c43f8ba7db5ed4ba6f30c8c05", - "reference": "bccc892d5fa1f48c43f8ba7db5ed4ba6f30c8c05", + "url": "https://api.github.com/repos/Setasign/FPDI/zipball/f4ba73e5bc053ccc90b81717c5df1cb2ea7bae7b", + "reference": "f4ba73e5bc053ccc90b81717c5df1cb2ea7bae7b", "shasum": "" }, "require": { @@ -3992,7 +3992,7 @@ "require-dev": { "phpunit/phpunit": "~5.7", "setasign/fpdf": "~1.8", - "setasign/tfpdf": "1.31", + "setasign/tfpdf": "~1.31", "squizlabs/php_codesniffer": "^3.5", "tecnickcom/tcpdf": "~6.2" }, @@ -4030,7 +4030,7 @@ ], "support": { "issues": "https://github.com/Setasign/FPDI/issues", - "source": "https://github.com/Setasign/FPDI/tree/v2.3.7" + "source": "https://github.com/Setasign/FPDI/tree/v2.4.1" }, "funding": [ { @@ -4038,7 +4038,7 @@ "type": "tidelift" } ], - "time": "2023-02-09T10:38:43+00:00" + "time": "2023-07-27T08:12:09+00:00" }, { "name": "stecman/symfony-console-completion", From 2db702db90781c07ceed2aeb7978f166bf51eb7d Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 7 Sep 2023 14:56:56 +0200 Subject: [PATCH 469/730] chore: Update cocur/slugify to 4.4.0 --- UPGRADE-5.7.md | 4 +++- composer.json | 2 +- composer.lock | 14 +++++++------- .../Components/Slug/CocurSlugifyAdapter.php | 7 +++---- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 5a9c57201e2..921ac42a1ca 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -10,8 +10,10 @@ This changelog references changes done in Shopware 5.7 patch versions. * Changed behaviour of the translation transfer while setting a product variant as the main variant * Changed the test kernel, so PHPUnit tests do no longer ignore PHP warnings and notices and are failing instead -* Updated `google/cloud-storage` to version 1.33.0 + +* Updated `cocur/slugify` to version 4.4.0 * Updated `doctrine/orm` to version 2.15.3 +* Updated `google/cloud-storage` to version 1.33.0 * Updated `mpdf/mpdf` to version 8.2.0 * Updated `phpunit/phpuit` to version 9.6.11 * Updated `setasign/fpdf` to version 1.8.6 diff --git a/composer.json b/composer.json index a4f7ce6a77e..99a2259e3e9 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ "bcremer/line-reader": "1.3.0", "beberlei/assert": "3.3.2", "beberlei/doctrineextensions": "1.3.0", - "cocur/slugify": "4.3.0", + "cocur/slugify": "4.4.0", "doctrine/annotations": "1.14.3", "doctrine/cache": "1.13.0", "doctrine/collections": "1.8.0", diff --git a/composer.lock b/composer.lock index cb6d67512e8..18882a932cc 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": "9dc2cb8bfb08b55930a2767900a7db52", + "content-hash": "948b05d73c7edb3fa408d8d3b4465edb", "packages": [ { "name": "aws/aws-crt-php", @@ -388,16 +388,16 @@ }, { "name": "cocur/slugify", - "version": "v4.3.0", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/cocur/slugify.git", - "reference": "652234ef5f1be844a2ae1c36ad1b4c88b05160f9" + "reference": "4c6ed14a087ca061b220ffda640c07644946e2a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cocur/slugify/zipball/652234ef5f1be844a2ae1c36ad1b4c88b05160f9", - "reference": "652234ef5f1be844a2ae1c36ad1b4c88b05160f9", + "url": "https://api.github.com/repos/cocur/slugify/zipball/4c6ed14a087ca061b220ffda640c07644946e2a0", + "reference": "4c6ed14a087ca061b220ffda640c07644946e2a0", "shasum": "" }, "require": { @@ -456,9 +456,9 @@ ], "support": { "issues": "https://github.com/cocur/slugify/issues", - "source": "https://github.com/cocur/slugify/tree/v4.3.0" + "source": "https://github.com/cocur/slugify/tree/v4.4.0" }, - "time": "2022-12-07T19:48:48+00:00" + "time": "2023-08-05T09:42:11+00:00" }, { "name": "doctrine/annotations", diff --git a/engine/Shopware/Components/Slug/CocurSlugifyAdapter.php b/engine/Shopware/Components/Slug/CocurSlugifyAdapter.php index 3c64bb6eabb..e43f9d0ab39 100644 --- a/engine/Shopware/Components/Slug/CocurSlugifyAdapter.php +++ b/engine/Shopware/Components/Slug/CocurSlugifyAdapter.php @@ -27,10 +27,7 @@ class CocurSlugifyAdapter implements SlugInterface { - /** - * @var SlugifyInterface - */ - private $slugify; + private SlugifyInterface $slugify; public function __construct(SlugifyInterface $slugify) { @@ -42,6 +39,8 @@ public function __construct(SlugifyInterface $slugify) */ public function slugify($string, $separator = null) { + $string = (string) $string; + return $this->slugify->slugify($string, $separator); } } From 745965020120f20bd2f345bfc6845a8408a36f98 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 7 Sep 2023 14:59:13 +0200 Subject: [PATCH 470/730] chore: Update laminas/laminas-code to 4.12.0 --- UPGRADE-5.7.md | 1 + composer.json | 2 +- composer.lock | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 921ac42a1ca..de3f4108bfc 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -15,6 +15,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `doctrine/orm` to version 2.15.3 * Updated `google/cloud-storage` to version 1.33.0 * Updated `mpdf/mpdf` to version 8.2.0 +* Updated `laminas/laminas-code` to version 4.12.0 for PHP 8.1 and newer * Updated `phpunit/phpuit` to version 9.6.11 * Updated `setasign/fpdf` to version 1.8.6 * Updated `setasign/fpdi` to version 2.4.1 diff --git a/composer.json b/composer.json index 99a2259e3e9..5d51c1a6956 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,7 @@ "google/cloud-storage": "1.33.0", "guzzlehttp/guzzle": "~7.7.0", "guzzlehttp/psr7": "2.5.0", - "laminas/laminas-code": "4.7.1 || 4.11.0", + "laminas/laminas-code": "4.7.1 || 4.12.0", "laminas/laminas-escaper": "2.12.0", "league/flysystem": "~1.1.4", "league/flysystem-aws-s3-v3": "1.0.30", diff --git a/composer.lock b/composer.lock index 18882a932cc..82e54560d7e 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": "948b05d73c7edb3fa408d8d3b4465edb", + "content-hash": "88f49bf1f39b19037c5633a6f144f042", "packages": [ { "name": "aws/aws-crt-php", From 039cf2135f2db317d4225896050012144d7fd246 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 7 Sep 2023 15:02:22 +0200 Subject: [PATCH 471/730] chore: Update Symfony components --- UPGRADE-5.7.md | 5 +- composer.lock | 204 +++++++++++++++++++++++++------------------------ 2 files changed, 107 insertions(+), 102 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index de3f4108bfc..2b6c1ab0a43 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -19,7 +19,10 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `phpunit/phpuit` to version 9.6.11 * Updated `setasign/fpdf` to version 1.8.6 * Updated `setasign/fpdi` to version 2.4.1 -* Updated `symfony/serializer` to version 5.4.25 +* Updated `symfony/polyfill-php80` to version 1.28.0 +* Updated `symfony/polyfill-php81` to version 1.28.0 +* Updated `symfony/polyfill-php82` to version 1.28.0 +* Updated `symfony/serializer` to version 5.4.28 * Updated `voku/anti-xss` to version 4.1.42 * Updated `wikimedia/less.php` to version 4.1.1 * Updated several indirect dependencies diff --git a/composer.lock b/composer.lock index 82e54560d7e..75b42931130 100644 --- a/composer.lock +++ b/composer.lock @@ -4142,16 +4142,16 @@ }, { "name": "symfony/cache", - "version": "v5.4.25", + "version": "v5.4.28", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "e2013521c0f07473ae69a01fce0af78fc3ec0f23" + "reference": "62b7ae3bccc5b474a30fadc7ef6bbc362007d3f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/e2013521c0f07473ae69a01fce0af78fc3ec0f23", - "reference": "e2013521c0f07473ae69a01fce0af78fc3ec0f23", + "url": "https://api.github.com/repos/symfony/cache/zipball/62b7ae3bccc5b474a30fadc7ef6bbc362007d3f9", + "reference": "62b7ae3bccc5b474a30fadc7ef6bbc362007d3f9", "shasum": "" }, "require": { @@ -4219,7 +4219,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v5.4.25" + "source": "https://github.com/symfony/cache/tree/v5.4.28" }, "funding": [ { @@ -4235,7 +4235,7 @@ "type": "tidelift" } ], - "time": "2023-06-22T08:06:06+00:00" + "time": "2023-08-05T08:32:42+00:00" }, { "name": "symfony/cache-contracts", @@ -5475,16 +5475,16 @@ }, { "name": "symfony/intl", - "version": "v5.4.25", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/intl.git", - "reference": "4c4cbf57c9623b55e7d19479488bd93fee68450a" + "reference": "c26c40b64ecdc056810e294ea67ac5b34182cd69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/intl/zipball/4c4cbf57c9623b55e7d19479488bd93fee68450a", - "reference": "4c4cbf57c9623b55e7d19479488bd93fee68450a", + "url": "https://api.github.com/repos/symfony/intl/zipball/c26c40b64ecdc056810e294ea67ac5b34182cd69", + "reference": "c26c40b64ecdc056810e294ea67ac5b34182cd69", "shasum": "" }, "require": { @@ -5493,7 +5493,8 @@ "symfony/polyfill-php80": "^1.16" }, "require-dev": { - "symfony/filesystem": "^4.4|^5.0|^6.0" + "symfony/filesystem": "^4.4|^5.0|^6.0", + "symfony/var-exporter": "^5.4|^6.0" }, "type": "library", "autoload": { @@ -5543,7 +5544,7 @@ "localization" ], "support": { - "source": "https://github.com/symfony/intl/tree/v5.4.25" + "source": "https://github.com/symfony/intl/tree/v5.4.26" }, "funding": [ { @@ -5559,20 +5560,20 @@ "type": "tidelift" } ], - "time": "2023-06-19T09:28:43+00:00" + "time": "2023-07-13T09:02:54+00:00" }, { "name": "symfony/mime", - "version": "v5.4.23", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "ae0a1032a450a3abf305ee44fc55ed423fbf16e3" + "reference": "2ea06dfeee20000a319d8407cea1d47533d5a9d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/ae0a1032a450a3abf305ee44fc55ed423fbf16e3", - "reference": "ae0a1032a450a3abf305ee44fc55ed423fbf16e3", + "url": "https://api.github.com/repos/symfony/mime/zipball/2ea06dfeee20000a319d8407cea1d47533d5a9d2", + "reference": "2ea06dfeee20000a319d8407cea1d47533d5a9d2", "shasum": "" }, "require": { @@ -5587,7 +5588,7 @@ "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", "symfony/mailer": "<4.4", - "symfony/serializer": "<5.4.14|>=6.0,<6.0.14|>=6.1,<6.1.6" + "symfony/serializer": "<5.4.26|>=6,<6.2.13|>=6.3,<6.3.2" }, "require-dev": { "egulias/email-validator": "^2.1.10|^3.1|^4", @@ -5595,7 +5596,7 @@ "symfony/dependency-injection": "^4.4|^5.0|^6.0", "symfony/property-access": "^4.4|^5.1|^6.0", "symfony/property-info": "^4.4|^5.1|^6.0", - "symfony/serializer": "^5.4.14|~6.0.14|^6.1.6" + "symfony/serializer": "^5.4.26|~6.2.13|^6.3.2" }, "type": "library", "autoload": { @@ -5627,7 +5628,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.23" + "source": "https://github.com/symfony/mime/tree/v5.4.26" }, "funding": [ { @@ -5643,7 +5644,7 @@ "type": "tidelift" } ], - "time": "2023-04-19T09:49:13+00:00" + "time": "2023-07-27T06:29:31+00:00" }, { "name": "symfony/options-resolver", @@ -5714,16 +5715,16 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354" + "reference": "875e90aeea2777b6f135677f618529449334a612" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", + "reference": "875e90aeea2777b6f135677f618529449334a612", "shasum": "" }, "require": { @@ -5735,7 +5736,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5775,7 +5776,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" }, "funding": [ { @@ -5791,20 +5792,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "639084e360537a19f9ee352433b84ce831f3d2da" + "reference": "ecaafce9f77234a6a449d29e49267ba10499116d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da", - "reference": "639084e360537a19f9ee352433b84ce831f3d2da", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ecaafce9f77234a6a449d29e49267ba10499116d", + "reference": "ecaafce9f77234a6a449d29e49267ba10499116d", "shasum": "" }, "require": { @@ -5818,7 +5819,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5862,7 +5863,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.28.0" }, "funding": [ { @@ -5878,20 +5879,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:30:37+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", "shasum": "" }, "require": { @@ -5903,7 +5904,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5946,7 +5947,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" }, "funding": [ { @@ -5962,20 +5963,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", "shasum": "" }, "require": { @@ -5984,7 +5985,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6029,7 +6030,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" }, "funding": [ { @@ -6045,20 +6046,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a" + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a", - "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b", + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b", "shasum": "" }, "require": { @@ -6067,7 +6068,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6108,7 +6109,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0" }, "funding": [ { @@ -6124,20 +6125,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php82", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php82.git", - "reference": "80ddf7bfa17ef7b06db4e6d007a95bf584e07b44" + "reference": "7716bea9c86776fb3362d6b52fe1fc9471056a49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/80ddf7bfa17ef7b06db4e6d007a95bf584e07b44", - "reference": "80ddf7bfa17ef7b06db4e6d007a95bf584e07b44", + "url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/7716bea9c86776fb3362d6b52fe1fc9471056a49", + "reference": "7716bea9c86776fb3362d6b52fe1fc9471056a49", "shasum": "" }, "require": { @@ -6146,7 +6147,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6187,7 +6188,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php82/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php82/tree/v1.28.0" }, "funding": [ { @@ -6203,7 +6204,7 @@ "type": "tidelift" } ], - "time": "2022-11-10T10:10:54+00:00" + "time": "2023-08-25T17:27:25+00:00" }, { "name": "symfony/process", @@ -6269,16 +6270,16 @@ }, { "name": "symfony/property-access", - "version": "v5.4.22", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", - "reference": "ffee082889586b5718347b291e04071f4d07b38f" + "reference": "0249e46f69e92049a488f39fcf531cb42c50caaa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-access/zipball/ffee082889586b5718347b291e04071f4d07b38f", - "reference": "ffee082889586b5718347b291e04071f4d07b38f", + "url": "https://api.github.com/repos/symfony/property-access/zipball/0249e46f69e92049a488f39fcf531cb42c50caaa", + "reference": "0249e46f69e92049a488f39fcf531cb42c50caaa", "shasum": "" }, "require": { @@ -6330,7 +6331,7 @@ "reflection" ], "support": { - "source": "https://github.com/symfony/property-access/tree/v5.4.22" + "source": "https://github.com/symfony/property-access/tree/v5.4.26" }, "funding": [ { @@ -6346,7 +6347,7 @@ "type": "tidelift" } ], - "time": "2023-03-14T14:59:20+00:00" + "time": "2023-07-13T15:20:41+00:00" }, { "name": "symfony/property-info", @@ -6441,16 +6442,16 @@ }, { "name": "symfony/serializer", - "version": "v5.4.25", + "version": "v5.4.28", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "e528ace5951925459cb6620cc4d67c20ed616fdd" + "reference": "701e2b8d48a3a627ffe128b38fbe6c4cf3ddcb3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/e528ace5951925459cb6620cc4d67c20ed616fdd", - "reference": "e528ace5951925459cb6620cc4d67c20ed616fdd", + "url": "https://api.github.com/repos/symfony/serializer/zipball/701e2b8d48a3a627ffe128b38fbe6c4cf3ddcb3c", + "reference": "701e2b8d48a3a627ffe128b38fbe6c4cf3ddcb3c", "shasum": "" }, "require": { @@ -6465,7 +6466,7 @@ "phpdocumentor/type-resolver": "<1.4.0", "symfony/dependency-injection": "<4.4", "symfony/property-access": "<5.4", - "symfony/property-info": "<5.3.13", + "symfony/property-info": "<5.4.24|>=6,<6.2.11", "symfony/uid": "<5.3", "symfony/yaml": "<4.4" }, @@ -6482,7 +6483,7 @@ "symfony/http-kernel": "^4.4|^5.0|^6.0", "symfony/mime": "^4.4|^5.0|^6.0", "symfony/property-access": "^5.4|^6.0", - "symfony/property-info": "^5.3.13|^6.0", + "symfony/property-info": "^5.4.24|^6.2.11", "symfony/uid": "^5.3|^6.0", "symfony/validator": "^4.4|^5.0|^6.0", "symfony/var-dumper": "^4.4|^5.0|^6.0", @@ -6524,7 +6525,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v5.4.25" + "source": "https://github.com/symfony/serializer/tree/v5.4.28" }, "funding": [ { @@ -6540,7 +6541,7 @@ "type": "tidelift" } ], - "time": "2023-05-31T11:43:23+00:00" + "time": "2023-08-24T14:14:18+00:00" }, { "name": "symfony/service-contracts", @@ -6627,16 +6628,16 @@ }, { "name": "symfony/string", - "version": "v5.4.22", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "8036a4c76c0dd29e60b6a7cafcacc50cf088ea62" + "reference": "1181fe9270e373537475e826873b5867b863883c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/8036a4c76c0dd29e60b6a7cafcacc50cf088ea62", - "reference": "8036a4c76c0dd29e60b6a7cafcacc50cf088ea62", + "url": "https://api.github.com/repos/symfony/string/zipball/1181fe9270e373537475e826873b5867b863883c", + "reference": "1181fe9270e373537475e826873b5867b863883c", "shasum": "" }, "require": { @@ -6693,7 +6694,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.22" + "source": "https://github.com/symfony/string/tree/v5.4.26" }, "funding": [ { @@ -6709,7 +6710,7 @@ "type": "tidelift" } ], - "time": "2023-03-14T06:11:53+00:00" + "time": "2023-06-28T12:46:07+00:00" }, { "name": "symfony/translation-contracts", @@ -6897,16 +6898,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.25", + "version": "v5.4.28", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "82269f73c0f0f9859ab9b6900eebacbe54954ede" + "reference": "684b36ff415e1381d4a943c3ca2502cd2debad73" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/82269f73c0f0f9859ab9b6900eebacbe54954ede", - "reference": "82269f73c0f0f9859ab9b6900eebacbe54954ede", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/684b36ff415e1381d4a943c3ca2502cd2debad73", + "reference": "684b36ff415e1381d4a943c3ca2502cd2debad73", "shasum": "" }, "require": { @@ -6920,6 +6921,7 @@ "require-dev": { "ext-iconv": "*", "symfony/console": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^4.4|^5.0|^6.0", "symfony/process": "^4.4|^5.0|^6.0", "symfony/uid": "^5.1|^6.0", "twig/twig": "^2.13|^3.0.4" @@ -6965,7 +6967,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.25" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.28" }, "funding": [ { @@ -6981,20 +6983,20 @@ "type": "tidelift" } ], - "time": "2023-06-20T20:56:26+00:00" + "time": "2023-08-24T13:38:36+00:00" }, { "name": "symfony/var-exporter", - "version": "v5.4.21", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "be74908a6942fdd331554b3cec27ff41b45ccad4" + "reference": "11401fe94f960249b3c63a488c63ba73091c1e4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/be74908a6942fdd331554b3cec27ff41b45ccad4", - "reference": "be74908a6942fdd331554b3cec27ff41b45ccad4", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/11401fe94f960249b3c63a488c63ba73091c1e4a", + "reference": "11401fe94f960249b3c63a488c63ba73091c1e4a", "shasum": "" }, "require": { @@ -7038,7 +7040,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v5.4.21" + "source": "https://github.com/symfony/var-exporter/tree/v5.4.26" }, "funding": [ { @@ -7054,7 +7056,7 @@ "type": "tidelift" } ], - "time": "2023-02-21T19:46:44+00:00" + "time": "2023-07-20T07:21:16+00:00" }, { "name": "symfony/web-link", @@ -10538,16 +10540,16 @@ }, { "name": "symfony/css-selector", - "version": "v5.4.21", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "95f3c7468db1da8cc360b24fa2a26e7cefcb355d" + "reference": "0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/95f3c7468db1da8cc360b24fa2a26e7cefcb355d", - "reference": "95f3c7468db1da8cc360b24fa2a26e7cefcb355d", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a", + "reference": "0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a", "shasum": "" }, "require": { @@ -10584,7 +10586,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v5.4.21" + "source": "https://github.com/symfony/css-selector/tree/v5.4.26" }, "funding": [ { @@ -10600,7 +10602,7 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:03:56+00:00" + "time": "2023-07-07T06:10:25+00:00" }, { "name": "symfony/dom-crawler", From 2f2853e2dac5417fc1be4d4613d9822f61ca5673 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 7 Sep 2023 15:05:08 +0200 Subject: [PATCH 472/730] chore: Update google/cloud-storage to 1.33.1 --- UPGRADE-5.7.md | 2 +- composer.json | 2 +- composer.lock | 90 ++++++++++++-------------------------------------- 3 files changed, 24 insertions(+), 70 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 2b6c1ab0a43..b4d0e9b1252 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -13,7 +13,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `cocur/slugify` to version 4.4.0 * Updated `doctrine/orm` to version 2.15.3 -* Updated `google/cloud-storage` to version 1.33.0 +* Updated `google/cloud-storage` to version 1.33.1 * Updated `mpdf/mpdf` to version 8.2.0 * Updated `laminas/laminas-code` to version 4.12.0 for PHP 8.1 and newer * Updated `phpunit/phpuit` to version 9.6.11 diff --git a/composer.json b/composer.json index 5d51c1a6956..408c38145cc 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,7 @@ "elasticsearch/elasticsearch": "^7", "fig/link-util": "1.1.2", "friendsofphp/proxy-manager-lts": "1.0.16", - "google/cloud-storage": "1.33.0", + "google/cloud-storage": "1.33.1", "guzzlehttp/guzzle": "~7.7.0", "guzzlehttp/psr7": "2.5.0", "laminas/laminas-code": "4.7.1 || 4.12.0", diff --git a/composer.lock b/composer.lock index 75b42931130..5b5c2f8a075 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": "88f49bf1f39b19037c5633a6f144f042", + "content-hash": "3a40fbded4cbad2a15cc2a0826a3cd1b", "packages": [ { "name": "aws/aws-crt-php", @@ -1863,16 +1863,16 @@ }, { "name": "google/auth", - "version": "v1.28.0", + "version": "v1.29.1", "source": { "type": "git", "url": "https://github.com/googleapis/google-auth-library-php.git", - "reference": "07f7f6305f1b7df32b2acf6e101c1225c839c7ac" + "reference": "f199ed635b945e5adfd3c1a203543d8d86aff239" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/07f7f6305f1b7df32b2acf6e101c1225c839c7ac", - "reference": "07f7f6305f1b7df32b2acf6e101c1225c839c7ac", + "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/f199ed635b945e5adfd3c1a203543d8d86aff239", + "reference": "f199ed635b945e5adfd3c1a203543d8d86aff239", "shasum": "" }, "require": { @@ -1884,8 +1884,8 @@ "psr/http-message": "^1.1||^2.0" }, "require-dev": { - "guzzlehttp/promises": "^1.3", - "kelvinmo/simplejwt": "0.7.0", + "guzzlehttp/promises": "^2.0", + "kelvinmo/simplejwt": "0.7.1", "phpseclib/phpseclib": "^3.0", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.0.0", @@ -1915,27 +1915,27 @@ "support": { "docs": "https://googleapis.github.io/google-auth-library-php/main/", "issues": "https://github.com/googleapis/google-auth-library-php/issues", - "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.28.0" + "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.29.1" }, - "time": "2023-05-11T21:58:18+00:00" + "time": "2023-08-23T08:49:35+00:00" }, { "name": "google/cloud-core", - "version": "v1.52.1", + "version": "v1.52.3", "source": { "type": "git", "url": "https://github.com/googleapis/google-cloud-php-core.git", - "reference": "8214910f79b5508d4cd1cd48f39d7970443071d5" + "reference": "2ae714abfbf979cb52de26227a87e42bfdfb6347" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/8214910f79b5508d4cd1cd48f39d7970443071d5", - "reference": "8214910f79b5508d4cd1cd48f39d7970443071d5", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/2ae714abfbf979cb52de26227a87e42bfdfb6347", + "reference": "2ae714abfbf979cb52de26227a87e42bfdfb6347", "shasum": "" }, "require": { "google/auth": "^1.18", - "guzzlehttp/guzzle": "^5.3|^6.5.7|^7.4.4", + "guzzlehttp/guzzle": "^6.5.8|^7.4.4", "guzzlehttp/promises": "^1.4||^2.0", "guzzlehttp/psr7": "^1.7|^2.0", "monolog/monolog": "^1.1|^2.0|^3.0", @@ -1980,27 +1980,26 @@ ], "description": "Google Cloud PHP shared dependency, providing functionality useful to all components.", "support": { - "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.1" + "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.3" }, - "time": "2023-07-07T20:46:38+00:00" + "time": "2023-08-25T20:04:15+00:00" }, { "name": "google/cloud-storage", - "version": "v1.33.0", + "version": "v1.33.1", "source": { "type": "git", "url": "https://github.com/googleapis/google-cloud-php-storage.git", - "reference": "05ae33620feebe1107756b59fe0329cace3b5e13" + "reference": "dc3fbf15d1a1519de20f4b55ab76b2ac94b89652" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/05ae33620feebe1107756b59fe0329cace3b5e13", - "reference": "05ae33620feebe1107756b59fe0329cace3b5e13", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/dc3fbf15d1a1519de20f4b55ab76b2ac94b89652", + "reference": "dc3fbf15d1a1519de20f4b55ab76b2ac94b89652", "shasum": "" }, "require": { "google/cloud-core": "^1.51.3", - "google/crc32": "^0.2.0", "php": ">=7.4", "ramsey/uuid": "^4.2.3" }, @@ -2037,54 +2036,9 @@ ], "description": "Cloud Storage Client for PHP", "support": { - "source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.33.0" - }, - "time": "2023-07-07T20:46:38+00:00" - }, - { - "name": "google/crc32", - "version": "v0.2.0", - "source": { - "type": "git", - "url": "https://github.com/google/php-crc32.git", - "reference": "948f7945d803dcc1a375152c72f63144c2dadf23" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/google/php-crc32/zipball/948f7945d803dcc1a375152c72f63144c2dadf23", - "reference": "948f7945d803dcc1a375152c72f63144c2dadf23", - "shasum": "" - }, - "require": { - "php": ">=7.4" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "v3.15", - "phpunit/phpunit": "^9" - }, - "type": "library", - "autoload": { - "psr-4": { - "Google\\CRC32\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Andrew Brampton", - "email": "bramp@google.com" - } - ], - "description": "Various CRC32 implementations", - "homepage": "https://github.com/google/php-crc32", - "support": { - "issues": "https://github.com/google/php-crc32/issues", - "source": "https://github.com/google/php-crc32/tree/v0.2.0" + "source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.33.1" }, - "time": "2023-04-16T22:44:57+00:00" + "time": "2023-08-17T19:37:27+00:00" }, { "name": "guzzlehttp/guzzle", From b7273b6fc772bce8106a97173648d27fb2719967 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 7 Sep 2023 15:12:05 +0200 Subject: [PATCH 473/730] chore: Update guzzlehttp/guzzle to 7.8.0 --- UPGRADE-5.7.md | 2 ++ composer.json | 4 ++-- composer.lock | 30 +++++++++++++++--------------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index b4d0e9b1252..8595b0e04f9 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -14,6 +14,8 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `cocur/slugify` to version 4.4.0 * Updated `doctrine/orm` to version 2.15.3 * Updated `google/cloud-storage` to version 1.33.1 +* Updated `guzzlehttp/guzzle` to version 7.8.0 +* Updated `guzzlehttp/psr7` to version 2.6.1 * Updated `mpdf/mpdf` to version 8.2.0 * Updated `laminas/laminas-code` to version 4.12.0 for PHP 8.1 and newer * Updated `phpunit/phpuit` to version 9.6.11 diff --git a/composer.json b/composer.json index 408c38145cc..bb7bdfe9e0b 100644 --- a/composer.json +++ b/composer.json @@ -55,8 +55,8 @@ "fig/link-util": "1.1.2", "friendsofphp/proxy-manager-lts": "1.0.16", "google/cloud-storage": "1.33.1", - "guzzlehttp/guzzle": "~7.7.0", - "guzzlehttp/psr7": "2.5.0", + "guzzlehttp/guzzle": "~7.8.0", + "guzzlehttp/psr7": "~2.6.1", "laminas/laminas-code": "4.7.1 || 4.12.0", "laminas/laminas-escaper": "2.12.0", "league/flysystem": "~1.1.4", diff --git a/composer.lock b/composer.lock index 5b5c2f8a075..2c4ee85c3fc 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": "3a40fbded4cbad2a15cc2a0826a3cd1b", + "content-hash": "fcf8b51a017cb3361cd1b5536803244a", "packages": [ { "name": "aws/aws-crt-php", @@ -2042,22 +2042,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.7.0", + "version": "7.8.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5" + "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/fb7566caccf22d74d1ab270de3551f72a58399f5", - "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1110f66a6530a40fe7aea0378fe608ee2b2248f9", + "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5.3 || ^2.0", - "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", + "guzzlehttp/promises": "^1.5.3 || ^2.0.1", + "guzzlehttp/psr7": "^1.9.1 || ^2.5.1", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -2148,7 +2148,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.7.0" + "source": "https://github.com/guzzle/guzzle/tree/7.8.0" }, "funding": [ { @@ -2164,7 +2164,7 @@ "type": "tidelift" } ], - "time": "2023-05-21T14:04:53+00:00" + "time": "2023-08-27T10:20:53+00:00" }, { "name": "guzzlehttp/promises", @@ -2247,16 +2247,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "2.5.0", + "version": "2.6.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "b635f279edd83fc275f822a1188157ffea568ff6" + "reference": "be45764272e8873c72dbe3d2edcfdfcc3bc9f727" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6", - "reference": "b635f279edd83fc275f822a1188157ffea568ff6", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/be45764272e8873c72dbe3d2edcfdfcc3bc9f727", + "reference": "be45764272e8873c72dbe3d2edcfdfcc3bc9f727", "shasum": "" }, "require": { @@ -2343,7 +2343,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.5.0" + "source": "https://github.com/guzzle/psr7/tree/2.6.1" }, "funding": [ { @@ -2359,7 +2359,7 @@ "type": "tidelift" } ], - "time": "2023-04-17T16:11:26+00:00" + "time": "2023-08-27T10:13:57+00:00" }, { "name": "laminas/laminas-code", From c66bfec03937c76283c314c5ac86a784440f79ce Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 20 Sep 2023 09:46:38 +0200 Subject: [PATCH 474/730] chore: Update doctrine/orm to 2.15.5 --- UPGRADE-5.7.md | 2 +- composer.json | 2 +- composer.lock | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 8595b0e04f9..96c2f4ba8de 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -12,7 +12,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Changed the test kernel, so PHPUnit tests do no longer ignore PHP warnings and notices and are failing instead * Updated `cocur/slugify` to version 4.4.0 -* Updated `doctrine/orm` to version 2.15.3 +* Updated `doctrine/orm` to version 2.15.5 * Updated `google/cloud-storage` to version 1.33.1 * Updated `guzzlehttp/guzzle` to version 7.8.0 * Updated `guzzlehttp/psr7` to version 2.6.1 diff --git a/composer.json b/composer.json index bb7bdfe9e0b..1b4a4c8d457 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,7 @@ "doctrine/dbal": "2.13.9", "doctrine/event-manager": "1.2.0", "doctrine/inflector": "2.0.4", - "doctrine/orm": "2.15.3", + "doctrine/orm": "2.15.5", "doctrine/persistence": "3.2.0", "elasticsearch/elasticsearch": "^7", "fig/link-util": "1.1.2", diff --git a/composer.lock b/composer.lock index 2c4ee85c3fc..0c7adece400 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": "fcf8b51a017cb3361cd1b5536803244a", + "content-hash": "1f33623c0c97a34b5974742b55a2201d", "packages": [ { "name": "aws/aws-crt-php", @@ -1285,16 +1285,16 @@ }, { "name": "doctrine/orm", - "version": "2.15.3", + "version": "2.15.5", "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "4c3bd208018c26498e5f682aaad45fa00ea307d5" + "reference": "d2de4ec03c63ddd7bdfda0421e237e11343c75ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/4c3bd208018c26498e5f682aaad45fa00ea307d5", - "reference": "4c3bd208018c26498e5f682aaad45fa00ea307d5", + "url": "https://api.github.com/repos/doctrine/orm/zipball/d2de4ec03c63ddd7bdfda0421e237e11343c75ee", + "reference": "d2de4ec03c63ddd7bdfda0421e237e11343c75ee", "shasum": "" }, "require": { @@ -1323,14 +1323,14 @@ "doctrine/annotations": "^1.13 || ^2", "doctrine/coding-standard": "^9.0.2 || ^12.0", "phpbench/phpbench": "^0.16.10 || ^1.0", - "phpstan/phpstan": "~1.4.10 || 1.10.18", + "phpstan/phpstan": "~1.4.10 || 1.10.25", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6", "psr/log": "^1 || ^2 || ^3", "squizlabs/php_codesniffer": "3.7.2", "symfony/cache": "^4.4 || ^5.4 || ^6.0", "symfony/var-exporter": "^4.4 || ^5.4 || ^6.2", "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0", - "vimeo/psalm": "4.30.0 || 5.12.0" + "vimeo/psalm": "4.30.0 || 5.13.1" }, "suggest": { "ext-dom": "Provides support for XSD validation for XML mapping files", @@ -1380,9 +1380,9 @@ ], "support": { "issues": "https://github.com/doctrine/orm/issues", - "source": "https://github.com/doctrine/orm/tree/2.15.3" + "source": "https://github.com/doctrine/orm/tree/2.15.5" }, - "time": "2023-06-22T12:36:06+00:00" + "time": "2023-07-28T14:08:17+00:00" }, { "name": "doctrine/persistence", From 3f8081263ac9a3f236b3c472d4e59ea4e47a3f07 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 20 Sep 2023 10:02:47 +0200 Subject: [PATCH 475/730] chore: Update friendsofphp/php-cs-fixer to 3.27.0 --- .../Gateway/DBAL/Hydrator/Hydrator.php | 2 +- .../Service/Core/CheapestPriceService.php | 2 +- .../Service/Core/GraduatedPricesService.php | 2 +- .../Service/Core/PriceCalculator.php | 8 ++++---- engine/Shopware/Components/Document.php | 2 +- engine/Shopware/Components/Random.php | 3 ++- engine/Shopware/Controllers/Backend/Export.php | 2 +- engine/Shopware/Core/sArticles.php | 8 ++++---- engine/Shopware/Core/sBasket.php | 4 ++-- engine/Shopware/Core/sMarketing.php | 2 +- engine/Shopware/Models/Document/Order.php | 2 +- .../Default/Core/CronProductExport/Bootstrap.php | 2 +- .../MarketingAggregate/Components/TopSeller.php | 4 ++-- vendor-bin/cs-fixer/composer.json | 2 +- vendor-bin/cs-fixer/composer.lock | 14 +++++++------- 15 files changed, 30 insertions(+), 29 deletions(-) diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/Hydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/Hydrator.php index e45e794be17..1d11097212d 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/Hydrator.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/Hydrator.php @@ -122,7 +122,7 @@ protected function getTranslation(array $data, $prefix, array $mapping = [], $id $fallback = $this->extractTranslation($data, $fallback, $id); $translation = $this->extractTranslation($data, $key, $id); - $translation = $translation + $fallback; + $translation += $fallback; if (!empty($mapping)) { $translation = $this->convertArrayKeys($translation, $mapping); diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CheapestPriceService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CheapestPriceService.php index 5edb7407c1e..1fb2f1b226e 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CheapestPriceService.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CheapestPriceService.php @@ -95,7 +95,7 @@ function (BaseProduct $product) use ($prices) { ); // Do not use array_merge here. Since it will reindex the numbers of fallbackPrices. - $prices = $prices + $fallbackPrices; + $prices += $fallbackPrices; return $this->calculatePriceGroupDiscounts($products, $prices, $context); } diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/GraduatedPricesService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/GraduatedPricesService.php index f234ac73e0f..32347098cda 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/GraduatedPricesService.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/GraduatedPricesService.php @@ -94,7 +94,7 @@ function (ListProduct $product) use ($prices) { ); // Do not use array_merge here. Since it will reindex the numbers of fallbackPrices. - $prices = $prices + $fallbackPrices; + $prices += $fallbackPrices; } $priceGroups = $context->getPriceGroups(); diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/PriceCalculator.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/PriceCalculator.php index 5bde74119e4..297cd9f7c0c 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/PriceCalculator.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/PriceCalculator.php @@ -52,15 +52,15 @@ public function calculatePrice($price, Tax $tax, ShopContextInterface $context) * by the percentage discount value of the current customer group. */ if ($customerGroup->useDiscount() && $customerGroup->getPercentageDiscount()) { - $price = $price - ($price / 100 * $customerGroup->getPercentageDiscount()); + $price -= ($price / 100 * $customerGroup->getPercentageDiscount()); } - /** + /* * Currency calculation: * If the customer is currently in a sub shop with another currency, like dollar, - * we have to calculate the the price for the other currency. + * we have to calculate the price for the other currency. */ - $price = $price * $context->getCurrency()->getFactor(); + $price *= $context->getCurrency()->getFactor(); /* * check if the customer group should see gross prices. diff --git a/engine/Shopware/Components/Document.php b/engine/Shopware/Components/Document.php index c33c648babe..fa55b770167 100644 --- a/engine/Shopware/Components/Document.php +++ b/engine/Shopware/Components/Document.php @@ -798,7 +798,7 @@ protected function saveDocument() } else { // The typID is indexed with base 0, so we need increase the typID if (!\in_array($typID, ['1', '2', '3'])) { - $typID = $typID + 1; + ++$typID; } $numberrange = 'doc_' . $typID; } diff --git a/engine/Shopware/Components/Random.php b/engine/Shopware/Components/Random.php index b1715c4f449..3f31dc4eb87 100644 --- a/engine/Shopware/Components/Random.php +++ b/engine/Shopware/Components/Random.php @@ -95,7 +95,8 @@ public static function getInteger($min, $max) public static function getFloat() { $bytes = static::getBytes(7); - $bytes[6] = $bytes[6] | \chr(0xF0); + $newBytes = $bytes[6] | \chr(0xF0); + $bytes[6] = $newBytes; $bytes .= \chr(63); // exponent bias (1023) $unpacked = unpack('d', $bytes); if (!\is_array($unpacked)) { diff --git a/engine/Shopware/Controllers/Backend/Export.php b/engine/Shopware/Controllers/Backend/Export.php index c541e1e88b2..03defc5cec3 100644 --- a/engine/Shopware/Controllers/Backend/Export.php +++ b/engine/Shopware/Controllers/Backend/Export.php @@ -81,7 +81,7 @@ public function indexAction() $diffInterval = time(); if ($productFeed->getCacheRefreshed()) { - $diffInterval = $diffInterval - $productFeed->getCacheRefreshed()->getTimestamp(); + $diffInterval -= $productFeed->getCacheRefreshed()->getTimestamp(); } if ($diffInterval >= $productFeed->getInterval() || !file_exists($filePath)) { diff --git a/engine/Shopware/Core/sArticles.php b/engine/Shopware/Core/sArticles.php index cd62667bb09..01f90fd706a 100644 --- a/engine/Shopware/Core/sArticles.php +++ b/engine/Shopware/Core/sArticles.php @@ -321,7 +321,7 @@ public function sSaveComment($article) $sVoteStars = 0; } - $sVoteStars = $sVoteStars / 2; + $sVoteStars /= 2; if ($this->config['sVOTEUNLOCK']) { $active = 0; @@ -509,10 +509,10 @@ public function sCalculatingPrice($price, $tax, $taxId = 0, $article = []) // Calculate global discount if ($this->sSYSTEM->sUSERGROUPDATA['mode'] && $this->sSYSTEM->sUSERGROUPDATA['discount']) { - $price = $price - ($price / 100 * $this->sSYSTEM->sUSERGROUPDATA['discount']); + $price -= ($price / 100 * $this->sSYSTEM->sUSERGROUPDATA['discount']); } if ($this->sSYSTEM->sCurrency['factor']) { - $price = $price * (float) $this->sSYSTEM->sCurrency['factor']; + $price *= (float) $this->sSYSTEM->sCurrency['factor']; } // Condition Output-Netto AND NOT overwrite by customer-group @@ -570,7 +570,7 @@ public function sCalculatingPriceNum( } // Calculating global discount if ($this->sSYSTEM->sUSERGROUPDATA['mode'] && $this->sSYSTEM->sUSERGROUPDATA['discount']) { - $price = $price - ($price / 100 * $this->sSYSTEM->sUSERGROUPDATA['discount']); + $price -= ($price / 100 * $this->sSYSTEM->sUSERGROUPDATA['discount']); } // Support tax rate defined by certain conditions diff --git a/engine/Shopware/Core/sBasket.php b/engine/Shopware/Core/sBasket.php index 19787969a7e..5f56112254e 100644 --- a/engine/Shopware/Core/sBasket.php +++ b/engine/Shopware/Core/sBasket.php @@ -3133,8 +3133,8 @@ private function getTaxesForUpdateProduct($quantity, array $queryNewPrice, array // Recalculate price per item, if purchase unit is set if ($queryAdditionalInfo['purchaseunit'] != 0) { - $grossPrice = $grossPrice / $queryAdditionalInfo['purchaseunit']; - $netPrice = $netPrice / $queryAdditionalInfo['purchaseunit']; + $grossPrice /= $queryAdditionalInfo['purchaseunit']; + $netPrice /= $queryAdditionalInfo['purchaseunit']; } if (empty($this->sSYSTEM->sCurrency['factor'])) { diff --git a/engine/Shopware/Core/sMarketing.php b/engine/Shopware/Core/sMarketing.php index 2cce1478f43..19c40808ae0 100644 --- a/engine/Shopware/Core/sMarketing.php +++ b/engine/Shopware/Core/sMarketing.php @@ -402,7 +402,7 @@ public function sGetPremiums() } if ($premiumFactor != 0) { - $activeFactor = $activeFactor / $premiumFactor; + $activeFactor /= $premiumFactor; } else { $activeFactor = 0; } diff --git a/engine/Shopware/Models/Document/Order.php b/engine/Shopware/Models/Document/Order.php index 9a5105ee55b..68fafa8eebc 100644 --- a/engine/Shopware/Models/Document/Order.php +++ b/engine/Shopware/Models/Document/Order.php @@ -399,7 +399,7 @@ public function processOrder() if ($shippingTax !== null) { foreach ($shippingTax as $key => $val) { if (isset($this->_tax[$key])) { - $this->_tax[$key] = $this->_tax[$key] + $val; + $this->_tax[$key] += $val; } else { $this->_tax[$key] = $val; } diff --git a/engine/Shopware/Plugins/Default/Core/CronProductExport/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/CronProductExport/Bootstrap.php index 8cb90ede1a1..a6bb344ea6e 100644 --- a/engine/Shopware/Plugins/Default/Core/CronProductExport/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Core/CronProductExport/Bootstrap.php @@ -85,7 +85,7 @@ public function exportProductFiles() } elseif ($feedModel->getInterval() > 0) { $diffInterval = time(); if ($feedModel->getCacheRefreshed()) { - $diffInterval = $diffInterval - $feedModel->getCacheRefreshed()->getTimestamp(); + $diffInterval -= $feedModel->getCacheRefreshed()->getTimestamp(); } if ($diffInterval < $feedModel->getInterval() && file_exists($filePath)) { diff --git a/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/TopSeller.php b/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/TopSeller.php index 5dc6e1ff501..2f159ab5721 100644 --- a/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/TopSeller.php +++ b/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/TopSeller.php @@ -235,9 +235,9 @@ protected function getTopSellerSelect() $sumSelect = ' SUM(IF(s_order.id, IFNULL(details.quantity, 0), 0)) '; if ($usePseudoSales) { // If this value is set to true, the articles.pseudosales column has to be added to the sales value. - $sumSelect = $sumSelect . ' + articles.pseudosales '; + $sumSelect .= ' + articles.pseudosales '; } - $sumSelect = $sumSelect . ' as sales '; + $sumSelect .= ' as sales '; return $sumSelect; } diff --git a/vendor-bin/cs-fixer/composer.json b/vendor-bin/cs-fixer/composer.json index db67a05bcf4..b84f9b9ae5d 100644 --- a/vendor-bin/cs-fixer/composer.json +++ b/vendor-bin/cs-fixer/composer.json @@ -1,6 +1,6 @@ { "require-dev": { - "friendsofphp/php-cs-fixer": "3.25.1", + "friendsofphp/php-cs-fixer": "3.27.0", "kubawerlos/php-cs-fixer-custom-fixers": "3.16.2" }, "sort-packages": true diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock index 77bcf5c9086..16cd65378ed 100644 --- a/vendor-bin/cs-fixer/composer.lock +++ b/vendor-bin/cs-fixer/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": "ee8272804887920c734e475b3cf38cf6", + "content-hash": "e4bf52df2f6708c860ff68e413e60ed8", "packages": [], "packages-dev": [ { @@ -227,16 +227,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.25.1", + "version": "v3.27.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "8e21d69801de6b5ecb0dbe0bcdf967b335b1260b" + "reference": "e73ccaae1208f017bb7860986eebb3da48bd25d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/8e21d69801de6b5ecb0dbe0bcdf967b335b1260b", - "reference": "8e21d69801de6b5ecb0dbe0bcdf967b335b1260b", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/e73ccaae1208f017bb7860986eebb3da48bd25d6", + "reference": "e73ccaae1208f017bb7860986eebb3da48bd25d6", "shasum": "" }, "require": { @@ -310,7 +310,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.25.1" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.27.0" }, "funding": [ { @@ -318,7 +318,7 @@ "type": "github" } ], - "time": "2023-09-04T01:22:52+00:00" + "time": "2023-09-17T14:37:54+00:00" }, { "name": "kubawerlos/php-cs-fixer-custom-fixers", From c724986b06304615dbb298cec6b494974bef4f1e Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 20 Sep 2023 10:12:12 +0200 Subject: [PATCH 476/730] chore: Update google/cloud-storage to 1.33.2 --- UPGRADE-5.7.md | 2 +- composer.json | 2 +- composer.lock | 38 +++++++++++++++++++------------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 96c2f4ba8de..2ce86a4b948 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -13,7 +13,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `cocur/slugify` to version 4.4.0 * Updated `doctrine/orm` to version 2.15.5 -* Updated `google/cloud-storage` to version 1.33.1 +* Updated `google/cloud-storage` to version 1.33.2 * Updated `guzzlehttp/guzzle` to version 7.8.0 * Updated `guzzlehttp/psr7` to version 2.6.1 * Updated `mpdf/mpdf` to version 8.2.0 diff --git a/composer.json b/composer.json index 1b4a4c8d457..d6da3ea68fd 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,7 @@ "elasticsearch/elasticsearch": "^7", "fig/link-util": "1.1.2", "friendsofphp/proxy-manager-lts": "1.0.16", - "google/cloud-storage": "1.33.1", + "google/cloud-storage": "1.33.2", "guzzlehttp/guzzle": "~7.8.0", "guzzlehttp/psr7": "~2.6.1", "laminas/laminas-code": "4.7.1 || 4.12.0", diff --git a/composer.lock b/composer.lock index 0c7adece400..7a1c928d25c 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": "1f33623c0c97a34b5974742b55a2201d", + "content-hash": "9c7b8ea4c6787988c61c4dc4cc33bb6f", "packages": [ { "name": "aws/aws-crt-php", @@ -1863,16 +1863,16 @@ }, { "name": "google/auth", - "version": "v1.29.1", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-auth-library-php.git", - "reference": "f199ed635b945e5adfd3c1a203543d8d86aff239" + "reference": "6028b072aa444d7edecbed603431322026704627" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/f199ed635b945e5adfd3c1a203543d8d86aff239", - "reference": "f199ed635b945e5adfd3c1a203543d8d86aff239", + "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/6028b072aa444d7edecbed603431322026704627", + "reference": "6028b072aa444d7edecbed603431322026704627", "shasum": "" }, "require": { @@ -1915,22 +1915,22 @@ "support": { "docs": "https://googleapis.github.io/google-auth-library-php/main/", "issues": "https://github.com/googleapis/google-auth-library-php/issues", - "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.29.1" + "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.30.0" }, - "time": "2023-08-23T08:49:35+00:00" + "time": "2023-09-07T19:13:44+00:00" }, { "name": "google/cloud-core", - "version": "v1.52.3", + "version": "v1.52.4", "source": { "type": "git", "url": "https://github.com/googleapis/google-cloud-php-core.git", - "reference": "2ae714abfbf979cb52de26227a87e42bfdfb6347" + "reference": "21c004745a32c71e03ab62effd7fbee0cf3ae7c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/2ae714abfbf979cb52de26227a87e42bfdfb6347", - "reference": "2ae714abfbf979cb52de26227a87e42bfdfb6347", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/21c004745a32c71e03ab62effd7fbee0cf3ae7c6", + "reference": "21c004745a32c71e03ab62effd7fbee0cf3ae7c6", "shasum": "" }, "require": { @@ -1980,22 +1980,22 @@ ], "description": "Google Cloud PHP shared dependency, providing functionality useful to all components.", "support": { - "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.3" + "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.4" }, - "time": "2023-08-25T20:04:15+00:00" + "time": "2023-09-15T20:50:36+00:00" }, { "name": "google/cloud-storage", - "version": "v1.33.1", + "version": "v1.33.2", "source": { "type": "git", "url": "https://github.com/googleapis/google-cloud-php-storage.git", - "reference": "dc3fbf15d1a1519de20f4b55ab76b2ac94b89652" + "reference": "6148b428737eae9b6590ccd8fec508ab8689d096" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/dc3fbf15d1a1519de20f4b55ab76b2ac94b89652", - "reference": "dc3fbf15d1a1519de20f4b55ab76b2ac94b89652", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/6148b428737eae9b6590ccd8fec508ab8689d096", + "reference": "6148b428737eae9b6590ccd8fec508ab8689d096", "shasum": "" }, "require": { @@ -2036,9 +2036,9 @@ ], "description": "Cloud Storage Client for PHP", "support": { - "source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.33.1" + "source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.33.2" }, - "time": "2023-08-17T19:37:27+00:00" + "time": "2023-09-15T20:50:36+00:00" }, { "name": "guzzlehttp/guzzle", From a92c2fd985b0186ea1749d6fd11f3d2ee8a89c2c Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 20 Sep 2023 10:18:51 +0200 Subject: [PATCH 477/730] chore: Update friends-of-behat/mink-extension to 2.7.3 --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index d6da3ea68fd..8797f2c640c 100644 --- a/composer.json +++ b/composer.json @@ -109,7 +109,7 @@ "behat/gherkin": "4.9.0", "behat/mink": "1.10.0", "behat/mink-selenium2-driver": "1.6.0", - "friends-of-behat/mink-extension": "2.7.2", + "friends-of-behat/mink-extension": "2.7.3", "php-parallel-lint/php-var-dump-check": "^0.5", "phpspec/prophecy-phpunit": "^2.0", "phpstan/extension-installer": "1.3.1", diff --git a/composer.lock b/composer.lock index 7a1c928d25c..fe51fd73428 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": "9c7b8ea4c6787988c61c4dc4cc33bb6f", + "content-hash": "259ef70c88c22f304e3bde07cbfa84b2", "packages": [ { "name": "aws/aws-crt-php", @@ -7909,16 +7909,16 @@ }, { "name": "friends-of-behat/mink-extension", - "version": "v2.7.2", + "version": "v2.7.3", "source": { "type": "git", "url": "https://github.com/FriendsOfBehat/MinkExtension.git", - "reference": "ffc5ee88aa8e5b430f0c417adb3f0c943ffeafed" + "reference": "b1ccaef9136f62c8efaad88b966345dd68374fa9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfBehat/MinkExtension/zipball/ffc5ee88aa8e5b430f0c417adb3f0c943ffeafed", - "reference": "ffc5ee88aa8e5b430f0c417adb3f0c943ffeafed", + "url": "https://api.github.com/repos/FriendsOfBehat/MinkExtension/zipball/b1ccaef9136f62c8efaad88b966345dd68374fa9", + "reference": "b1ccaef9136f62c8efaad88b966345dd68374fa9", "shasum": "" }, "require": { @@ -7968,9 +7968,9 @@ "web" ], "support": { - "source": "https://github.com/FriendsOfBehat/MinkExtension/tree/v2.7.2" + "source": "https://github.com/FriendsOfBehat/MinkExtension/tree/v2.7.3" }, - "time": "2022-10-17T07:23:22+00:00" + "time": "2023-09-12T09:50:10+00:00" }, { "name": "instaclick/php-webdriver", From 7b492be5377e6d558f22fc4f1de1972cdac5e60a Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 20 Sep 2023 10:30:41 +0200 Subject: [PATCH 478/730] chore: Update phpstan/phpstan to 1.10.35 --- composer.json | 2 +- composer.lock | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index 8797f2c640c..dbaf9b09837 100644 --- a/composer.json +++ b/composer.json @@ -113,7 +113,7 @@ "php-parallel-lint/php-var-dump-check": "^0.5", "phpspec/prophecy-phpunit": "^2.0", "phpstan/extension-installer": "1.3.1", - "phpstan/phpstan": "1.10.33", + "phpstan/phpstan": "1.10.35", "phpstan/phpstan-doctrine": "1.3.43", "phpstan/phpstan-phpunit": "1.3.14", "phpstan/phpstan-symfony": "1.3.2", diff --git a/composer.lock b/composer.lock index fe51fd73428..ee63037b78c 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": "259ef70c88c22f304e3bde07cbfa84b2", + "content-hash": "50294badfd2e0cd32d90ecafd51fb467", "packages": [ { "name": "aws/aws-crt-php", @@ -8589,16 +8589,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.23.1", + "version": "1.24.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26" + "reference": "9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/846ae76eef31c6d7790fac9bc399ecee45160b26", - "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01", + "reference": "9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01", "shasum": "" }, "require": { @@ -8630,22 +8630,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.23.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.1" }, - "time": "2023-08-03T16:32:59+00:00" + "time": "2023-09-18T12:18:02+00:00" }, { "name": "phpstan/phpstan", - "version": "1.10.33", + "version": "1.10.35", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "03b1cf9f814ba0863c4e9affea49a4d1ed9a2ed1" + "reference": "e730e5facb75ffe09dfb229795e8c01a459f26c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/03b1cf9f814ba0863c4e9affea49a4d1ed9a2ed1", - "reference": "03b1cf9f814ba0863c4e9affea49a4d1ed9a2ed1", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e730e5facb75ffe09dfb229795e8c01a459f26c3", + "reference": "e730e5facb75ffe09dfb229795e8c01a459f26c3", "shasum": "" }, "require": { @@ -8694,7 +8694,7 @@ "type": "tidelift" } ], - "time": "2023-09-04T12:20:53+00:00" + "time": "2023-09-19T15:27:56+00:00" }, { "name": "phpstan/phpstan-doctrine", From 587009f27bfc56d5c0c90ca0b2fe0df64a661cd7 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 20 Sep 2023 15:00:34 +0200 Subject: [PATCH 479/730] chore: Change requirements of cocur/slugify to prevent problems in different PHP versions --- .github/workflows/phpunit.yml | 2 +- Makefile | 2 +- UPGRADE-5.7.md | 2 +- build/build.xml | 2 +- composer.json | 2 +- composer.lock | 14 +++++++------- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 2bd576fb073..ba85aec8468 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -51,7 +51,7 @@ jobs: - run: devenv shell info-setup - run: sudo mount -t tmpfs tmpfs $(pwd)/.devenv/profile/lib/mysql -o size=4G - run: devenv up & - - run: devenv shell composer update laminas/laminas-code + - run: devenv shell composer update laminas/laminas-code cocur/slugify - run: devenv shell test-phpunit mysql: diff --git a/Makefile b/Makefile index 5ad555e4cc0..4610d966fa3 100644 --- a/Makefile +++ b/Makefile @@ -130,7 +130,7 @@ debug-config-test: .make.config.build.debug touch $@ .make.install.composer-dependencies: - composer update laminas/laminas-code + composer update laminas/laminas-code cocur/slugify composer install composer install -d recovery/common composer bin all install diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 2ce86a4b948..0933bdc7a01 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -11,7 +11,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Changed behaviour of the translation transfer while setting a product variant as the main variant * Changed the test kernel, so PHPUnit tests do no longer ignore PHP warnings and notices and are failing instead -* Updated `cocur/slugify` to version 4.4.0 +* Updated `cocur/slugify` to version 4.5.1 for PHP 8.0 and newer * Updated `doctrine/orm` to version 2.15.5 * Updated `google/cloud-storage` to version 1.33.2 * Updated `guzzlehttp/guzzle` to version 7.8.0 diff --git a/build/build.xml b/build/build.xml index d06f700dbf0..d7015aaea82 100644 --- a/build/build.xml +++ b/build/build.xml @@ -99,7 +99,7 @@ - + diff --git a/composer.json b/composer.json index dbaf9b09837..e007fd53114 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ "bcremer/line-reader": "1.3.0", "beberlei/assert": "3.3.2", "beberlei/doctrineextensions": "1.3.0", - "cocur/slugify": "4.4.0", + "cocur/slugify": "4.3.0 || 4.5.1", "doctrine/annotations": "1.14.3", "doctrine/cache": "1.13.0", "doctrine/collections": "1.8.0", diff --git a/composer.lock b/composer.lock index ee63037b78c..0ad58e1eeb6 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": "50294badfd2e0cd32d90ecafd51fb467", + "content-hash": "a39fd5ba20eaa67be044cb23fe3255f1", "packages": [ { "name": "aws/aws-crt-php", @@ -388,16 +388,16 @@ }, { "name": "cocur/slugify", - "version": "v4.4.0", + "version": "v4.3.0", "source": { "type": "git", "url": "https://github.com/cocur/slugify.git", - "reference": "4c6ed14a087ca061b220ffda640c07644946e2a0" + "reference": "652234ef5f1be844a2ae1c36ad1b4c88b05160f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cocur/slugify/zipball/4c6ed14a087ca061b220ffda640c07644946e2a0", - "reference": "4c6ed14a087ca061b220ffda640c07644946e2a0", + "url": "https://api.github.com/repos/cocur/slugify/zipball/652234ef5f1be844a2ae1c36ad1b4c88b05160f9", + "reference": "652234ef5f1be844a2ae1c36ad1b4c88b05160f9", "shasum": "" }, "require": { @@ -456,9 +456,9 @@ ], "support": { "issues": "https://github.com/cocur/slugify/issues", - "source": "https://github.com/cocur/slugify/tree/v4.4.0" + "source": "https://github.com/cocur/slugify/tree/v4.3.0" }, - "time": "2023-08-05T09:42:11+00:00" + "time": "2022-12-07T19:48:48+00:00" }, { "name": "doctrine/annotations", From 9ed9a2b5109e59cf85d47531ccc13bc13bff4b6a Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 20 Sep 2023 15:02:01 +0200 Subject: [PATCH 480/730] chore: Update PHPUnit to 9.6.13 --- composer.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/composer.lock b/composer.lock index 0ad58e1eeb6..1da9657a365 100644 --- a/composer.lock +++ b/composer.lock @@ -8891,16 +8891,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.27", + "version": "9.2.29", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1" + "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/b0a88255cb70d52653d80c890bd7f38740ea50d1", - "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76", + "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76", "shasum": "" }, "require": { @@ -8957,7 +8957,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.27" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29" }, "funding": [ { @@ -8965,7 +8965,7 @@ "type": "github" } ], - "time": "2023-07-26T13:44:30+00:00" + "time": "2023-09-19T04:57:46+00:00" }, { "name": "phpunit/php-file-iterator", @@ -9210,16 +9210,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.11", + "version": "9.6.13", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "810500e92855eba8a7a5319ae913be2da6f957b0" + "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/810500e92855eba8a7a5319ae913be2da6f957b0", - "reference": "810500e92855eba8a7a5319ae913be2da6f957b0", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f3d767f7f9e191eab4189abe41ab37797e30b1be", + "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be", "shasum": "" }, "require": { @@ -9234,7 +9234,7 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.13", + "phpunit/php-code-coverage": "^9.2.28", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -9293,7 +9293,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.11" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.13" }, "funding": [ { @@ -9309,7 +9309,7 @@ "type": "tidelift" } ], - "time": "2023-08-19T07:10:56+00:00" + "time": "2023-09-19T05:39:22+00:00" }, { "name": "sebastian/cli-parser", From 9169ffd99ae2351195fb9eee8e3b7c965120c7f5 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 20 Sep 2023 15:02:54 +0200 Subject: [PATCH 481/730] chore: Update indirect dependencies --- composer.lock | 179 ++++++++++++++++++++++++++------------------------ 1 file changed, 94 insertions(+), 85 deletions(-) diff --git a/composer.lock b/composer.lock index 1da9657a365..ce37643c3cd 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "aws/aws-crt-php", - "version": "v1.2.1", + "version": "v1.2.2", "source": { "type": "git", "url": "https://github.com/awslabs/aws-crt-php.git", - "reference": "1926277fc71d253dfa820271ac5987bdb193ccf5" + "reference": "2f1dc7b7eda080498be96a4a6d683a41583030e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/1926277fc71d253dfa820271ac5987bdb193ccf5", - "reference": "1926277fc71d253dfa820271ac5987bdb193ccf5", + "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/2f1dc7b7eda080498be96a4a6d683a41583030e9", + "reference": "2f1dc7b7eda080498be96a4a6d683a41583030e9", "shasum": "" }, "require": { @@ -56,22 +56,22 @@ ], "support": { "issues": "https://github.com/awslabs/aws-crt-php/issues", - "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.1" + "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.2" }, - "time": "2023-03-24T20:22:19+00:00" + "time": "2023-07-20T16:49:55+00:00" }, { "name": "aws/aws-sdk-php", - "version": "3.275.5", + "version": "3.281.10", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "d46961b82e857f77059c0c78160719ecb26f6cc6" + "reference": "049604298f769fa218549d8ff5cac1981f0a349a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d46961b82e857f77059c0c78160719ecb26f6cc6", - "reference": "d46961b82e857f77059c0c78160719ecb26f6cc6", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/049604298f769fa218549d8ff5cac1981f0a349a", + "reference": "049604298f769fa218549d8ff5cac1981f0a349a", "shasum": "" }, "require": { @@ -80,11 +80,11 @@ "ext-pcre": "*", "ext-simplexml": "*", "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5", - "guzzlehttp/promises": "^1.4.0", + "guzzlehttp/promises": "^1.4.0 || ^2.0", "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", "mtdowling/jmespath.php": "^2.6", - "php": ">=5.5", - "psr/http-message": "^1.0" + "php": ">=7.2.5", + "psr/http-message": "^1.0 || ^2.0" }, "require-dev": { "andrewsville/php-token-reflection": "^1.4", @@ -99,7 +99,7 @@ "ext-sockets": "*", "nette/neon": "^2.3", "paragonie/random_compat": ">= 2", - "phpunit/phpunit": "^4.8.35 || ^5.6.3 || ^9.5", + "phpunit/phpunit": "^5.6.3 || ^8.5 || ^9.5", "psr/cache": "^1.0", "psr/simple-cache": "^1.0", "sebastian/comparator": "^1.2.3 || ^4.0", @@ -151,9 +151,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.275.5" + "source": "https://github.com/aws/aws-sdk-php/tree/3.281.10" }, - "time": "2023-07-07T18:20:11+00:00" + "time": "2023-09-19T18:33:42+00:00" }, { "name": "bcremer/line-reader", @@ -1718,16 +1718,16 @@ }, { "name": "firebase/php-jwt", - "version": "v6.8.0", + "version": "v6.8.1", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "48b0210c51718d682e53210c24d25c5a10a2299b" + "reference": "5dbc8959427416b8ee09a100d7a8588c00fb2e26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/48b0210c51718d682e53210c24d25c5a10a2299b", - "reference": "48b0210c51718d682e53210c24d25c5a10a2299b", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/5dbc8959427416b8ee09a100d7a8588c00fb2e26", + "reference": "5dbc8959427416b8ee09a100d7a8588c00fb2e26", "shasum": "" }, "require": { @@ -1775,9 +1775,9 @@ ], "support": { "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v6.8.0" + "source": "https://github.com/firebase/php-jwt/tree/v6.8.1" }, - "time": "2023-06-20T16:45:35+00:00" + "time": "2023-07-14T18:33:00+00:00" }, { "name": "friendsofphp/proxy-manager-lts", @@ -2168,29 +2168,33 @@ }, { "name": "guzzlehttp/promises", - "version": "1.5.3", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e" + "reference": "111166291a0f8130081195ac4556a5587d7f1b5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e", - "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e", + "url": "https://api.github.com/repos/guzzle/promises/zipball/111166291a0f8130081195ac4556a5587d7f1b5d", + "reference": "111166291a0f8130081195ac4556a5587d7f1b5d", "shasum": "" }, "require": { - "php": ">=5.5" + "php": "^7.2.5 || ^8.0" }, "require-dev": { - "symfony/phpunit-bridge": "^4.4 || ^5.1" + "bamarni/composer-bin-plugin": "^1.8.1", + "phpunit/phpunit": "^8.5.29 || ^9.5.23" }, "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + } + }, "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { "GuzzleHttp\\Promise\\": "src/" } @@ -2227,7 +2231,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.3" + "source": "https://github.com/guzzle/promises/tree/2.0.1" }, "funding": [ { @@ -2243,7 +2247,7 @@ "type": "tidelift" } ], - "time": "2023-05-21T12:31:43+00:00" + "time": "2023-08-03T15:11:55+00:00" }, { "name": "guzzlehttp/psr7", @@ -2650,26 +2654,26 @@ }, { "name": "league/mime-type-detection", - "version": "1.11.0", + "version": "1.13.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd" + "reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd", - "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/a6dfb1194a2946fcdc1f38219445234f65b35c96", + "reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96", "shasum": "" }, "require": { "ext-fileinfo": "*", - "php": "^7.2 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.2", "phpstan/phpstan": "^0.12.68", - "phpunit/phpunit": "^8.5.8 || ^9.3" + "phpunit/phpunit": "^8.5.8 || ^9.3 || ^10.0" }, "type": "library", "autoload": { @@ -2690,7 +2694,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.11.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.13.0" }, "funding": [ { @@ -2702,7 +2706,7 @@ "type": "tidelift" } ], - "time": "2022-04-17T13:12:02+00:00" + "time": "2023-08-05T12:09:49+00:00" }, { "name": "monolog/monolog", @@ -2889,20 +2893,20 @@ }, { "name": "mpdf/psr-http-message-shim", - "version": "1.0.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/mpdf/psr-http-message-shim.git", - "reference": "3206e6b80b6d2479e148ee497e9f2bebadc919db" + "reference": "1cf4c0b68b8461cea27411ff961482ce7687e34f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mpdf/psr-http-message-shim/zipball/3206e6b80b6d2479e148ee497e9f2bebadc919db", - "reference": "3206e6b80b6d2479e148ee497e9f2bebadc919db", + "url": "https://api.github.com/repos/mpdf/psr-http-message-shim/zipball/1cf4c0b68b8461cea27411ff961482ce7687e34f", + "reference": "1cf4c0b68b8461cea27411ff961482ce7687e34f", "shasum": "" }, "require": { - "psr/http-message": "^1.0" + "psr/http-message": "^2.0" }, "type": "library", "autoload": { @@ -2931,9 +2935,9 @@ "description": "Shim to allow support of different psr/message versions.", "support": { "issues": "https://github.com/mpdf/psr-http-message-shim/issues", - "source": "https://github.com/mpdf/psr-http-message-shim/tree/1.0.0" + "source": "https://github.com/mpdf/psr-http-message-shim/tree/2.0.0" }, - "time": "2023-09-01T05:59:47+00:00" + "time": "2023-09-01T06:08:18+00:00" }, { "name": "mpdf/psr-log-aware-trait", @@ -2981,25 +2985,25 @@ }, { "name": "mtdowling/jmespath.php", - "version": "2.6.1", + "version": "2.7.0", "source": { "type": "git", "url": "https://github.com/jmespath/jmespath.php.git", - "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb" + "reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb", - "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb", + "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/bbb69a935c2cbb0c03d7f481a238027430f6440b", + "reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b", "shasum": "" }, "require": { - "php": "^5.4 || ^7.0 || ^8.0", + "php": "^7.2.5 || ^8.0", "symfony/polyfill-mbstring": "^1.17" }, "require-dev": { - "composer/xdebug-handler": "^1.4 || ^2.0", - "phpunit/phpunit": "^4.8.36 || ^7.5.15" + "composer/xdebug-handler": "^3.0.3", + "phpunit/phpunit": "^8.5.33" }, "bin": [ "bin/jp.php" @@ -3007,7 +3011,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.7-dev" } }, "autoload": { @@ -3023,6 +3027,11 @@ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", @@ -3036,9 +3045,9 @@ ], "support": { "issues": "https://github.com/jmespath/jmespath.php/issues", - "source": "https://github.com/jmespath/jmespath.php/tree/2.6.1" + "source": "https://github.com/jmespath/jmespath.php/tree/2.7.0" }, - "time": "2021-06-14T00:11:39+00:00" + "time": "2023-08-25T10:54:48+00:00" }, { "name": "myclabs/deep-copy", @@ -3357,16 +3366,16 @@ }, { "name": "psr/http-message", - "version": "1.1", + "version": "2.0", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", - "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71", + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71", "shasum": "" }, "require": { @@ -3375,7 +3384,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -3390,7 +3399,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP messages", @@ -3404,9 +3413,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/1.1" + "source": "https://github.com/php-fig/http-message/tree/2.0" }, - "time": "2023-04-04T09:50:52+00:00" + "time": "2023-04-04T09:54:51+00:00" }, { "name": "psr/link", @@ -7828,16 +7837,16 @@ }, { "name": "composer/semver", - "version": "3.3.2", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9" + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9", + "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", "shasum": "" }, "require": { @@ -7887,9 +7896,9 @@ "versioning" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.3.2" + "source": "https://github.com/composer/semver/tree/3.4.0" }, "funding": [ { @@ -7905,7 +7914,7 @@ "type": "tidelift" } ], - "time": "2022-04-01T19:23:25+00:00" + "time": "2023-08-31T09:50:34+00:00" }, { "name": "friends-of-behat/mink-extension", @@ -8037,16 +8046,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.16.0", + "version": "v4.17.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "19526a33fb561ef417e822e85f08a00db4059c17" + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17", - "reference": "19526a33fb561ef417e822e85f08a00db4059c17", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", "shasum": "" }, "require": { @@ -8087,9 +8096,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" }, - "time": "2023-06-25T14:52:30+00:00" + "time": "2023-08-13T19:53:39+00:00" }, { "name": "phar-io/manifest", @@ -8367,16 +8376,16 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.7.2", + "version": "1.7.3", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "b2fe4d22a5426f38e014855322200b97b5362c0d" + "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b2fe4d22a5426f38e014855322200b97b5362c0d", - "reference": "b2fe4d22a5426f38e014855322200b97b5362c0d", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", + "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", "shasum": "" }, "require": { @@ -8419,9 +8428,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.2" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.3" }, - "time": "2023-05-30T18:13:47+00:00" + "time": "2023-08-12T11:01:26+00:00" }, { "name": "phpspec/prophecy", From bccfad82e17b0459c57b1e227fcbde8ef6901309 Mon Sep 17 00:00:00 2001 From: Susanne Hartung Date: Thu, 6 Jul 2023 16:44:55 +0200 Subject: [PATCH 482/730] fix(SW-27151): split emails before validation Separates the transmitted addresses before passing them to the validation. Otherwise they will always be validated to false. --- engine/Shopware/Controllers/Backend/Base.php | 15 +++++--- .../Controllers/Backend/BaseTest.php | 38 +++++++++++++++++++ 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/engine/Shopware/Controllers/Backend/Base.php b/engine/Shopware/Controllers/Backend/Base.php index ec001c7705f..f4d977b1b37 100644 --- a/engine/Shopware/Controllers/Backend/Base.php +++ b/engine/Shopware/Controllers/Backend/Base.php @@ -1043,15 +1043,20 @@ public function validateEmailAction() $this->Front()->Plugins()->ViewRenderer()->setNoRender(); $this->Front()->Plugins()->Json()->setRenderer(false); - $email = $this->Request()->getParam('value'); + $emails = explode(',', (string) $this->Request()->getParam('value', '')); /** @var EmailValidatorInterface $emailValidator */ $emailValidator = $this->container->get(EmailValidator::class); - if ($emailValidator->isValid($email)) { - $this->Response()->setContent(1); - } else { - $this->Response()->setContent(''); + + foreach ($emails as $email) { + if (!$emailValidator->isValid($email)) { + $this->Response()->setContent(''); + + return; + } } + + $this->Response()->setContent(1); } public function getSalutationsAction() diff --git a/tests/Functional/Controllers/Backend/BaseTest.php b/tests/Functional/Controllers/Backend/BaseTest.php index b53d060aa6a..67949b84a2a 100644 --- a/tests/Functional/Controllers/Backend/BaseTest.php +++ b/tests/Functional/Controllers/Backend/BaseTest.php @@ -26,8 +26,10 @@ use Enlight_Components_Test_Controller_TestCase; use Enlight_Controller_Request_RequestTestCase; +use Enlight_Controller_Response_ResponseTestCase; use Enlight_Template_Manager; use Enlight_View_Default; +use Generator; use Shopware\Tests\Functional\Traits\ContainerTrait; use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour; use Shopware_Controllers_Backend_Base; @@ -214,6 +216,42 @@ public function provideSearchString(): array ]; } + /** + * @dataProvider provideEmails + */ + public function testValidateEmailAction(string $emails, bool $expectedIsValid): void + { + $request = new Enlight_Controller_Request_RequestTestCase(); + $response = new Enlight_Controller_Response_ResponseTestCase(); + $request->setParam('value', $emails); + + $controller = $this->createController(); + $controller->setRequest($request); + $controller->setResponse($response); + $controller->validateEmailAction(); + + static::assertSame($expectedIsValid, (bool) $response->getContent()); + } + + /** + * @return Generator + */ + public function provideEmails(): Generator + { + yield '1 mail shall be valid' => [ + 'emails' => 'email@shopware.com', + 'expectedIsValid' => true, + ]; + yield '3 mails shall be valid' => [ + 'emails' => 'email@shopware.com,email2@shopware.com,email3@shopware.com', + 'expectedIsValid' => true, + ]; + yield '3 mail shall be invalid' => [ + 'emails' => 'email@shopware.com,email2@shopware.com,email3@shopware.com||test', + 'expectedIsValid' => false, + ]; + } + private function createController(): Shopware_Controllers_Backend_Base { $controller = $this->getContainer()->get('shopware_controllers_backend_base'); From bac6d9bb695732e73bd924e3611b771b97eaf583 Mon Sep 17 00:00:00 2001 From: Susanne Hartung Date: Tue, 11 Jul 2023 08:39:47 +0200 Subject: [PATCH 483/730] fix(SW-27151): removes whitespaces from e-Mails Otherwise they are always validated to false. --- engine/Shopware/Controllers/Backend/Base.php | 2 +- tests/Functional/Controllers/Backend/BaseTest.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/engine/Shopware/Controllers/Backend/Base.php b/engine/Shopware/Controllers/Backend/Base.php index f4d977b1b37..ff4a4522259 100644 --- a/engine/Shopware/Controllers/Backend/Base.php +++ b/engine/Shopware/Controllers/Backend/Base.php @@ -1043,7 +1043,7 @@ public function validateEmailAction() $this->Front()->Plugins()->ViewRenderer()->setNoRender(); $this->Front()->Plugins()->Json()->setRenderer(false); - $emails = explode(',', (string) $this->Request()->getParam('value', '')); + $emails = array_map('trim', explode(',', (string) $this->Request()->getParam('value', ''))); /** @var EmailValidatorInterface $emailValidator */ $emailValidator = $this->container->get(EmailValidator::class); diff --git a/tests/Functional/Controllers/Backend/BaseTest.php b/tests/Functional/Controllers/Backend/BaseTest.php index 67949b84a2a..5e75b5a1e79 100644 --- a/tests/Functional/Controllers/Backend/BaseTest.php +++ b/tests/Functional/Controllers/Backend/BaseTest.php @@ -246,6 +246,10 @@ public function provideEmails(): Generator 'emails' => 'email@shopware.com,email2@shopware.com,email3@shopware.com', 'expectedIsValid' => true, ]; + yield '3 mails with whitespaces shall be valid' => [ + 'emails' => 'email@shopware.com , email2@shopware.com , email3@shopware.com', + 'expectedIsValid' => true, + ]; yield '3 mail shall be invalid' => [ 'emails' => 'email@shopware.com,email2@shopware.com,email3@shopware.com||test', 'expectedIsValid' => false, From c590e8a90ec5fd603b7f2e4d520448644e071800 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 21 Sep 2023 13:09:30 +0200 Subject: [PATCH 484/730] test: refactor existing savePositionAction test a bit --- .../Controllers/Backend/OrderTest.php | 66 +++++++++++-------- 1 file changed, 38 insertions(+), 28 deletions(-) diff --git a/tests/Functional/Controllers/Backend/OrderTest.php b/tests/Functional/Controllers/Backend/OrderTest.php index f458af18d0a..4e437173b86 100644 --- a/tests/Functional/Controllers/Backend/OrderTest.php +++ b/tests/Functional/Controllers/Backend/OrderTest.php @@ -67,11 +67,16 @@ class OrderTest extends ControllerTestCase private const GERMANY_COUNTRY_ID = 2; private const NRW_STATE_ID = 3; private const GERMANY_AREA_ID = 1; - private const PRODUCT_GRADUATED_PRICES_DEMODATA_ORDERNUMBER = 'SW10208'; + private const PRODUCT_GRADUATED_PRICES_DEMODATA_ORDER_NUMBER = 'SW10208'; + private const PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_ID = 209; + private const PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_VARIANT_ID = 747; private const PRODUCT_GRADUATED_PRICES_DEMODATA_NAME = 'Staffelpreise'; - private const PRODUCT_GRADUATED_PRICES_VARIANT1_ORDERNUMBER = 'SW10090.1'; - private const PRODUCT_GRADUATED_PRICES_VARIANT2_ORDERNUMBER = 'SW10090.2'; + private const PRODUCT_GRADUATED_PRICES_VARIANT1_ORDER_NUMBER = 'SW10090.1'; + private const PRODUCT_GRADUATED_PRICES_VARIANT1_PRODUCT_VARIANT_ID = 153; + private const PRODUCT_GRADUATED_PRICES_VARIANT2_ORDER_NUMBER = 'SW10090.2'; + private const PRODUCT_GRADUATED_PRICES_VARIANT2_PRODUCT_VARIANT_ID = 154; private const PRODUCT_GRADUATED_PRICES_VARIANT_NAME = 'Teigschaber'; + private const PRODUCT_GRADUATED_PRICES_VARIANT_PRODUCT_ID = 89; private Connection $connection; @@ -242,25 +247,18 @@ public function testSavingOrderWithDifferentTimeZone(): void * * @throws Exception */ - public function testSavePositionActionReturnValuesForGraduatedPrices(array $params, array $expectedValues): void + public function testSavePositionActionReturnValuesForGraduatedPricesByAddingNewPositions(array $params, array $expectedValues): void { - $order = $this->modelManager->find(Order::class, $params['orderId']); - static::assertInstanceOf(Order::class, $order); - $productPricesSql = file_get_contents(__DIR__ . '/_fixtures/article/graduatedPrices.sql'); static::assertIsString($productPricesSql); $this->connection->executeQuery($productPricesSql); + $order = $this->modelManager->find(Order::class, $params['orderId']); + static::assertInstanceOf(Order::class, $order); $request = new Enlight_Controller_Request_RequestTestCase(); - $request->setParams([ + $request->setParams(array_merge([ 'id' => 0, - 'orderId' => $params['orderId'], 'mode' => 0, - 'articleId' => 9, - 'articleDetailId' => null, - 'articleNumber' => $params['productNumber'], - 'articleName' => $params['productName'], - 'quantity' => $params['quantity'], 'statusId' => 0, 'statusDescription' => '', 'taxId' => 1, @@ -268,7 +266,7 @@ public function testSavePositionActionReturnValuesForGraduatedPrices(array $para 'taxDescription' => '', 'inStock' => 0, 'changed' => $order->getChanged() ? $order->getChanged()->format(DateTimeInterface::ATOM) : '', - ]); + ], $params)); $controller = $this->getController(); $controller->setRequest($request); @@ -281,15 +279,17 @@ public function testSavePositionActionReturnValuesForGraduatedPrices(array $para } /** - * @return Generator + * @return Generator */ public function provideProductParamsForSavePositionActionTestingGraduatedPrices(): Generator { yield 'customer-group H with netto-shop-price-config has to return fallback prices for EK' => [ 'params' => [ 'orderId' => self::ORDER_ID_DEMODATA_H, - 'productNumber' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_ORDERNUMBER, - 'productName' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_NAME, + 'articleNumber' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_ORDER_NUMBER, + 'articleName' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_NAME, + 'articleId' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_ID, + 'articleDetailId' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_VARIANT_ID, 'quantity' => 30, ], 'expectedValues' => [ @@ -300,8 +300,10 @@ public function provideProductParamsForSavePositionActionTestingGraduatedPrices( yield 'customer-group EK' => [ 'params' => [ 'orderId' => self::ORDER_ID_DEMODATA_EK, - 'productNumber' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_ORDERNUMBER, - 'productName' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_NAME, + 'articleNumber' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_ORDER_NUMBER, + 'articleName' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_NAME, + 'articleId' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_ID, + 'articleDetailId' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_VARIANT_ID, 'quantity' => 30, ], 'expectedValues' => [ @@ -312,8 +314,10 @@ public function provideProductParamsForSavePositionActionTestingGraduatedPrices( yield 'product with variants - variant 1 - customer-group EK' => [ 'params' => [ 'orderId' => self::ORDER_ID_DEMODATA_EK, - 'productNumber' => self::PRODUCT_GRADUATED_PRICES_VARIANT1_ORDERNUMBER, - 'productName' => self::PRODUCT_GRADUATED_PRICES_VARIANT_NAME, + 'articleNumber' => self::PRODUCT_GRADUATED_PRICES_VARIANT1_ORDER_NUMBER, + 'articleName' => self::PRODUCT_GRADUATED_PRICES_VARIANT_NAME, + 'articleId' => self::PRODUCT_GRADUATED_PRICES_VARIANT_PRODUCT_ID, + 'articleDetailId' => self::PRODUCT_GRADUATED_PRICES_VARIANT1_PRODUCT_VARIANT_ID, 'quantity' => 5, ], 'expectedValues' => [ @@ -324,8 +328,10 @@ public function provideProductParamsForSavePositionActionTestingGraduatedPrices( yield 'product with variants - variant 2 - customer-group EK' => [ 'params' => [ 'orderId' => self::ORDER_ID_DEMODATA_EK, - 'productNumber' => self::PRODUCT_GRADUATED_PRICES_VARIANT2_ORDERNUMBER, - 'productName' => self::PRODUCT_GRADUATED_PRICES_VARIANT_NAME, + 'articleNumber' => self::PRODUCT_GRADUATED_PRICES_VARIANT2_ORDER_NUMBER, + 'articleName' => self::PRODUCT_GRADUATED_PRICES_VARIANT_NAME, + 'articleId' => self::PRODUCT_GRADUATED_PRICES_VARIANT_PRODUCT_ID, + 'articleDetailId' => self::PRODUCT_GRADUATED_PRICES_VARIANT2_PRODUCT_VARIANT_ID, 'quantity' => 21, ], 'expectedValues' => [ @@ -336,8 +342,10 @@ public function provideProductParamsForSavePositionActionTestingGraduatedPrices( yield 'product with variants - variant 1 - customer-group H - netto' => [ 'params' => [ 'orderId' => self::ORDER_ID_DEMODATA_H, - 'productNumber' => self::PRODUCT_GRADUATED_PRICES_VARIANT1_ORDERNUMBER, - 'productName' => self::PRODUCT_GRADUATED_PRICES_VARIANT_NAME, + 'articleNumber' => self::PRODUCT_GRADUATED_PRICES_VARIANT1_ORDER_NUMBER, + 'articleName' => self::PRODUCT_GRADUATED_PRICES_VARIANT_NAME, + 'articleId' => self::PRODUCT_GRADUATED_PRICES_VARIANT_PRODUCT_ID, + 'articleDetailId' => self::PRODUCT_GRADUATED_PRICES_VARIANT1_PRODUCT_VARIANT_ID, 'quantity' => 10, ], 'expectedValues' => [ @@ -348,8 +356,10 @@ public function provideProductParamsForSavePositionActionTestingGraduatedPrices( yield 'product with variants - variant 2 - customer-group H - netto' => [ 'params' => [ 'orderId' => self::ORDER_ID_DEMODATA_H, - 'productNumber' => self::PRODUCT_GRADUATED_PRICES_VARIANT2_ORDERNUMBER, - 'productName' => self::PRODUCT_GRADUATED_PRICES_VARIANT_NAME, + 'articleNumber' => self::PRODUCT_GRADUATED_PRICES_VARIANT2_ORDER_NUMBER, + 'articleName' => self::PRODUCT_GRADUATED_PRICES_VARIANT_NAME, + 'articleId' => self::PRODUCT_GRADUATED_PRICES_VARIANT_PRODUCT_ID, + 'articleDetailId' => self::PRODUCT_GRADUATED_PRICES_VARIANT2_PRODUCT_VARIANT_ID, 'quantity' => 42, ], 'expectedValues' => [ From 19af44157d3c3d86074040cce13b1bcf5206d41b Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 21 Sep 2023 14:47:46 +0200 Subject: [PATCH 485/730] fix(SW-27165): Change consideration of graduated prices in order module While adding new positions to an existing order in the backend order module, graduated prices are still considered. If an existing position is changed, the graduated price will only be checked and considered if the quantity was changed. With this change it is possible again to also set a custom price for a position that contains a product with graduated prices. --- engine/Shopware/Controllers/Backend/Order.php | 31 +++--- .../Controllers/Backend/OrderTest.php | 98 +++++++++++++++++++ 2 files changed, 116 insertions(+), 13 deletions(-) diff --git a/engine/Shopware/Controllers/Backend/Order.php b/engine/Shopware/Controllers/Backend/Order.php index e24e110db9b..71f9b742001 100644 --- a/engine/Shopware/Controllers/Backend/Order.php +++ b/engine/Shopware/Controllers/Backend/Order.php @@ -117,7 +117,7 @@ class Shopware_Controllers_Backend_Order extends Shopware_Controllers_Backend_Ex /** * @deprecated - Will be removed in Shopware 5.8 without a replacement - * Contains the dynamic receipt repository + * Contains the order document repository * * @var OrderDocumentRepository */ @@ -1950,7 +1950,17 @@ private function getPositionAssociatedData(array $data, Order $order): array $shopContext = $this->createShopContext($order); $data = $this->checkTaxRule($data, $shopContext); - if ($this->hasProductGraduatedPrices($data['articleNumber'], $order)) { + $orderPosition = null; + foreach ($order->getDetails() as $position) { + if ($position->getId() === (int) $data['id']) { + $orderPosition = $position; + break; + } + } + // Only get graduated price if a new position should be added or quantity has changed + if (($orderPosition === null || $orderPosition->getQuantity() !== (int) $data['quantity']) + && $this->hasProductGraduatedPrices($data['articleNumber'], $order) + ) { $data = $this->checkPrice($data, $order, $shopContext); } @@ -2106,20 +2116,15 @@ private function checkTaxRule(array $data, ShopContextInterface $shopContext): a return $data; } - private function hasProductGraduatedPrices(string $productNumber, ORDER $order): bool + private function hasProductGraduatedPrices(string $productNumber, Order $order): bool { $customerGroupKey = $this->getCustomerGroupKey($order); - $sql = 'SELECT - prices.pricegroup, count(*) - FROM - s_articles_prices AS prices - INNER JOIN - s_articles_details ON prices.articledetailsID = s_articles_details.id - WHERE - s_articles_details.ordernumber = :productNumber - GROUP BY - prices.pricegroup;'; + $sql = 'SELECT prices.pricegroup, count(*) + FROM s_articles_prices AS prices + INNER JOIN s_articles_details ON prices.articledetailsID = s_articles_details.id + WHERE s_articles_details.ordernumber = :productNumber + GROUP BY prices.pricegroup;'; $result = $this->container->get(Connection::class)->executeQuery($sql, ['productNumber' => $productNumber])->fetchAllKeyValue(); diff --git a/tests/Functional/Controllers/Backend/OrderTest.php b/tests/Functional/Controllers/Backend/OrderTest.php index 4e437173b86..9c6ed5c9935 100644 --- a/tests/Functional/Controllers/Backend/OrderTest.php +++ b/tests/Functional/Controllers/Backend/OrderTest.php @@ -369,6 +369,104 @@ public function provideProductParamsForSavePositionActionTestingGraduatedPrices( ]; } + /** + * @dataProvider provideProductParamsForSavePositionActionOnExistingPosition + * + * @param array{quantity?: int, price?: float, total?: float} $params + * @param array{price: float, total: float} $expectedValues + */ + public function testSavePositionActionReturnValuesForGraduatedPricesOnExistingPosition(array $params, array $expectedValues): void + { + $order = $this->modelManager->getRepository(Order::class)->findOneBy([]); + static::assertInstanceOf(Order::class, $order); + $newPositionParams = [ + 'id' => 0, + 'orderId' => $order->getId(), + 'articleNumber' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_ORDER_NUMBER, + 'articleName' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_NAME, + 'articleId' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_ID, + 'articleDetailId' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_VARIANT_ID, + 'mode' => 0, + 'quantity' => 2, + 'statusId' => 0, + 'statusDescription' => '', + 'taxId' => 1, + 'taxRate' => 19.0, + 'taxDescription' => '', + 'inStock' => 0, + 'changed' => $order->getChanged() ? $order->getChanged()->format(DateTimeInterface::ATOM) : '', + ]; + + $request = new Enlight_Controller_Request_RequestTestCase(); + $request->setParams($newPositionParams); + + $controller = $this->getController(); + $controller->setRequest($request); + $controller->savePositionAction(); + $results = $controller->View()->getAssign(); + + static::assertTrue($results['success'], $results['message'] ?? ''); + static::assertSame(0.84, $results['data']['price']); + static::assertSame(1.68, $results['data']['total']); + + $this->modelManager->refresh($order); + $changeQuantityParams = [ + 'id' => $results['data']['id'], + 'price' => $results['data']['price'], + 'total' => $results['data']['total'], + 'changed' => $order->getChanged() ? $order->getChanged()->format(DateTimeInterface::ATOM) : '', + ]; + $changeQuantityParams = array_merge($newPositionParams, $changeQuantityParams, $params); + + $request = new Enlight_Controller_Request_RequestTestCase(); + $request->setParams($changeQuantityParams); + + $controller->setRequest($request); + $controller->savePositionAction(); + $results = $controller->View()->getAssign(); + + static::assertTrue($results['success'], $results['message'] ?? ''); + static::assertSame($expectedValues['price'], $results['data']['price']); + static::assertSame($expectedValues['total'], $results['data']['total']); + } + + /** + * @return Generator + */ + public function provideProductParamsForSavePositionActionOnExistingPosition(): Generator + { + yield 'Only change quantity, graduated price should be considered' => [ + 'params' => [ + 'quantity' => 20, + ], + 'expectedValues' => [ + 'price' => 0.76, + 'total' => 15.2, + ], + ]; + yield 'Only change price, graduated price should be ignored' => [ + 'params' => [ + 'price' => 0.15, + 'total' => 0.30, + ], + 'expectedValues' => [ + 'price' => 0.15, + 'total' => 0.30, + ], + ]; + yield 'Change quantity and price, graduated price should be considered' => [ + 'params' => [ + 'quantity' => 30, + 'price' => 0.15, + 'total' => 0.30, + ], + 'expectedValues' => [ + 'price' => 0.67, + 'total' => 20.1, + ], + ]; + } + /** * @dataProvider provideTaxRuleParams */ From 749679d338eec4f62d536e78707db8c4f016c829 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 21 Sep 2023 13:09:30 +0200 Subject: [PATCH 486/730] test: refactor existing savePositionAction test a bit --- .../Controllers/Backend/OrderTest.php | 66 +++++++++++-------- 1 file changed, 38 insertions(+), 28 deletions(-) diff --git a/tests/Functional/Controllers/Backend/OrderTest.php b/tests/Functional/Controllers/Backend/OrderTest.php index e6dcce8bfc3..a4860a506dc 100644 --- a/tests/Functional/Controllers/Backend/OrderTest.php +++ b/tests/Functional/Controllers/Backend/OrderTest.php @@ -68,11 +68,16 @@ class OrderTest extends ControllerTestCase private const GERMANY_COUNTRY_ID = 2; private const NRW_STATE_ID = 3; private const GERMANY_AREA_ID = 1; - private const PRODUCT_GRADUATED_PRICES_DEMODATA_ORDERNUMBER = 'SW10208'; + private const PRODUCT_GRADUATED_PRICES_DEMODATA_ORDER_NUMBER = 'SW10208'; + private const PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_ID = 209; + private const PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_VARIANT_ID = 747; private const PRODUCT_GRADUATED_PRICES_DEMODATA_NAME = 'Staffelpreise'; - private const PRODUCT_GRADUATED_PRICES_VARIANT1_ORDERNUMBER = 'SW10090.1'; - private const PRODUCT_GRADUATED_PRICES_VARIANT2_ORDERNUMBER = 'SW10090.2'; + private const PRODUCT_GRADUATED_PRICES_VARIANT1_ORDER_NUMBER = 'SW10090.1'; + private const PRODUCT_GRADUATED_PRICES_VARIANT1_PRODUCT_VARIANT_ID = 153; + private const PRODUCT_GRADUATED_PRICES_VARIANT2_ORDER_NUMBER = 'SW10090.2'; + private const PRODUCT_GRADUATED_PRICES_VARIANT2_PRODUCT_VARIANT_ID = 154; private const PRODUCT_GRADUATED_PRICES_VARIANT_NAME = 'Teigschaber'; + private const PRODUCT_GRADUATED_PRICES_VARIANT_PRODUCT_ID = 89; private Connection $connection; @@ -243,25 +248,18 @@ public function testSavingOrderWithDifferentTimeZone(): void * * @throws Exception */ - public function testSavePositionActionReturnValuesForGraduatedPrices(array $params, array $expectedValues): void + public function testSavePositionActionReturnValuesForGraduatedPricesByAddingNewPositions(array $params, array $expectedValues): void { - $order = $this->modelManager->find(Order::class, $params['orderId']); - static::assertInstanceOf(Order::class, $order); - $productPricesSql = file_get_contents(__DIR__ . '/_fixtures/article/graduatedPrices.sql'); static::assertIsString($productPricesSql); $this->connection->executeQuery($productPricesSql); + $order = $this->modelManager->find(Order::class, $params['orderId']); + static::assertInstanceOf(Order::class, $order); $request = new Enlight_Controller_Request_RequestTestCase(); - $request->setParams([ + $request->setParams(array_merge([ 'id' => 0, - 'orderId' => $params['orderId'], 'mode' => 0, - 'articleId' => 9, - 'articleDetailId' => null, - 'articleNumber' => $params['productNumber'], - 'articleName' => $params['productName'], - 'quantity' => $params['quantity'], 'statusId' => 0, 'statusDescription' => '', 'taxId' => 1, @@ -269,7 +267,7 @@ public function testSavePositionActionReturnValuesForGraduatedPrices(array $para 'taxDescription' => '', 'inStock' => 0, 'changed' => $order->getChanged() ? $order->getChanged()->format(DateTimeInterface::ATOM) : '', - ]); + ], $params)); $controller = $this->getController(); $controller->setRequest($request); @@ -282,15 +280,17 @@ public function testSavePositionActionReturnValuesForGraduatedPrices(array $para } /** - * @return Generator + * @return Generator */ public function provideProductParamsForSavePositionActionTestingGraduatedPrices(): Generator { yield 'customer-group H with netto-shop-price-config has to return fallback prices for EK' => [ 'params' => [ 'orderId' => self::ORDER_ID_DEMODATA_H, - 'productNumber' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_ORDERNUMBER, - 'productName' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_NAME, + 'articleNumber' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_ORDER_NUMBER, + 'articleName' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_NAME, + 'articleId' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_ID, + 'articleDetailId' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_VARIANT_ID, 'quantity' => 30, ], 'expectedValues' => [ @@ -301,8 +301,10 @@ public function provideProductParamsForSavePositionActionTestingGraduatedPrices( yield 'customer-group EK' => [ 'params' => [ 'orderId' => self::ORDER_ID_DEMODATA_EK, - 'productNumber' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_ORDERNUMBER, - 'productName' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_NAME, + 'articleNumber' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_ORDER_NUMBER, + 'articleName' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_NAME, + 'articleId' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_ID, + 'articleDetailId' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_VARIANT_ID, 'quantity' => 30, ], 'expectedValues' => [ @@ -313,8 +315,10 @@ public function provideProductParamsForSavePositionActionTestingGraduatedPrices( yield 'product with variants - variant 1 - customer-group EK' => [ 'params' => [ 'orderId' => self::ORDER_ID_DEMODATA_EK, - 'productNumber' => self::PRODUCT_GRADUATED_PRICES_VARIANT1_ORDERNUMBER, - 'productName' => self::PRODUCT_GRADUATED_PRICES_VARIANT_NAME, + 'articleNumber' => self::PRODUCT_GRADUATED_PRICES_VARIANT1_ORDER_NUMBER, + 'articleName' => self::PRODUCT_GRADUATED_PRICES_VARIANT_NAME, + 'articleId' => self::PRODUCT_GRADUATED_PRICES_VARIANT_PRODUCT_ID, + 'articleDetailId' => self::PRODUCT_GRADUATED_PRICES_VARIANT1_PRODUCT_VARIANT_ID, 'quantity' => 5, ], 'expectedValues' => [ @@ -325,8 +329,10 @@ public function provideProductParamsForSavePositionActionTestingGraduatedPrices( yield 'product with variants - variant 2 - customer-group EK' => [ 'params' => [ 'orderId' => self::ORDER_ID_DEMODATA_EK, - 'productNumber' => self::PRODUCT_GRADUATED_PRICES_VARIANT2_ORDERNUMBER, - 'productName' => self::PRODUCT_GRADUATED_PRICES_VARIANT_NAME, + 'articleNumber' => self::PRODUCT_GRADUATED_PRICES_VARIANT2_ORDER_NUMBER, + 'articleName' => self::PRODUCT_GRADUATED_PRICES_VARIANT_NAME, + 'articleId' => self::PRODUCT_GRADUATED_PRICES_VARIANT_PRODUCT_ID, + 'articleDetailId' => self::PRODUCT_GRADUATED_PRICES_VARIANT2_PRODUCT_VARIANT_ID, 'quantity' => 21, ], 'expectedValues' => [ @@ -337,8 +343,10 @@ public function provideProductParamsForSavePositionActionTestingGraduatedPrices( yield 'product with variants - variant 1 - customer-group H - netto' => [ 'params' => [ 'orderId' => self::ORDER_ID_DEMODATA_H, - 'productNumber' => self::PRODUCT_GRADUATED_PRICES_VARIANT1_ORDERNUMBER, - 'productName' => self::PRODUCT_GRADUATED_PRICES_VARIANT_NAME, + 'articleNumber' => self::PRODUCT_GRADUATED_PRICES_VARIANT1_ORDER_NUMBER, + 'articleName' => self::PRODUCT_GRADUATED_PRICES_VARIANT_NAME, + 'articleId' => self::PRODUCT_GRADUATED_PRICES_VARIANT_PRODUCT_ID, + 'articleDetailId' => self::PRODUCT_GRADUATED_PRICES_VARIANT1_PRODUCT_VARIANT_ID, 'quantity' => 10, ], 'expectedValues' => [ @@ -349,8 +357,10 @@ public function provideProductParamsForSavePositionActionTestingGraduatedPrices( yield 'product with variants - variant 2 - customer-group H - netto' => [ 'params' => [ 'orderId' => self::ORDER_ID_DEMODATA_H, - 'productNumber' => self::PRODUCT_GRADUATED_PRICES_VARIANT2_ORDERNUMBER, - 'productName' => self::PRODUCT_GRADUATED_PRICES_VARIANT_NAME, + 'articleNumber' => self::PRODUCT_GRADUATED_PRICES_VARIANT2_ORDER_NUMBER, + 'articleName' => self::PRODUCT_GRADUATED_PRICES_VARIANT_NAME, + 'articleId' => self::PRODUCT_GRADUATED_PRICES_VARIANT_PRODUCT_ID, + 'articleDetailId' => self::PRODUCT_GRADUATED_PRICES_VARIANT2_PRODUCT_VARIANT_ID, 'quantity' => 42, ], 'expectedValues' => [ From cc98fbdc283409401ed6ea84fcce14e8b4005072 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 21 Sep 2023 14:47:46 +0200 Subject: [PATCH 487/730] fix(SW-27165): Change consideration of graduated prices in order module While adding new positions to an existing order in the backend order module, graduated prices are still considered. If an existing position is changed, the graduated price will only be checked and considered if the quantity was changed. With this change it is possible again to also set a custom price for a position that contains a product with graduated prices. --- engine/Shopware/Controllers/Backend/Order.php | 31 +++--- .../Controllers/Backend/OrderTest.php | 98 +++++++++++++++++++ 2 files changed, 116 insertions(+), 13 deletions(-) diff --git a/engine/Shopware/Controllers/Backend/Order.php b/engine/Shopware/Controllers/Backend/Order.php index 301082a138c..b09916d3b96 100644 --- a/engine/Shopware/Controllers/Backend/Order.php +++ b/engine/Shopware/Controllers/Backend/Order.php @@ -119,7 +119,7 @@ class Shopware_Controllers_Backend_Order extends Shopware_Controllers_Backend_Ex /** * @deprecated - Will be removed in Shopware 5.8 without a replacement - * Contains the dynamic receipt repository + * Contains the order document repository * * @var OrderDocumentRepository */ @@ -1952,7 +1952,17 @@ private function getPositionAssociatedData(array $data, Order $order): array $shopContext = $this->createShopContext($order); $data = $this->checkTaxRule($data, $shopContext); - if ($this->hasProductGraduatedPrices($data['articleNumber'], $order)) { + $orderPosition = null; + foreach ($order->getDetails() as $position) { + if ($position->getId() === (int) $data['id']) { + $orderPosition = $position; + break; + } + } + // Only get graduated price if a new position should be added or quantity has changed + if (($orderPosition === null || $orderPosition->getQuantity() !== (int) $data['quantity']) + && $this->hasProductGraduatedPrices($data['articleNumber'], $order) + ) { $data = $this->checkPrice($data, $order, $shopContext); } @@ -2108,20 +2118,15 @@ private function checkTaxRule(array $data, ShopContextInterface $shopContext): a return $data; } - private function hasProductGraduatedPrices(string $productNumber, ORDER $order): bool + private function hasProductGraduatedPrices(string $productNumber, Order $order): bool { $customerGroupKey = $this->getCustomerGroupKey($order); - $sql = 'SELECT - prices.pricegroup, count(*) - FROM - s_articles_prices AS prices - INNER JOIN - s_articles_details ON prices.articledetailsID = s_articles_details.id - WHERE - s_articles_details.ordernumber = :productNumber - GROUP BY - prices.pricegroup;'; + $sql = 'SELECT prices.pricegroup, count(*) + FROM s_articles_prices AS prices + INNER JOIN s_articles_details ON prices.articledetailsID = s_articles_details.id + WHERE s_articles_details.ordernumber = :productNumber + GROUP BY prices.pricegroup;'; $result = $this->container->get(Connection::class)->executeQuery($sql, ['productNumber' => $productNumber])->fetchAllKeyValue(); diff --git a/tests/Functional/Controllers/Backend/OrderTest.php b/tests/Functional/Controllers/Backend/OrderTest.php index a4860a506dc..9a89b3032d2 100644 --- a/tests/Functional/Controllers/Backend/OrderTest.php +++ b/tests/Functional/Controllers/Backend/OrderTest.php @@ -370,6 +370,104 @@ public function provideProductParamsForSavePositionActionTestingGraduatedPrices( ]; } + /** + * @dataProvider provideProductParamsForSavePositionActionOnExistingPosition + * + * @param array{quantity?: int, price?: float, total?: float} $params + * @param array{price: float, total: float} $expectedValues + */ + public function testSavePositionActionReturnValuesForGraduatedPricesOnExistingPosition(array $params, array $expectedValues): void + { + $order = $this->modelManager->getRepository(Order::class)->findOneBy([]); + static::assertInstanceOf(Order::class, $order); + $newPositionParams = [ + 'id' => 0, + 'orderId' => $order->getId(), + 'articleNumber' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_ORDER_NUMBER, + 'articleName' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_NAME, + 'articleId' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_ID, + 'articleDetailId' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_VARIANT_ID, + 'mode' => 0, + 'quantity' => 2, + 'statusId' => 0, + 'statusDescription' => '', + 'taxId' => 1, + 'taxRate' => 19.0, + 'taxDescription' => '', + 'inStock' => 0, + 'changed' => $order->getChanged() ? $order->getChanged()->format(DateTimeInterface::ATOM) : '', + ]; + + $request = new Enlight_Controller_Request_RequestTestCase(); + $request->setParams($newPositionParams); + + $controller = $this->getController(); + $controller->setRequest($request); + $controller->savePositionAction(); + $results = $controller->View()->getAssign(); + + static::assertTrue($results['success'], $results['message'] ?? ''); + static::assertSame(0.84, $results['data']['price']); + static::assertSame(1.68, $results['data']['total']); + + $this->modelManager->refresh($order); + $changeQuantityParams = [ + 'id' => $results['data']['id'], + 'price' => $results['data']['price'], + 'total' => $results['data']['total'], + 'changed' => $order->getChanged() ? $order->getChanged()->format(DateTimeInterface::ATOM) : '', + ]; + $changeQuantityParams = array_merge($newPositionParams, $changeQuantityParams, $params); + + $request = new Enlight_Controller_Request_RequestTestCase(); + $request->setParams($changeQuantityParams); + + $controller->setRequest($request); + $controller->savePositionAction(); + $results = $controller->View()->getAssign(); + + static::assertTrue($results['success'], $results['message'] ?? ''); + static::assertSame($expectedValues['price'], $results['data']['price']); + static::assertSame($expectedValues['total'], $results['data']['total']); + } + + /** + * @return Generator + */ + public function provideProductParamsForSavePositionActionOnExistingPosition(): Generator + { + yield 'Only change quantity, graduated price should be considered' => [ + 'params' => [ + 'quantity' => 20, + ], + 'expectedValues' => [ + 'price' => 0.76, + 'total' => 15.2, + ], + ]; + yield 'Only change price, graduated price should be ignored' => [ + 'params' => [ + 'price' => 0.15, + 'total' => 0.30, + ], + 'expectedValues' => [ + 'price' => 0.15, + 'total' => 0.30, + ], + ]; + yield 'Change quantity and price, graduated price should be considered' => [ + 'params' => [ + 'quantity' => 30, + 'price' => 0.15, + 'total' => 0.30, + ], + 'expectedValues' => [ + 'price' => 0.67, + 'total' => 20.1, + ], + ]; + } + /** * @dataProvider provideTaxRuleParams */ From a91f0da83b2673733caa5647f8f1ba256f9ede52 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Fri, 22 Sep 2023 09:07:21 +0200 Subject: [PATCH 488/730] feat: Add new version to upgrade file --- UPGRADE-5.7.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index b19d67a95ce..f342b9cd298 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -2,6 +2,10 @@ This changelog references changes done in Shopware 5.7 patch versions. +## 5.7.19 + +[View all changes from v5.7.18...v5.7.19](https://github.com/shopware/shopware/compare/v5.7.18...v5.7.19) + ## 5.7.18 [View all changes from v5.7.17...v5.7.18](https://github.com/shopware/shopware/compare/v5.7.17...v5.7.18) From b3a69db4869e4b56b7dc187d226aca2d4d336f7d Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 25 Sep 2023 13:57:38 +0200 Subject: [PATCH 489/730] fix: Make sure only the root config.php file is ignored by git --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 8fec1ec2c37..cc26fcc84b2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,7 +2,7 @@ **.yaml export-ignore **.md export-ignore **.gitkeep export-ignore -config.php export-ignore +/config.php export-ignore .gitlab-ci.yml export-ignore .github/ export-ignore .gitignore export-ignore From a43f2d1f695fd0a3bdec6a4cb15d58b48354cae5 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 25 Sep 2023 13:58:11 +0200 Subject: [PATCH 490/730] fix: Ignore danger.php config file in git --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index cc26fcc84b2..a9b92dca4fa 100644 --- a/.gitattributes +++ b/.gitattributes @@ -22,3 +22,4 @@ snippets/backend/plugins/ export-ignore Makefile export-ignore .make* export-ignore vendor-bin/ export-ignore +.danger.php export-ignore From b025f04ba7b2ee9ffc7042bb6031ca9d394b9569 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 25 Sep 2023 14:05:08 +0200 Subject: [PATCH 491/730] fix: Remove v character from version tag --- .../Default/Backend/SwagUpdate/Components/UpdateCheck.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php index 9b02d19656f..598d81be976 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php @@ -134,7 +134,7 @@ private function createVersionFromGithubResponse(string $shopwareVersion, array private function getRelease(string $shopwareVersion, array $releaseInformation): array { foreach ($releaseInformation as $release) { - if (version_compare($shopwareVersion, $release['tag_name'], '>=')) { + if (version_compare($shopwareVersion, ltrim($release['tag_name'], 'v'), '>=')) { continue; } From 197a12d35e50f5ac6c2507e0372263d3eabdaef3 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 25 Sep 2023 14:09:46 +0200 Subject: [PATCH 492/730] fix: Improve wording, styling and error handling of the auto updater --- .../Default/Backend/SwagUpdate/Components/Download.php | 8 ++------ .../SwagUpdate/Snippets/backend/swag_update/main.ini | 4 ++-- .../SwagUpdate/Views/backend/swag_update/view/window.js | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php index 0b0f4f9480b..23597ee8ed7 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php @@ -169,12 +169,8 @@ public function downloadFile($sourceUri, $destinationUri, $totalSize, $hash) $error = curl_error($ch); curl_close($ch); - if ($isError && !$isHalted) { - throw new Exception('Wrong http code'); - } - - if ($result === false && !$isHalted) { - throw new Exception($error); + if (($result === false || $isError) && !$isHalted) { + throw new Exception($error ?: 'Unknown error'); } clearstatcache(false, $partFile->getPathname()); diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Snippets/backend/swag_update/main.ini b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Snippets/backend/swag_update/main.ini index 5bb7872a896..44a2ef4d754 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Snippets/backend/swag_update/main.ini +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Snippets/backend/swag_update/main.ini @@ -79,7 +79,7 @@ security_update_window/text = "

        Warning!

        A new security update is availab security_update_window/cancel = "Close" security_update_window/update = "Open software update" ftp/invalid_permissions = "Invalid file permissions" -release_information = "You can access the release information of [1] here." +release_information = "You can see the current release information for [1] here." [de_DE] cancel = "Abbrechen" @@ -162,4 +162,4 @@ security_update_window/text = "

        Achtung!

        Ein neues Sicherheitsupdate ist security_update_window/cancel = "Schließen" security_update_window/update = "Softwareaktualisierung öffnen" ftp/invalid_permissions = "Invalide Datei Rechte" -release_information = "Du kannst die aktuellen release Information von [1] hier beziehen." \ No newline at end of file +release_information = "Du kannst die aktuellen Release-Informationen zu [1] hier einsehen." \ No newline at end of file diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/window.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/window.js index 725075852fb..1a198fff25e 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/window.js +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/window.js @@ -180,7 +180,7 @@ Ext.define('Shopware.apps.SwagUpdate.view.Window', { var me = this; var text = Ext.String.format( - '
        {s name="release_information"}You can access the release information of [1] here.{/s}
        ', + '

        {s name="release_information"}{/s}
        ', me.changelog.get('changelog'), me.changelog.get('version') ); From d1026e469c0aed2513aaeec97bca64a5ff91a22b Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 25 Sep 2023 15:50:21 +0200 Subject: [PATCH 493/730] test: Use more realistic version strings for update check test --- ...SwagUpdateTest.php => UpdateCheckTest.php} | 235 +++++++++--------- 1 file changed, 117 insertions(+), 118 deletions(-) rename tests/Unit/Plugin/Backend/SwagUpdate/Components/{SwagUpdateTest.php => UpdateCheckTest.php} (52%) diff --git a/tests/Unit/Plugin/Backend/SwagUpdate/Components/SwagUpdateTest.php b/tests/Unit/Plugin/Backend/SwagUpdate/Components/UpdateCheckTest.php similarity index 52% rename from tests/Unit/Plugin/Backend/SwagUpdate/Components/SwagUpdateTest.php rename to tests/Unit/Plugin/Backend/SwagUpdate/Components/UpdateCheckTest.php index bc6c86d4179..cb3617c56d5 100644 --- a/tests/Unit/Plugin/Backend/SwagUpdate/Components/SwagUpdateTest.php +++ b/tests/Unit/Plugin/Backend/SwagUpdate/Components/UpdateCheckTest.php @@ -32,7 +32,7 @@ use Zend_Http_Client; use Zend_Http_Response; -class SwagUpdateTest extends TestCase +class UpdateCheckTest extends TestCase { public function testCheckUpdateReturnsNullIfShopwareVersionIsDevelopment(): void { @@ -59,7 +59,7 @@ public function testCheckUpdateThrowsExceptionOnApiLimit(): void ); $this->expectException(ApiLimitExceededException::class); - $updateChecker->checkUpdate('v5.7.13'); + $updateChecker->checkUpdate('5.7.13'); } public function testCheckUpdateReturnsNoVersionOnRouteNotFound(): void @@ -75,7 +75,7 @@ public function testCheckUpdateReturnsNoVersionOnRouteNotFound(): void false ); - static::assertNull($updateChecker->checkUpdate('v5.7.13')); + static::assertNull($updateChecker->checkUpdate('5.7.13')); } public function testCheckUpdateReturnsNoVersionOnInvalidRequestBody(): void @@ -91,7 +91,7 @@ public function testCheckUpdateReturnsNoVersionOnInvalidRequestBody(): void false ); - static::assertNull($updateChecker->checkUpdate('v5.7.13')); + static::assertNull($updateChecker->checkUpdate('5.7.13')); } public function testCheckUpdateReturnsVersionNullWithoutOldRelease(): void @@ -107,12 +107,12 @@ public function testCheckUpdateReturnsVersionNullWithoutOldRelease(): void false ); - static::assertNull($updateChecker->checkUpdate('v5.7.13')); + static::assertNull($updateChecker->checkUpdate('5.7.13')); } public function testCheckUpdateReturnsVersionNullWithoutAssets(): void { - $response = new Zend_Http_Response(200, [], $this->getSingleVersionWithoutAssets('v5.8.12')); + $response = new Zend_Http_Response(200, [], $this->getSingleVersionWithoutAssets('v5.7.14')); $clientMock = $this->getMockBuilder(Zend_Http_Client::class)->disableOriginalConstructor()->getMock(); $clientMock->method('request')->willReturn($response); @@ -123,12 +123,12 @@ public function testCheckUpdateReturnsVersionNullWithoutAssets(): void false ); - static::assertNull($updateChecker->checkUpdate('v5.7.13')); + static::assertNull($updateChecker->checkUpdate('5.7.13')); } public function testCheckUpdateReturnsVersionWithNewRelease(): void { - $response = new Zend_Http_Response(200, [], $this->getSingleVersionJson('v5.8.12')); + $response = new Zend_Http_Response(200, [], $this->getSingleVersionJson('v5.7.14')); $clientMock = $this->getMockBuilder(Zend_Http_Client::class)->disableOriginalConstructor()->getMock(); $clientMock->method('request')->willReturn($response); @@ -139,14 +139,14 @@ public function testCheckUpdateReturnsVersionWithNewRelease(): void false ); - $version = $updateChecker->checkUpdate('v5.7.13'); + $version = $updateChecker->checkUpdate('5.7.13'); static::assertInstanceOf(Version::class, $version); - static::assertSame('v5.8.12', $version->version); + static::assertSame('v5.7.14', $version->version); } public function testCheckUpdateReturnsVersionWithNewPreRelease(): void { - $response = new Zend_Http_Response(200, [], $this->getSingleVersionJson('v5.8.12', true)); + $response = new Zend_Http_Response(200, [], $this->getSingleVersionJson('v5.7.14', true)); $clientMock = $this->getMockBuilder(Zend_Http_Client::class)->disableOriginalConstructor()->getMock(); $clientMock->method('request')->willReturn($response); @@ -157,14 +157,14 @@ public function testCheckUpdateReturnsVersionWithNewPreRelease(): void true ); - $version = $updateChecker->checkUpdate('v5.7.13'); + $version = $updateChecker->checkUpdate('5.7.13'); static::assertInstanceOf(Version::class, $version); - static::assertSame('v5.8.12', $version->version); + static::assertSame('v5.7.14', $version->version); } public function testCheckUpdateReturnsVersionOfDraftWithDraftRelease(): void { - $response = new Zend_Http_Response(200, [], $this->getMultiVersionJson('v5.8.13', true, 'v5.8.12', false)); + $response = new Zend_Http_Response(200, [], $this->getMultiVersionJson('v5.7.15', true, 'v5.7.14', false)); $clientMock = $this->getMockBuilder(Zend_Http_Client::class)->disableOriginalConstructor()->getMock(); $clientMock->method('request')->willReturn($response); @@ -175,14 +175,14 @@ public function testCheckUpdateReturnsVersionOfDraftWithDraftRelease(): void false ); - $version = $updateChecker->checkUpdate('v5.7.13'); + $version = $updateChecker->checkUpdate('5.7.13'); static::assertInstanceOf(Version::class, $version); - static::assertSame('v5.8.13', $version->version); + static::assertSame('v5.7.15', $version->version); } public function testCheckUpdateReturnsVersionOfWithoutDraftRelease(): void { - $response = new Zend_Http_Response(200, [], $this->getMultiVersionJson('v5.8.13', true, 'v5.8.12', false)); + $response = new Zend_Http_Response(200, [], $this->getMultiVersionJson('v5.7.15', true, 'v5.7.14', false)); $clientMock = $this->getMockBuilder(Zend_Http_Client::class)->disableOriginalConstructor()->getMock(); $clientMock->method('request')->willReturn($response); @@ -193,56 +193,56 @@ public function testCheckUpdateReturnsVersionOfWithoutDraftRelease(): void false ); - $version = $updateChecker->checkUpdate('v5.7.13'); + $version = $updateChecker->checkUpdate('5.7.13'); static::assertInstanceOf(Version::class, $version); - static::assertSame('v5.8.12', $version->version); + static::assertSame('v5.7.14', $version->version); } private function getSingleVersionJson(string $version, bool $prerelease = false): string { return json_encode([ - [ - 'html_url' => 'https://github.com/shopware5/shopware/releases/tag/v5.7.17', - 'body' => '', - 'id' => 97288305, - 'node_id' => 'RE_kwDOAFa3Gs4FzIBx', - 'tag_name' => $version, - 'name' => 'Release 5.7.17', - 'draft' => false, - 'prerelease' => $prerelease, - 'created_at' => '2023-03-21T12:58:25Z', - 'published_at' => '2023-03-29T09:06:24Z', - 'assets' => [ - [ - 'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259279', - 'id' => 102259279, - 'node_id' => 'RA_kwDOAFa3Gs4GGFpP', - 'name' => 'install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip', - 'label' => null, - 'content_type' => 'application/zip', - 'state' => 'uploaded', - 'size' => 45264378, - 'download_count' => 132, - 'created_at' => '2023-04-04T12:14:50Z', - 'updated_at' => '2023-05-30T07:14:09Z', - 'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip', - ], - [ - 'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259331', - 'id' => 102259331, - 'node_id' => 'RA_kwDOAFa3Gs4GGFqD', - 'name' => 'update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip', - 'label' => null, - 'content_type' => 'application/zip', - 'state' => 'uploaded', - 'size' => 46082425, - 'download_count' => 12, - 'created_at' => '2023-04-04T12:15:18Z', - 'updated_at' => '2023-05-30T07:14:37Z', - 'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip', - ], - ], + [ + 'html_url' => 'https://github.com/shopware5/shopware/releases/tag/v5.7.17', + 'body' => '', + 'id' => 97288305, + 'node_id' => 'RE_kwDOAFa3Gs4FzIBx', + 'tag_name' => $version, + 'name' => 'Release 5.7.17', + 'draft' => false, + 'prerelease' => $prerelease, + 'created_at' => '2023-03-21T12:58:25Z', + 'published_at' => '2023-03-29T09:06:24Z', + 'assets' => [ + [ + 'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259279', + 'id' => 102259279, + 'node_id' => 'RA_kwDOAFa3Gs4GGFpP', + 'name' => 'install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip', + 'label' => null, + 'content_type' => 'application/zip', + 'state' => 'uploaded', + 'size' => 45264378, + 'download_count' => 132, + 'created_at' => '2023-04-04T12:14:50Z', + 'updated_at' => '2023-05-30T07:14:09Z', + 'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip', + ], + [ + 'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259331', + 'id' => 102259331, + 'node_id' => 'RA_kwDOAFa3Gs4GGFqD', + 'name' => 'update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip', + 'label' => null, + 'content_type' => 'application/zip', + 'state' => 'uploaded', + 'size' => 46082425, + 'download_count' => 12, + 'created_at' => '2023-04-04T12:15:18Z', + 'updated_at' => '2023-05-30T07:14:37Z', + 'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip', + ], ], + ], ], JSON_THROW_ON_ERROR); } @@ -260,8 +260,7 @@ private function getSingleVersionWithoutAssets(string $version): string 'prerelease' => false, 'created_at' => '2023-03-21T12:58:25Z', 'published_at' => '2023-03-29T09:06:24Z', - 'assets' => [ - ], + 'assets' => [], 'tarball_url' => 'https://api.github.com/repos/shopware5/shopware/tarball/v5.7.17', 'zipball_url' => 'https://api.github.com/repos/shopware5/shopware/zipball/v5.7.17', ], @@ -283,35 +282,35 @@ private function getMultiVersionJson(string $versionOne, bool $draftOne, string 'created_at' => '2023-03-21T12:58:25Z', 'published_at' => '2023-03-29T09:06:24Z', 'assets' => [ - [ - 'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259279', - 'id' => 102259279, - 'node_id' => 'RA_kwDOAFa3Gs4GGFpP', - 'name' => 'install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip', - 'label' => null, - 'content_type' => 'application/zip', - 'state' => 'uploaded', - 'size' => 45264378, - 'download_count' => 132, - 'created_at' => '2023-04-04T12:14:50Z', - 'updated_at' => '2023-05-30T07:14:09Z', - 'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip', - ], - [ - 'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259331', - 'id' => 102259331, - 'node_id' => 'RA_kwDOAFa3Gs4GGFqD', - 'name' => 'update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip', - 'label' => null, - 'content_type' => 'application/zip', - 'state' => 'uploaded', - 'size' => 46082425, - 'download_count' => 12, - 'created_at' => '2023-04-04T12:15:18Z', - 'updated_at' => '2023-05-30T07:14:37Z', - 'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip', - ], + [ + 'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259279', + 'id' => 102259279, + 'node_id' => 'RA_kwDOAFa3Gs4GGFpP', + 'name' => 'install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip', + 'label' => null, + 'content_type' => 'application/zip', + 'state' => 'uploaded', + 'size' => 45264378, + 'download_count' => 132, + 'created_at' => '2023-04-04T12:14:50Z', + 'updated_at' => '2023-05-30T07:14:09Z', + 'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip', + ], + [ + 'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259331', + 'id' => 102259331, + 'node_id' => 'RA_kwDOAFa3Gs4GGFqD', + 'name' => 'update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip', + 'label' => null, + 'content_type' => 'application/zip', + 'state' => 'uploaded', + 'size' => 46082425, + 'download_count' => 12, + 'created_at' => '2023-04-04T12:15:18Z', + 'updated_at' => '2023-05-30T07:14:37Z', + 'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip', ], + ], ], [ 'html_url' => 'https://github.com/shopware5/shopware/releases/tag/v5.7.17', @@ -325,35 +324,35 @@ private function getMultiVersionJson(string $versionOne, bool $draftOne, string 'created_at' => '2023-03-21T12:58:25Z', 'published_at' => '2023-03-29T09:06:24Z', 'assets' => [ - [ - 'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259279', - 'id' => 102259279, - 'node_id' => 'RA_kwDOAFa3Gs4GGFpP', - 'name' => 'install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip', - 'label' => null, - 'content_type' => 'application/zip', - 'state' => 'uploaded', - 'size' => 45264378, - 'download_count' => 132, - 'created_at' => '2023-04-04T12:14:50Z', - 'updated_at' => '2023-05-30T07:14:09Z', - 'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip', - ], - [ - 'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259331', - 'id' => 102259331, - 'node_id' => 'RA_kwDOAFa3Gs4GGFqD', - 'name' => 'update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip', - 'label' => null, - 'content_type' => 'application/zip', - 'state' => 'uploaded', - 'size' => 46082425, - 'download_count' => 12, - 'created_at' => '2023-04-04T12:15:18Z', - 'updated_at' => '2023-05-30T07:14:37Z', - 'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip', - ], + [ + 'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259279', + 'id' => 102259279, + 'node_id' => 'RA_kwDOAFa3Gs4GGFpP', + 'name' => 'install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip', + 'label' => null, + 'content_type' => 'application/zip', + 'state' => 'uploaded', + 'size' => 45264378, + 'download_count' => 132, + 'created_at' => '2023-04-04T12:14:50Z', + 'updated_at' => '2023-05-30T07:14:09Z', + 'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip', ], + [ + 'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259331', + 'id' => 102259331, + 'node_id' => 'RA_kwDOAFa3Gs4GGFqD', + 'name' => 'update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip', + 'label' => null, + 'content_type' => 'application/zip', + 'state' => 'uploaded', + 'size' => 46082425, + 'download_count' => 12, + 'created_at' => '2023-04-04T12:15:18Z', + 'updated_at' => '2023-05-30T07:14:37Z', + 'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip', + ], + ], ], ], JSON_THROW_ON_ERROR); } From 51e519149e915115833aec16ffb070fa3d103b4f Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 25 Sep 2023 16:05:58 +0200 Subject: [PATCH 494/730] fix: Remove draft option from auto updater --- .../DependencyInjection/services.xml | 1 - engine/Shopware/Configs/Default.php | 1 - .../SwagUpdate/Components/UpdateCheck.php | 9 +----- .../SwagUpdate/Components/UpdateCheckTest.php | 30 +++++++------------ 4 files changed, 11 insertions(+), 30 deletions(-) diff --git a/engine/Shopware/Components/DependencyInjection/services.xml b/engine/Shopware/Components/DependencyInjection/services.xml index b5c7ef07d76..ac5778c6c44 100644 --- a/engine/Shopware/Components/DependencyInjection/services.xml +++ b/engine/Shopware/Components/DependencyInjection/services.xml @@ -42,7 +42,6 @@ - %shopware.update.draft% %shopware.update.prerelease% diff --git a/engine/Shopware/Configs/Default.php b/engine/Shopware/Configs/Default.php index 12f699c3004..5e148f91b43 100644 --- a/engine/Shopware/Configs/Default.php +++ b/engine/Shopware/Configs/Default.php @@ -247,7 +247,6 @@ ], 'update' => [ 'url' => 'https://raw.githubusercontent.com/shopware5/shopware-release-cache/main/releases.json', - 'draft' => false, 'prerelease' => false, ], 'httpcache' => [ diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php index 2b60270cf2b..669d0e5b594 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php @@ -40,12 +40,9 @@ class UpdateCheck private bool $preRelease; - private bool $draft; - - public function __construct(Zend_Http_Client $client, bool $draft, bool $preRelease) + public function __construct(Zend_Http_Client $client, bool $preRelease) { $this->client = $client; - $this->draft = $draft; $this->preRelease = $preRelease; } @@ -137,10 +134,6 @@ private function getRelease(string $shopwareVersion, array $releaseInformation): continue; } - if ((bool) $release['draft'] !== $this->draft) { - continue; - } - if ((bool) $release['prerelease'] !== $this->preRelease) { continue; } diff --git a/tests/Unit/Plugin/Backend/SwagUpdate/Components/UpdateCheckTest.php b/tests/Unit/Plugin/Backend/SwagUpdate/Components/UpdateCheckTest.php index cb3617c56d5..113fc734db4 100644 --- a/tests/Unit/Plugin/Backend/SwagUpdate/Components/UpdateCheckTest.php +++ b/tests/Unit/Plugin/Backend/SwagUpdate/Components/UpdateCheckTest.php @@ -38,7 +38,6 @@ public function testCheckUpdateReturnsNullIfShopwareVersionIsDevelopment(): void { $updateChecker = new UpdateCheck( $this->createMock(Zend_Http_Client::class), - false, false ); @@ -54,7 +53,6 @@ public function testCheckUpdateThrowsExceptionOnApiLimit(): void $updateChecker = new UpdateCheck( $clientMock, - false, false ); @@ -71,7 +69,6 @@ public function testCheckUpdateReturnsNoVersionOnRouteNotFound(): void $updateChecker = new UpdateCheck( $clientMock, - false, false ); @@ -87,7 +84,6 @@ public function testCheckUpdateReturnsNoVersionOnInvalidRequestBody(): void $updateChecker = new UpdateCheck( $clientMock, - false, false ); @@ -103,7 +99,6 @@ public function testCheckUpdateReturnsVersionNullWithoutOldRelease(): void $updateChecker = new UpdateCheck( $clientMock, - false, false ); @@ -119,7 +114,6 @@ public function testCheckUpdateReturnsVersionNullWithoutAssets(): void $updateChecker = new UpdateCheck( $clientMock, - false, false ); @@ -135,7 +129,6 @@ public function testCheckUpdateReturnsVersionWithNewRelease(): void $updateChecker = new UpdateCheck( $clientMock, - false, false ); @@ -153,7 +146,6 @@ public function testCheckUpdateReturnsVersionWithNewPreRelease(): void $updateChecker = new UpdateCheck( $clientMock, - false, true ); @@ -162,9 +154,9 @@ public function testCheckUpdateReturnsVersionWithNewPreRelease(): void static::assertSame('v5.7.14', $version->version); } - public function testCheckUpdateReturnsVersionOfDraftWithDraftRelease(): void + public function testCheckUpdateReturnsVersionOfPreReleaseWithPreRelease(): void { - $response = new Zend_Http_Response(200, [], $this->getMultiVersionJson('v5.7.15', true, 'v5.7.14', false)); + $response = new Zend_Http_Response(200, [], $this->getMultiVersionJson()); $clientMock = $this->getMockBuilder(Zend_Http_Client::class)->disableOriginalConstructor()->getMock(); $clientMock->method('request')->willReturn($response); @@ -172,7 +164,6 @@ public function testCheckUpdateReturnsVersionOfDraftWithDraftRelease(): void $updateChecker = new UpdateCheck( $clientMock, true, - false ); $version = $updateChecker->checkUpdate('5.7.13'); @@ -180,16 +171,15 @@ public function testCheckUpdateReturnsVersionOfDraftWithDraftRelease(): void static::assertSame('v5.7.15', $version->version); } - public function testCheckUpdateReturnsVersionOfWithoutDraftRelease(): void + public function testCheckUpdateReturnsVersionOfNormalReleaseWithoutPreRelease(): void { - $response = new Zend_Http_Response(200, [], $this->getMultiVersionJson('v5.7.15', true, 'v5.7.14', false)); + $response = new Zend_Http_Response(200, [], $this->getMultiVersionJson()); $clientMock = $this->getMockBuilder(Zend_Http_Client::class)->disableOriginalConstructor()->getMock(); $clientMock->method('request')->willReturn($response); $updateChecker = new UpdateCheck( $clientMock, - false, false ); @@ -267,7 +257,7 @@ private function getSingleVersionWithoutAssets(string $version): string ], JSON_THROW_ON_ERROR); } - private function getMultiVersionJson(string $versionOne, bool $draftOne, string $versionTwo, bool $draftTwo): string + private function getMultiVersionJson(): string { return json_encode([ [ @@ -275,10 +265,10 @@ private function getMultiVersionJson(string $versionOne, bool $draftOne, string 'body' => '', 'id' => 97288305, 'node_id' => 'RE_kwDOAFa3Gs4FzIBx', - 'tag_name' => $versionOne, + 'tag_name' => 'v5.7.15', 'name' => 'Release 5.7.17', - 'draft' => $draftOne, - 'prerelease' => false, + 'draft' => true, + 'prerelease' => true, 'created_at' => '2023-03-21T12:58:25Z', 'published_at' => '2023-03-29T09:06:24Z', 'assets' => [ @@ -317,9 +307,9 @@ private function getMultiVersionJson(string $versionOne, bool $draftOne, string 'body' => '', 'id' => 97288305, 'node_id' => 'RE_kwDOAFa3Gs4FzIBx', - 'tag_name' => $versionTwo, + 'tag_name' => 'v5.7.14', 'name' => 'Release 5.7.17', - 'draft' => $draftTwo, + 'draft' => false, 'prerelease' => false, 'created_at' => '2023-03-21T12:58:25Z', 'published_at' => '2023-03-29T09:06:24Z', From 7566865aea4edf1a7e8679a3651e247106146da2 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 27 Sep 2023 13:25:06 +0200 Subject: [PATCH 495/730] chore: Update friendsofphp/php-cs-fixer to 3.30.0 --- vendor-bin/cs-fixer/composer.json | 2 +- vendor-bin/cs-fixer/composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/vendor-bin/cs-fixer/composer.json b/vendor-bin/cs-fixer/composer.json index b84f9b9ae5d..020f5c2aadc 100644 --- a/vendor-bin/cs-fixer/composer.json +++ b/vendor-bin/cs-fixer/composer.json @@ -1,6 +1,6 @@ { "require-dev": { - "friendsofphp/php-cs-fixer": "3.27.0", + "friendsofphp/php-cs-fixer": "3.30.0", "kubawerlos/php-cs-fixer-custom-fixers": "3.16.2" }, "sort-packages": true diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock index 16cd65378ed..0ee778dc817 100644 --- a/vendor-bin/cs-fixer/composer.lock +++ b/vendor-bin/cs-fixer/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": "e4bf52df2f6708c860ff68e413e60ed8", + "content-hash": "76fb5cc6a753441c64120e5da9d28356", "packages": [], "packages-dev": [ { @@ -227,16 +227,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.27.0", + "version": "v3.30.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "e73ccaae1208f017bb7860986eebb3da48bd25d6" + "reference": "95c64693b2f149966a2bc05a7a4981b0343ea52f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/e73ccaae1208f017bb7860986eebb3da48bd25d6", - "reference": "e73ccaae1208f017bb7860986eebb3da48bd25d6", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/95c64693b2f149966a2bc05a7a4981b0343ea52f", + "reference": "95c64693b2f149966a2bc05a7a4981b0343ea52f", "shasum": "" }, "require": { @@ -310,7 +310,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.27.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.30.0" }, "funding": [ { @@ -318,7 +318,7 @@ "type": "github" } ], - "time": "2023-09-17T14:37:54+00:00" + "time": "2023-09-26T22:10:43+00:00" }, { "name": "kubawerlos/php-cs-fixer-custom-fixers", From 41c6ca320d0f54f76b427bf3cd5b0d7e9af949d5 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 11 Oct 2023 14:52:46 +0200 Subject: [PATCH 496/730] fix: Ensure that the update version is formatted correctly during the update check --- .../Default/Backend/SwagUpdate/Components/UpdateCheck.php | 3 ++- .../Backend/SwagUpdate/Components/UpdateCheckTest.php | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php index 669d0e5b594..196cacd626c 100644 --- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php +++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php @@ -130,7 +130,8 @@ private function createVersionFromGithubResponse(string $shopwareVersion, array private function getRelease(string $shopwareVersion, array $releaseInformation): array { foreach ($releaseInformation as $release) { - if (version_compare($shopwareVersion, ltrim($release['tag_name'], 'v'), '>=')) { + $release['tag_name'] = ltrim($release['tag_name'], 'v'); + if (version_compare($shopwareVersion, $release['tag_name'], '>=')) { continue; } diff --git a/tests/Unit/Plugin/Backend/SwagUpdate/Components/UpdateCheckTest.php b/tests/Unit/Plugin/Backend/SwagUpdate/Components/UpdateCheckTest.php index 113fc734db4..2d87bc63798 100644 --- a/tests/Unit/Plugin/Backend/SwagUpdate/Components/UpdateCheckTest.php +++ b/tests/Unit/Plugin/Backend/SwagUpdate/Components/UpdateCheckTest.php @@ -134,7 +134,7 @@ public function testCheckUpdateReturnsVersionWithNewRelease(): void $version = $updateChecker->checkUpdate('5.7.13'); static::assertInstanceOf(Version::class, $version); - static::assertSame('v5.7.14', $version->version); + static::assertSame('5.7.14', $version->version); } public function testCheckUpdateReturnsVersionWithNewPreRelease(): void @@ -151,7 +151,7 @@ public function testCheckUpdateReturnsVersionWithNewPreRelease(): void $version = $updateChecker->checkUpdate('5.7.13'); static::assertInstanceOf(Version::class, $version); - static::assertSame('v5.7.14', $version->version); + static::assertSame('5.7.14', $version->version); } public function testCheckUpdateReturnsVersionOfPreReleaseWithPreRelease(): void @@ -168,7 +168,7 @@ public function testCheckUpdateReturnsVersionOfPreReleaseWithPreRelease(): void $version = $updateChecker->checkUpdate('5.7.13'); static::assertInstanceOf(Version::class, $version); - static::assertSame('v5.7.15', $version->version); + static::assertSame('5.7.15', $version->version); } public function testCheckUpdateReturnsVersionOfNormalReleaseWithoutPreRelease(): void @@ -185,7 +185,7 @@ public function testCheckUpdateReturnsVersionOfNormalReleaseWithoutPreRelease(): $version = $updateChecker->checkUpdate('5.7.13'); static::assertInstanceOf(Version::class, $version); - static::assertSame('v5.7.14', $version->version); + static::assertSame('5.7.14', $version->version); } private function getSingleVersionJson(string $version, bool $prerelease = false): string From 7495ea90c92e309aa6ef95e2111aa3c01d627025 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Fri, 20 Oct 2023 14:41:34 +0200 Subject: [PATCH 497/730] chore: Update npm dependencies --- themes/Frontend/Responsive/package-lock.json | 1381 ++++++++++-------- themes/package-lock.json | 602 +++++--- 2 files changed, 1188 insertions(+), 795 deletions(-) diff --git a/themes/Frontend/Responsive/package-lock.json b/themes/Frontend/Responsive/package-lock.json index ffcee454342..85b56d4c80c 100644 --- a/themes/Frontend/Responsive/package-lock.json +++ b/themes/Frontend/Responsive/package-lock.json @@ -42,47 +42,86 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz", - "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==", + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", + "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", "dev": true, "dependencies": { - "@babel/highlight": "^7.22.5" + "@babel/highlight": "^7.22.13", + "chalk": "^2.4.2" }, "engines": { "node": ">=6.9.0" } }, + "node_modules/@babel/code-frame/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/@babel/compat-data": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.6.tgz", - "integrity": "sha512-29tfsWTq2Ftu7MXmimyC0C5FDZv5DYxOZkh3XD3+QW4V/BYuv/LyEsjj3c0hqedEaDt6DBfDvexMKU8YevdqFg==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz", + "integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.22.8", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.8.tgz", - "integrity": "sha512-75+KxFB4CZqYRXjx4NlR4J7yGvKumBuZTmV4NV6v09dVXXkuYVYLT68N6HCzLvfJ+fWCxQsntNzKwwIXL4bHnw==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz", + "integrity": "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.22.5", - "@babel/generator": "^7.22.7", - "@babel/helper-compilation-targets": "^7.22.6", - "@babel/helper-module-transforms": "^7.22.5", - "@babel/helpers": "^7.22.6", - "@babel/parser": "^7.22.7", - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.8", - "@babel/types": "^7.22.5", - "@nicolo-ribaudo/semver-v6": "^6.3.3", - "convert-source-map": "^1.7.0", + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.0", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helpers": "^7.23.2", + "@babel/parser": "^7.23.0", + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.2", + "@babel/types": "^7.23.0", + "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", - "json5": "^2.2.2" + "json5": "^2.2.3", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -92,19 +131,13 @@ "url": "https://opencollective.com/babel" } }, - "node_modules/@babel/core/node_modules/convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", - "dev": true - }, "node_modules/@babel/generator": { - "version": "7.22.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.7.tgz", - "integrity": "sha512-p+jPjMG+SI8yvIaxGgeW24u7q9+5+TGpZh8/CuB7RhBKd7RCy8FayNEFNNKrNK/eUcY/4ExQqLmyrvBXKsIcwQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", + "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", "dev": true, "dependencies": { - "@babel/types": "^7.22.5", + "@babel/types": "^7.23.0", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -114,41 +147,38 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.6.tgz", - "integrity": "sha512-534sYEqWD9VfUm3IPn2SLcH4Q3P86XL+QvqdC7ZsFrzyyPF3T4XGiVghF6PTYNdWg6pXuoqXxNQAhbYeEInTzA==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz", + "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.22.6", - "@babel/helper-validator-option": "^7.22.5", - "@nicolo-ribaudo/semver-v6": "^6.3.3", + "@babel/compat-data": "^7.22.9", + "@babel/helper-validator-option": "^7.22.15", "browserslist": "^4.21.9", - "lru-cache": "^5.1.1" + "lru-cache": "^5.1.1", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz", - "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz", - "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", "dev": true, "dependencies": { - "@babel/template": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" @@ -167,34 +197,34 @@ } }, "node_modules/@babel/helper-module-imports": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz", - "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz", + "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==", "dev": true, "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz", - "integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz", + "integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==", "dev": true, "dependencies": { - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-module-imports": "^7.22.15", "@babel/helper-simple-access": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/helper-validator-identifier": "^7.22.20" }, "engines": { "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" } }, "node_modules/@babel/helper-plugin-utils": { @@ -240,45 +270,45 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", - "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz", - "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz", + "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz", - "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz", + "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==", "dev": true, "dependencies": { - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.6", - "@babel/types": "^7.22.5" + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.2", + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz", - "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", + "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.22.5", - "chalk": "^2.0.0", + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, "engines": { @@ -324,9 +354,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.22.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz", - "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", + "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -513,33 +543,33 @@ } }, "node_modules/@babel/template": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", - "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.22.5", - "@babel/parser": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.22.8", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz", - "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", + "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.22.5", - "@babel/generator": "^7.22.7", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.0", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.22.7", - "@babel/types": "^7.22.5", + "@babel/parser": "^7.23.0", + "@babel/types": "^7.23.0", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -548,13 +578,13 @@ } }, "node_modules/@babel/types": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz", - "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", "dev": true, "dependencies": { "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, "engines": { @@ -593,16 +623,16 @@ } }, "node_modules/@jest/console": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.1.tgz", - "integrity": "sha512-Aj772AYgwTSr5w8qnyoJ0eDYvN6bMsH3ORH1ivMotrInHLKdUz6BDlaEXHdM6kODaBIkNIyQGzsMvRdOv7VG7Q==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz", + "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==", "dev": true, "dependencies": { - "@jest/types": "^29.6.1", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", - "jest-message-util": "^29.6.1", - "jest-util": "^29.6.1", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", "slash": "^3.0.0" }, "engines": { @@ -680,37 +710,37 @@ } }, "node_modules/@jest/core": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.1.tgz", - "integrity": "sha512-CcowHypRSm5oYQ1obz1wfvkjZZ2qoQlrKKvlfPwh5jUXVU12TWr2qMeH8chLMuTFzHh5a1g2yaqlqDICbr+ukQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", + "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==", "dev": true, "dependencies": { - "@jest/console": "^29.6.1", - "@jest/reporters": "^29.6.1", - "@jest/test-result": "^29.6.1", - "@jest/transform": "^29.6.1", - "@jest/types": "^29.6.1", + "@jest/console": "^29.7.0", + "@jest/reporters": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "ansi-escapes": "^4.2.1", "chalk": "^4.0.0", "ci-info": "^3.2.0", "exit": "^0.1.2", "graceful-fs": "^4.2.9", - "jest-changed-files": "^29.5.0", - "jest-config": "^29.6.1", - "jest-haste-map": "^29.6.1", - "jest-message-util": "^29.6.1", - "jest-regex-util": "^29.4.3", - "jest-resolve": "^29.6.1", - "jest-resolve-dependencies": "^29.6.1", - "jest-runner": "^29.6.1", - "jest-runtime": "^29.6.1", - "jest-snapshot": "^29.6.1", - "jest-util": "^29.6.1", - "jest-validate": "^29.6.1", - "jest-watcher": "^29.6.1", + "jest-changed-files": "^29.7.0", + "jest-config": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-resolve-dependencies": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "jest-watcher": "^29.7.0", "micromatch": "^4.0.4", - "pretty-format": "^29.6.1", + "pretty-format": "^29.7.0", "slash": "^3.0.0", "strip-ansi": "^6.0.0" }, @@ -818,88 +848,88 @@ } }, "node_modules/@jest/environment": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.1.tgz", - "integrity": "sha512-RMMXx4ws+Gbvw3DfLSuo2cfQlK7IwGbpuEWXCqyYDcqYTI+9Ju3a5hDnXaxjNsa6uKh9PQF2v+qg+RLe63tz5A==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", + "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", "dev": true, "dependencies": { - "@jest/fake-timers": "^29.6.1", - "@jest/types": "^29.6.1", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", - "jest-mock": "^29.6.1" + "jest-mock": "^29.7.0" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/expect": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.1.tgz", - "integrity": "sha512-N5xlPrAYaRNyFgVf2s9Uyyvr795jnB6rObuPx4QFvNJz8aAjpZUDfO4bh5G/xuplMID8PrnuF1+SfSyDxhsgYg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==", "dev": true, "dependencies": { - "expect": "^29.6.1", - "jest-snapshot": "^29.6.1" + "expect": "^29.7.0", + "jest-snapshot": "^29.7.0" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/expect-utils": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.1.tgz", - "integrity": "sha512-o319vIf5pEMx0LmzSxxkYYxo4wrRLKHq9dP1yJU7FoPTB0LfAKSz8SWD6D/6U3v/O52t9cF5t+MeJiRsfk7zMw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", + "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", "dev": true, "dependencies": { - "jest-get-type": "^29.4.3" + "jest-get-type": "^29.6.3" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/fake-timers": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.1.tgz", - "integrity": "sha512-RdgHgbXyosCDMVYmj7lLpUwXA4c69vcNzhrt69dJJdf8azUrpRh3ckFCaTPNjsEeRi27Cig0oKDGxy5j7hOgHg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", + "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", "dev": true, "dependencies": { - "@jest/types": "^29.6.1", + "@jest/types": "^29.6.3", "@sinonjs/fake-timers": "^10.0.2", "@types/node": "*", - "jest-message-util": "^29.6.1", - "jest-mock": "^29.6.1", - "jest-util": "^29.6.1" + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/globals": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.1.tgz", - "integrity": "sha512-2VjpaGy78JY9n9370H8zGRCFbYVWwjY6RdDMhoJHa1sYfwe6XM/azGN0SjY8kk7BOZApIejQ1BFPyH7FPG0w3A==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz", + "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==", "dev": true, "dependencies": { - "@jest/environment": "^29.6.1", - "@jest/expect": "^29.6.1", - "@jest/types": "^29.6.1", - "jest-mock": "^29.6.1" + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/types": "^29.6.3", + "jest-mock": "^29.7.0" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/reporters": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.1.tgz", - "integrity": "sha512-9zuaI9QKr9JnoZtFQlw4GREQbxgmNYXU6QuWtmuODvk5nvPUeBYapVR/VYMyi2WSx3jXTLJTJji8rN6+Cm4+FA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz", + "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==", "dev": true, "dependencies": { "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^29.6.1", - "@jest/test-result": "^29.6.1", - "@jest/transform": "^29.6.1", - "@jest/types": "^29.6.1", + "@jest/console": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", "@jridgewell/trace-mapping": "^0.3.18", "@types/node": "*", "chalk": "^4.0.0", @@ -908,13 +938,13 @@ "glob": "^7.1.3", "graceful-fs": "^4.2.9", "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^5.1.0", + "istanbul-lib-instrument": "^6.0.0", "istanbul-lib-report": "^3.0.0", "istanbul-lib-source-maps": "^4.0.0", "istanbul-reports": "^3.1.3", - "jest-message-util": "^29.6.1", - "jest-util": "^29.6.1", - "jest-worker": "^29.6.1", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", "slash": "^3.0.0", "string-length": "^4.0.1", "strip-ansi": "^6.0.0", @@ -1024,9 +1054,9 @@ } }, "node_modules/@jest/schemas": { - "version": "29.6.0", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.0.tgz", - "integrity": "sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, "dependencies": { "@sinclair/typebox": "^0.27.8" @@ -1036,9 +1066,9 @@ } }, "node_modules/@jest/source-map": { - "version": "29.6.0", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.0.tgz", - "integrity": "sha512-oA+I2SHHQGxDCZpbrsCQSoMLb3Bz547JnM+jUr9qEbuw0vQlWZfpPS7CO9J7XiwKicEz9OFn/IYoLkkiUD7bzA==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", + "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==", "dev": true, "dependencies": { "@jridgewell/trace-mapping": "^0.3.18", @@ -1050,13 +1080,13 @@ } }, "node_modules/@jest/test-result": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.1.tgz", - "integrity": "sha512-Ynr13ZRcpX6INak0TPUukU8GWRfm/vAytE3JbJNGAvINySWYdfE7dGZMbk36oVuK4CigpbhMn8eg1dixZ7ZJOw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz", + "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==", "dev": true, "dependencies": { - "@jest/console": "^29.6.1", - "@jest/types": "^29.6.1", + "@jest/console": "^29.7.0", + "@jest/types": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "collect-v8-coverage": "^1.0.0" }, @@ -1065,14 +1095,14 @@ } }, "node_modules/@jest/test-sequencer": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.1.tgz", - "integrity": "sha512-oBkC36PCDf/wb6dWeQIhaviU0l5u6VCsXa119yqdUosYAt7/FbQU2M2UoziO3igj/HBDEgp57ONQ3fm0v9uyyg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz", + "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==", "dev": true, "dependencies": { - "@jest/test-result": "^29.6.1", + "@jest/test-result": "^29.7.0", "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.6.1", + "jest-haste-map": "^29.7.0", "slash": "^3.0.0" }, "engines": { @@ -1080,22 +1110,22 @@ } }, "node_modules/@jest/transform": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.1.tgz", - "integrity": "sha512-URnTneIU3ZjRSaf906cvf6Hpox3hIeJXRnz3VDSw5/X93gR8ycdfSIEy19FlVx8NFmpN7fe3Gb1xF+NjXaQLWg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", + "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", "dev": true, "dependencies": { "@babel/core": "^7.11.6", - "@jest/types": "^29.6.1", + "@jest/types": "^29.6.3", "@jridgewell/trace-mapping": "^0.3.18", "babel-plugin-istanbul": "^6.1.1", "chalk": "^4.0.0", "convert-source-map": "^2.0.0", "fast-json-stable-stringify": "^2.1.0", "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.6.1", - "jest-regex-util": "^29.4.3", - "jest-util": "^29.6.1", + "jest-haste-map": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", "micromatch": "^4.0.4", "pirates": "^4.0.4", "slash": "^3.0.0", @@ -1176,12 +1206,12 @@ } }, "node_modules/@jest/types": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz", - "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^29.6.0", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -1277,9 +1307,9 @@ } }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", "dev": true, "engines": { "node": ">=6.0.0" @@ -1301,28 +1331,13 @@ "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.18", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz", - "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==", + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", + "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", "dev": true, "dependencies": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" - } - }, - "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", - "dev": true - }, - "node_modules/@nicolo-ribaudo/semver-v6": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/semver-v6/-/semver-v6-6.3.3.tgz", - "integrity": "sha512-3Yc1fUTs69MG/uZbJlLSI3JISMn2UV2rg+1D/vROUqZyh3l6iYHCs7GMp+M40ZD7yOdDbYjJcU1oTJhrc+dGKg==", - "dev": true, - "bin": { - "semver": "bin/semver.js" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "node_modules/@sinclair/typebox": { @@ -1359,9 +1374,9 @@ } }, "node_modules/@types/babel__core": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.1.tgz", - "integrity": "sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==", + "version": "7.20.3", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.3.tgz", + "integrity": "sha512-54fjTSeSHwfan8AyHWrKbfBWiEUrNTZsUwPTDSNaaP1QDQIZbeNUg3a59E9D+375MzUw/x1vx2/0F5LBz+AeYA==", "dev": true, "dependencies": { "@babel/parser": "^7.20.7", @@ -1372,18 +1387,18 @@ } }, "node_modules/@types/babel__generator": { - "version": "7.6.4", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz", - "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.6.tgz", + "integrity": "sha512-66BXMKb/sUWbMdBNdMvajU7i/44RkrA3z/Yt1c7R5xejt8qh84iU54yUWCtm0QwGJlDcf/gg4zd/x4mpLAlb/w==", "dev": true, "dependencies": { "@babel/types": "^7.0.0" } }, "node_modules/@types/babel__template": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz", - "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.3.tgz", + "integrity": "sha512-ciwyCLeuRfxboZ4isgdNZi/tkt06m8Tw6uGbBSBgWrnnZGNXiEyM27xc/PjXGQLqlZ6ylbgHMnm7ccF9tCkOeQ==", "dev": true, "dependencies": { "@babel/parser": "^7.1.0", @@ -1391,42 +1406,42 @@ } }, "node_modules/@types/babel__traverse": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.1.tgz", - "integrity": "sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==", + "version": "7.20.3", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.3.tgz", + "integrity": "sha512-Lsh766rGEFbaxMIDH7Qa+Yha8cMVI3qAK6CHt3OR0YfxOIn5Z54iHiyDRycHrBqeIiqGa20Kpsv1cavfBKkRSw==", "dev": true, "dependencies": { "@babel/types": "^7.20.7" } }, "node_modules/@types/graceful-fs": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz", - "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==", + "version": "4.1.8", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.8.tgz", + "integrity": "sha512-NhRH7YzWq8WiNKVavKPBmtLYZHxNY19Hh+az28O/phfp68CF45pMFud+ZzJ8ewnxnC5smIdF3dqFeiSUQ5I+pw==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/istanbul-lib-coverage": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", - "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz", + "integrity": "sha512-zONci81DZYCZjiLe0r6equvZut0b+dBRPBN5kBDjsONnutYNtJMoWQ9uR2RkL1gLG9NMTzvf+29e5RFfPbeKhQ==", "dev": true }, "node_modules/@types/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.2.tgz", + "integrity": "sha512-8toY6FgdltSdONav1XtUHl4LN1yTmLza+EuDazb/fEmRNCwjyqNVIQWs2IfC74IqjHkREs/nQ2FWq5kZU9IC0w==", "dev": true, "dependencies": { "@types/istanbul-lib-coverage": "*" } }, "node_modules/@types/istanbul-reports": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", - "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.3.tgz", + "integrity": "sha512-1nESsePMBlf0RPRffLZi5ujYh7IH1BWL4y9pr+Bn3cJBdxz+RTP8bUFljLz9HvzhhOSWKdyBZ4DIivdL6rvgZg==", "dev": true, "dependencies": { "@types/istanbul-lib-report": "*" @@ -1444,42 +1459,39 @@ } }, "node_modules/@types/node": { - "version": "20.4.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.1.tgz", - "integrity": "sha512-JIzsAvJeA/5iY6Y/OxZbv1lUcc8dNSE77lb2gnBH+/PJ3lFR1Ccvgwl5JWnHAkNHcRsT0TbpVOsiMKZ1F/yyJg==", - "dev": true - }, - "node_modules/@types/prettier": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz", - "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==", - "dev": true + "version": "20.8.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.7.tgz", + "integrity": "sha512-21TKHHh3eUHIi2MloeptJWALuCu5H7HQTdTrWIFReA8ad+aggoX+lRes3ex7/FtpC+sVUpFMQ+QTfYr74mruiQ==", + "dev": true, + "dependencies": { + "undici-types": "~5.25.1" + } }, "node_modules/@types/stack-utils": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", - "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.2.tgz", + "integrity": "sha512-g7CK9nHdwjK2n0ymT2CW698FuWJRIx+RP6embAzZ2Qi8/ilIrA1Imt2LVSeHUzKvpoi7BhmmQcXz95eS0f2JXw==", "dev": true }, "node_modules/@types/tough-cookie": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz", - "integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.4.tgz", + "integrity": "sha512-95Sfz4nvMAb0Nl9DTxN3j64adfwfbBPEYq14VN7zT5J5O2M9V6iZMIIQU1U+pJyl9agHYHNCqhCXgyEtIRRa5A==", "dev": true }, "node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, "node_modules/@types/yargs-parser": { - "version": "21.0.0", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", - "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", + "version": "21.0.2", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.2.tgz", + "integrity": "sha512-5qcvofLPbfjmBfKaLfj/+f+Sbd6pN4zl7w7VSVI5uz7m9QZTuB2aZAa2uo1wHFBNN2x6g/SoTkXmd8mQnQF2Cw==", "dev": true }, "node_modules/abab": { @@ -1623,15 +1635,15 @@ "dev": true }, "node_modules/babel-jest": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.1.tgz", - "integrity": "sha512-qu+3bdPEQC6KZSPz+4Fyjbga5OODNcp49j6GKzG1EKbkfyJBxEYGVUmVGpwCSeGouG52R4EgYMLb6p9YeEEQ4A==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", + "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", "dev": true, "dependencies": { - "@jest/transform": "^29.6.1", + "@jest/transform": "^29.7.0", "@types/babel__core": "^7.1.14", "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^29.5.0", + "babel-preset-jest": "^29.6.3", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", "slash": "^3.0.0" @@ -1729,10 +1741,26 @@ "node": ">=8" } }, + "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", + "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", + "dev": true, + "dependencies": { + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/babel-plugin-jest-hoist": { - "version": "29.5.0", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz", - "integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", + "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==", "dev": true, "dependencies": { "@babel/template": "^7.3.3", @@ -1768,12 +1796,12 @@ } }, "node_modules/babel-preset-jest": { - "version": "29.5.0", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz", - "integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz", + "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==", "dev": true, "dependencies": { - "babel-plugin-jest-hoist": "^29.5.0", + "babel-plugin-jest-hoist": "^29.6.3", "babel-preset-current-node-syntax": "^1.0.0" }, "engines": { @@ -1812,9 +1840,9 @@ } }, "node_modules/browserslist": { - "version": "4.21.9", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz", - "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==", + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz", + "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==", "dev": true, "funding": [ { @@ -1831,10 +1859,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001503", - "electron-to-chromium": "^1.4.431", - "node-releases": "^2.0.12", - "update-browserslist-db": "^1.0.11" + "caniuse-lite": "^1.0.30001541", + "electron-to-chromium": "^1.4.535", + "node-releases": "^2.0.13", + "update-browserslist-db": "^1.0.13" }, "bin": { "browserslist": "cli.js" @@ -1877,9 +1905,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001514", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001514.tgz", - "integrity": "sha512-ENcIpYBmwAAOm/V2cXgM7rZUrKKaqisZl4ZAI520FIkqGXUxJjmaIssbRW5HVVR5tyV6ygTLIm15aU8LUmQSaQ==", + "version": "1.0.30001551", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001551.tgz", + "integrity": "sha512-vtBAez47BoGMMzlbYhfXrMV1kvRF2WP/lqiMuDu1Sb4EE4LKEgjopFDSRtZfdVnslNRpOqV/woE+Xgrwj6VQlg==", "dev": true, "funding": [ { @@ -1922,9 +1950,9 @@ } }, "node_modules/ci-info": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz", - "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==", + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", "dev": true, "funding": [ { @@ -2041,6 +2069,97 @@ "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", "dev": true }, + "node_modules/create-jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", + "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "prompts": "^2.0.1" + }, + "bin": { + "create-jest": "bin/create-jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/create-jest/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/create-jest/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/create-jest/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/create-jest/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/create-jest/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/create-jest/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -2217,10 +2336,18 @@ "dev": true }, "node_modules/dedent": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", - "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", - "dev": true + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz", + "integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==", + "dev": true, + "peerDependencies": { + "babel-plugin-macros": "^3.1.0" + }, + "peerDependenciesMeta": { + "babel-plugin-macros": { + "optional": true + } + } }, "node_modules/deepmerge": { "version": "4.3.1", @@ -2259,9 +2386,9 @@ } }, "node_modules/diff-sequences": { - "version": "29.4.3", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz", - "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", "dev": true, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" @@ -2292,9 +2419,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.454", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.454.tgz", - "integrity": "sha512-pmf1rbAStw8UEQ0sr2cdJtWl48ZMuPD9Sto8HVQOq9vx9j2WgDEN6lYoaqFvqEHYOmGA9oRGn7LqWI9ta0YugQ==", + "version": "1.4.561", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.561.tgz", + "integrity": "sha512-eS5t4ulWOBfVHdq9SW2dxEaFarj1lPjvJ8PaYMOjY0DecBaj/t4ARziL2IPpDr4atyWwjLFGQ2vo/VCgQFezVQ==", "dev": true }, "node_modules/emittery": { @@ -2316,10 +2443,13 @@ "dev": true }, "node_modules/entities": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz", - "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz", + "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==", "dev": true, + "engines": { + "node": ">=0.12" + }, "funding": { "url": "https://github.com/fb55/entities?sponsor=1" } @@ -2454,17 +2584,16 @@ } }, "node_modules/expect": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.1.tgz", - "integrity": "sha512-XEdDLonERCU1n9uR56/Stx9OqojaLAQtZf9PrCHH9Hl8YXiEIka3H4NXJ3NOIBmQJTg7+j7buh34PMHfJujc8g==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", "dev": true, "dependencies": { - "@jest/expect-utils": "^29.6.1", - "@types/node": "*", - "jest-get-type": "^29.4.3", - "jest-matcher-utils": "^29.6.1", - "jest-message-util": "^29.6.1", - "jest-util": "^29.6.1" + "@jest/expect-utils": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" @@ -2621,9 +2750,9 @@ "dev": true }, "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "hasInstallScript": true, "optional": true, @@ -2634,12 +2763,6 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, - "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, "node_modules/gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", @@ -2995,13 +3118,10 @@ } }, "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz", + "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==", "dev": true, - "dependencies": { - "function-bind": "^1.1.1" - }, "engines": { "node": ">= 0.4.0" } @@ -3190,9 +3310,9 @@ "dev": true }, "node_modules/is-core-module": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz", - "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==", + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", + "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", "dev": true, "dependencies": { "has": "^1.0.3" @@ -3337,33 +3457,66 @@ } }, "node_modules/istanbul-lib-instrument": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.1.tgz", + "integrity": "sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==", "dev": true, "dependencies": { "@babel/core": "^7.12.3", "@babel/parser": "^7.14.7", "@istanbuljs/schema": "^0.1.2", "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" + "semver": "^7.5.4" }, "engines": { - "node": ">=8" + "node": ">=10" + } + }, + "node_modules/istanbul-lib-instrument/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-instrument/node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" } }, + "node_modules/istanbul-lib-instrument/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", "dev": true, "dependencies": { "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^3.0.0", + "make-dir": "^4.0.0", "supports-color": "^7.1.0" }, "engines": { - "node": ">=8" + "node": ">=10" } }, "node_modules/istanbul-lib-report/node_modules/has-flag": { @@ -3402,9 +3555,9 @@ } }, "node_modules/istanbul-reports": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz", - "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz", + "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==", "dev": true, "dependencies": { "html-escaper": "^2.0.0", @@ -3415,15 +3568,15 @@ } }, "node_modules/jest": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.1.tgz", - "integrity": "sha512-Nirw5B4nn69rVUZtemCQhwxOBhm0nsp3hmtF4rzCeWD7BkjAXRIji7xWQfnTNbz9g0aVsBX6aZK3n+23LM6uDw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", + "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", "dev": true, "dependencies": { - "@jest/core": "^29.6.1", - "@jest/types": "^29.6.1", + "@jest/core": "^29.7.0", + "@jest/types": "^29.6.3", "import-local": "^3.0.2", - "jest-cli": "^29.6.1" + "jest-cli": "^29.7.0" }, "bin": { "jest": "bin/jest.js" @@ -3441,12 +3594,13 @@ } }, "node_modules/jest-changed-files": { - "version": "29.5.0", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.5.0.tgz", - "integrity": "sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz", + "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==", "dev": true, "dependencies": { "execa": "^5.0.0", + "jest-util": "^29.7.0", "p-limit": "^3.1.0" }, "engines": { @@ -3454,28 +3608,28 @@ } }, "node_modules/jest-circus": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.1.tgz", - "integrity": "sha512-tPbYLEiBU4MYAL2XoZme/bgfUeotpDBd81lgHLCbDZZFaGmECk0b+/xejPFtmiBP87GgP/y4jplcRpbH+fgCzQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz", + "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==", "dev": true, "dependencies": { - "@jest/environment": "^29.6.1", - "@jest/expect": "^29.6.1", - "@jest/test-result": "^29.6.1", - "@jest/types": "^29.6.1", + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", "co": "^4.6.0", - "dedent": "^0.7.0", + "dedent": "^1.0.0", "is-generator-fn": "^2.0.0", - "jest-each": "^29.6.1", - "jest-matcher-utils": "^29.6.1", - "jest-message-util": "^29.6.1", - "jest-runtime": "^29.6.1", - "jest-snapshot": "^29.6.1", - "jest-util": "^29.6.1", + "jest-each": "^29.7.0", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", "p-limit": "^3.1.0", - "pretty-format": "^29.6.1", + "pretty-format": "^29.7.0", "pure-rand": "^6.0.0", "slash": "^3.0.0", "stack-utils": "^2.0.3" @@ -3555,22 +3709,21 @@ } }, "node_modules/jest-cli": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.1.tgz", - "integrity": "sha512-607dSgTA4ODIN6go9w6xY3EYkyPFGicx51a69H7yfvt7lN53xNswEVLovq+E77VsTRi5fWprLH0yl4DJgE8Ing==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", + "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==", "dev": true, "dependencies": { - "@jest/core": "^29.6.1", - "@jest/test-result": "^29.6.1", - "@jest/types": "^29.6.1", + "@jest/core": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", "chalk": "^4.0.0", + "create-jest": "^29.7.0", "exit": "^0.1.2", - "graceful-fs": "^4.2.9", "import-local": "^3.0.2", - "jest-config": "^29.6.1", - "jest-util": "^29.6.1", - "jest-validate": "^29.6.1", - "prompts": "^2.0.1", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", "yargs": "^17.3.1" }, "bin": { @@ -3659,31 +3812,31 @@ } }, "node_modules/jest-config": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.1.tgz", - "integrity": "sha512-XdjYV2fy2xYixUiV2Wc54t3Z4oxYPAELUzWnV6+mcbq0rh742X2p52pii5A3oeRzYjLnQxCsZmp0qpI6klE2cQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", + "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==", "dev": true, "dependencies": { "@babel/core": "^7.11.6", - "@jest/test-sequencer": "^29.6.1", - "@jest/types": "^29.6.1", - "babel-jest": "^29.6.1", + "@jest/test-sequencer": "^29.7.0", + "@jest/types": "^29.6.3", + "babel-jest": "^29.7.0", "chalk": "^4.0.0", "ci-info": "^3.2.0", "deepmerge": "^4.2.2", "glob": "^7.1.3", "graceful-fs": "^4.2.9", - "jest-circus": "^29.6.1", - "jest-environment-node": "^29.6.1", - "jest-get-type": "^29.4.3", - "jest-regex-util": "^29.4.3", - "jest-resolve": "^29.6.1", - "jest-runner": "^29.6.1", - "jest-util": "^29.6.1", - "jest-validate": "^29.6.1", + "jest-circus": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", "micromatch": "^4.0.4", "parse-json": "^5.2.0", - "pretty-format": "^29.6.1", + "pretty-format": "^29.7.0", "slash": "^3.0.0", "strip-json-comments": "^3.1.1" }, @@ -3774,15 +3927,15 @@ } }, "node_modules/jest-diff": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.1.tgz", - "integrity": "sha512-FsNCvinvl8oVxpNLttNQX7FAq7vR+gMDGj90tiP7siWw1UdakWUGqrylpsYrpvj908IYckm5Y0Q7azNAozU1Kg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", + "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", "dev": true, "dependencies": { "chalk": "^4.0.0", - "diff-sequences": "^29.4.3", - "jest-get-type": "^29.4.3", - "pretty-format": "^29.6.1" + "diff-sequences": "^29.6.3", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" @@ -3859,9 +4012,9 @@ } }, "node_modules/jest-docblock": { - "version": "29.4.3", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.4.3.tgz", - "integrity": "sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", + "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==", "dev": true, "dependencies": { "detect-newline": "^3.0.0" @@ -3871,16 +4024,16 @@ } }, "node_modules/jest-each": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.6.1.tgz", - "integrity": "sha512-n5eoj5eiTHpKQCAVcNTT7DRqeUmJ01hsAL0Q1SMiBHcBcvTKDELixQOGMCpqhbIuTcfC4kMfSnpmDqRgRJcLNQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz", + "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==", "dev": true, "dependencies": { - "@jest/types": "^29.6.1", + "@jest/types": "^29.6.3", "chalk": "^4.0.0", - "jest-get-type": "^29.4.3", - "jest-util": "^29.6.1", - "pretty-format": "^29.6.1" + "jest-get-type": "^29.6.3", + "jest-util": "^29.7.0", + "pretty-format": "^29.7.0" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" @@ -3957,18 +4110,18 @@ } }, "node_modules/jest-environment-jsdom": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.1.tgz", - "integrity": "sha512-PoY+yLaHzVRhVEjcVKSfJ7wXmJW4UqPYNhR05h7u/TK0ouf6DmRNZFBL/Z00zgQMyWGMBXn69/FmOvhEJu8cIw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz", + "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==", "dev": true, "dependencies": { - "@jest/environment": "^29.6.1", - "@jest/fake-timers": "^29.6.1", - "@jest/types": "^29.6.1", + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", "@types/jsdom": "^20.0.0", "@types/node": "*", - "jest-mock": "^29.6.1", - "jest-util": "^29.6.1", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0", "jsdom": "^20.0.0" }, "engines": { @@ -3984,46 +4137,46 @@ } }, "node_modules/jest-environment-node": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.1.tgz", - "integrity": "sha512-ZNIfAiE+foBog24W+2caIldl4Irh8Lx1PUhg/GZ0odM1d/h2qORAsejiFc7zb+SEmYPn1yDZzEDSU5PmDkmVLQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", + "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==", "dev": true, "dependencies": { - "@jest/environment": "^29.6.1", - "@jest/fake-timers": "^29.6.1", - "@jest/types": "^29.6.1", + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", - "jest-mock": "^29.6.1", - "jest-util": "^29.6.1" + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-get-type": { - "version": "29.4.3", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz", - "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", + "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", "dev": true, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-haste-map": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.1.tgz", - "integrity": "sha512-0m7f9PZXxOCk1gRACiVgX85knUKPKLPg4oRCjLoqIm9brTHXaorMA0JpmtmVkQiT8nmXyIVoZd/nnH1cfC33ig==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", + "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", "dev": true, "dependencies": { - "@jest/types": "^29.6.1", + "@jest/types": "^29.6.3", "@types/graceful-fs": "^4.1.3", "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", "graceful-fs": "^4.2.9", - "jest-regex-util": "^29.4.3", - "jest-util": "^29.6.1", - "jest-worker": "^29.6.1", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", "micromatch": "^4.0.4", "walker": "^1.0.8" }, @@ -4035,28 +4188,28 @@ } }, "node_modules/jest-leak-detector": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.6.1.tgz", - "integrity": "sha512-OrxMNyZirpOEwkF3UHnIkAiZbtkBWiye+hhBweCHkVbCgyEy71Mwbb5zgeTNYWJBi1qgDVfPC1IwO9dVEeTLwQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz", + "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==", "dev": true, "dependencies": { - "jest-get-type": "^29.4.3", - "pretty-format": "^29.6.1" + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-matcher-utils": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.1.tgz", - "integrity": "sha512-SLaztw9d2mfQQKHmJXKM0HCbl2PPVld/t9Xa6P9sgiExijviSp7TnZZpw2Fpt+OI3nwUO/slJbOfzfUMKKC5QA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", + "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", "dev": true, "dependencies": { "chalk": "^4.0.0", - "jest-diff": "^29.6.1", - "jest-get-type": "^29.4.3", - "pretty-format": "^29.6.1" + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" @@ -4133,18 +4286,18 @@ } }, "node_modules/jest-message-util": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.1.tgz", - "integrity": "sha512-KoAW2zAmNSd3Gk88uJ56qXUWbFk787QKmjjJVOjtGFmmGSZgDBrlIL4AfQw1xyMYPNVD7dNInfIbur9B2rd/wQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", + "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", "dev": true, "dependencies": { "@babel/code-frame": "^7.12.13", - "@jest/types": "^29.6.1", + "@jest/types": "^29.6.3", "@types/stack-utils": "^2.0.0", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", "micromatch": "^4.0.4", - "pretty-format": "^29.6.1", + "pretty-format": "^29.7.0", "slash": "^3.0.0", "stack-utils": "^2.0.3" }, @@ -4223,14 +4376,14 @@ } }, "node_modules/jest-mock": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.1.tgz", - "integrity": "sha512-brovyV9HBkjXAEdRooaTQK42n8usKoSRR3gihzUpYeV/vwqgSoNfrksO7UfSACnPmxasO/8TmHM3w9Hp3G1dgw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", + "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", "dev": true, "dependencies": { - "@jest/types": "^29.6.1", + "@jest/types": "^29.6.3", "@types/node": "*", - "jest-util": "^29.6.1" + "jest-util": "^29.7.0" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" @@ -4254,26 +4407,26 @@ } }, "node_modules/jest-regex-util": { - "version": "29.4.3", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz", - "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", + "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", "dev": true, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-resolve": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.1.tgz", - "integrity": "sha512-AeRkyS8g37UyJiP9w3mmI/VXU/q8l/IH52vj/cDAyScDcemRbSBhfX/NMYIGilQgSVwsjxrCHf3XJu4f+lxCMg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz", + "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==", "dev": true, "dependencies": { "chalk": "^4.0.0", "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.6.1", + "jest-haste-map": "^29.7.0", "jest-pnp-resolver": "^1.2.2", - "jest-util": "^29.6.1", - "jest-validate": "^29.6.1", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", "resolve": "^1.20.0", "resolve.exports": "^2.0.0", "slash": "^3.0.0" @@ -4283,13 +4436,13 @@ } }, "node_modules/jest-resolve-dependencies": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.1.tgz", - "integrity": "sha512-BbFvxLXtcldaFOhNMXmHRWx1nXQO5LoXiKSGQcA1LxxirYceZT6ch8KTE1bK3X31TNG/JbkI7OkS/ABexVahiw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz", + "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==", "dev": true, "dependencies": { - "jest-regex-util": "^29.4.3", - "jest-snapshot": "^29.6.1" + "jest-regex-util": "^29.6.3", + "jest-snapshot": "^29.7.0" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" @@ -4366,30 +4519,30 @@ } }, "node_modules/jest-runner": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.1.tgz", - "integrity": "sha512-tw0wb2Q9yhjAQ2w8rHRDxteryyIck7gIzQE4Reu3JuOBpGp96xWgF0nY8MDdejzrLCZKDcp8JlZrBN/EtkQvPQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", + "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==", "dev": true, "dependencies": { - "@jest/console": "^29.6.1", - "@jest/environment": "^29.6.1", - "@jest/test-result": "^29.6.1", - "@jest/transform": "^29.6.1", - "@jest/types": "^29.6.1", + "@jest/console": "^29.7.0", + "@jest/environment": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", "emittery": "^0.13.1", "graceful-fs": "^4.2.9", - "jest-docblock": "^29.4.3", - "jest-environment-node": "^29.6.1", - "jest-haste-map": "^29.6.1", - "jest-leak-detector": "^29.6.1", - "jest-message-util": "^29.6.1", - "jest-resolve": "^29.6.1", - "jest-runtime": "^29.6.1", - "jest-util": "^29.6.1", - "jest-watcher": "^29.6.1", - "jest-worker": "^29.6.1", + "jest-docblock": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-leak-detector": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-resolve": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-util": "^29.7.0", + "jest-watcher": "^29.7.0", + "jest-worker": "^29.7.0", "p-limit": "^3.1.0", "source-map-support": "0.5.13" }, @@ -4468,31 +4621,31 @@ } }, "node_modules/jest-runtime": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.1.tgz", - "integrity": "sha512-D6/AYOA+Lhs5e5il8+5pSLemjtJezUr+8zx+Sn8xlmOux3XOqx4d8l/2udBea8CRPqqrzhsKUsN/gBDE/IcaPQ==", - "dev": true, - "dependencies": { - "@jest/environment": "^29.6.1", - "@jest/fake-timers": "^29.6.1", - "@jest/globals": "^29.6.1", - "@jest/source-map": "^29.6.0", - "@jest/test-result": "^29.6.1", - "@jest/transform": "^29.6.1", - "@jest/types": "^29.6.1", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", + "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/globals": "^29.7.0", + "@jest/source-map": "^29.6.3", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", "cjs-module-lexer": "^1.0.0", "collect-v8-coverage": "^1.0.0", "glob": "^7.1.3", "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.6.1", - "jest-message-util": "^29.6.1", - "jest-mock": "^29.6.1", - "jest-regex-util": "^29.4.3", - "jest-resolve": "^29.6.1", - "jest-snapshot": "^29.6.1", - "jest-util": "^29.6.1", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", "slash": "^3.0.0", "strip-bom": "^4.0.0" }, @@ -4571,9 +4724,9 @@ } }, "node_modules/jest-snapshot": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.1.tgz", - "integrity": "sha512-G4UQE1QQ6OaCgfY+A0uR1W2AY0tGXUPQpoUClhWHq1Xdnx1H6JOrC2nH5lqnOEqaDgbHFgIwZ7bNq24HpB180A==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", + "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==", "dev": true, "dependencies": { "@babel/core": "^7.11.6", @@ -4581,21 +4734,20 @@ "@babel/plugin-syntax-jsx": "^7.7.2", "@babel/plugin-syntax-typescript": "^7.7.2", "@babel/types": "^7.3.3", - "@jest/expect-utils": "^29.6.1", - "@jest/transform": "^29.6.1", - "@jest/types": "^29.6.1", - "@types/prettier": "^2.1.5", + "@jest/expect-utils": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", "babel-preset-current-node-syntax": "^1.0.0", "chalk": "^4.0.0", - "expect": "^29.6.1", + "expect": "^29.7.0", "graceful-fs": "^4.2.9", - "jest-diff": "^29.6.1", - "jest-get-type": "^29.4.3", - "jest-matcher-utils": "^29.6.1", - "jest-message-util": "^29.6.1", - "jest-util": "^29.6.1", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", "natural-compare": "^1.4.0", - "pretty-format": "^29.6.1", + "pretty-format": "^29.7.0", "semver": "^7.5.3" }, "engines": { @@ -4706,12 +4858,12 @@ "dev": true }, "node_modules/jest-util": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.1.tgz", - "integrity": "sha512-NRFCcjc+/uO3ijUVyNOQJluf8PtGCe/W6cix36+M3cTFgiYqFOOW5MgN4JOOcvbUhcKTYVd1CvHz/LWi8d16Mg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, "dependencies": { - "@jest/types": "^29.6.1", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", "ci-info": "^3.2.0", @@ -4793,17 +4945,17 @@ } }, "node_modules/jest-validate": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.1.tgz", - "integrity": "sha512-r3Ds69/0KCN4vx4sYAbGL1EVpZ7MSS0vLmd3gV78O+NAx3PDQQukRU5hNHPXlyqCgFY8XUk7EuTMLugh0KzahA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", + "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", "dev": true, "dependencies": { - "@jest/types": "^29.6.1", + "@jest/types": "^29.6.3", "camelcase": "^6.2.0", "chalk": "^4.0.0", - "jest-get-type": "^29.4.3", + "jest-get-type": "^29.6.3", "leven": "^3.1.0", - "pretty-format": "^29.6.1" + "pretty-format": "^29.7.0" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" @@ -4892,18 +5044,18 @@ } }, "node_modules/jest-watcher": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.1.tgz", - "integrity": "sha512-d4wpjWTS7HEZPaaj8m36QiaP856JthRZkrgcIY/7ISoUWPIillrXM23WPboZVLbiwZBt4/qn2Jke84Sla6JhFA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", + "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==", "dev": true, "dependencies": { - "@jest/test-result": "^29.6.1", - "@jest/types": "^29.6.1", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "ansi-escapes": "^4.2.1", "chalk": "^4.0.0", "emittery": "^0.13.1", - "jest-util": "^29.6.1", + "jest-util": "^29.7.0", "string-length": "^4.0.1" }, "engines": { @@ -4981,13 +5133,13 @@ } }, "node_modules/jest-worker": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.1.tgz", - "integrity": "sha512-U+Wrbca7S8ZAxAe9L6nb6g8kPdia5hj32Puu5iOqBCMTMWFHXuK6dOV2IFrpedbTV8fjMFLdWNttQTBL6u2MRA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", + "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", "dev": true, "dependencies": { "@types/node": "*", - "jest-util": "^29.6.1", + "jest-util": "^29.7.0", "merge-stream": "^2.0.0", "supports-color": "^8.0.0" }, @@ -5218,9 +5370,9 @@ "dev": true }, "node_modules/linkify-it": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz", - "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz", + "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==", "dev": true, "dependencies": { "uc.micro": "^1.0.1" @@ -5260,20 +5412,53 @@ } }, "node_modules/make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", "dev": true, "dependencies": { - "semver": "^6.0.0" + "semver": "^7.5.3" }, "engines": { - "node": ">=8" + "node": ">=10" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/make-dir/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/make-dir/node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/make-dir/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/make-iterator": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz", @@ -5305,14 +5490,14 @@ } }, "node_modules/markdown-it": { - "version": "12.3.2", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz", - "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==", + "version": "13.0.2", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.2.tgz", + "integrity": "sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==", "dev": true, "dependencies": { "argparse": "^2.0.1", - "entities": "~2.1.0", - "linkify-it": "^3.0.1", + "entities": "~3.0.1", + "linkify-it": "^4.0.1", "mdurl": "^1.0.1", "uc.micro": "^1.0.5" }, @@ -5415,16 +5600,16 @@ } }, "node_modules/modernizr": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/modernizr/-/modernizr-3.12.0.tgz", - "integrity": "sha512-i5f5xfnxMOb3cePoBpwk4bWjVAyIB3hgm7QrDvZx/R7zUUS8PO9zlyQF7vJKn8kCVxEvL0nRWeZ0PPqVbY31sw==", + "version": "3.13.0", + "resolved": "https://registry.npmjs.org/modernizr/-/modernizr-3.13.0.tgz", + "integrity": "sha512-dV0tCbZ/XN4m+NPfHw9O/zGT/uyrBlFkPW7q8k1Bx669j9kGcPnhi3UFG/c0zaRWbfOWtqgOCHu0VLpHa/WSSQ==", "dev": true, "dependencies": { "doctrine": "^3.0.0", "file": "^0.2.2", "lodash": "^4.17.21", - "markdown-it": "^12.3.2", - "mkdirp": "0.5.5", + "markdown-it": "^13.0.1", + "mkdirp": "0.5.6", "requirejs": "^2.3.6", "yargs": "^15.4.1" }, @@ -5489,12 +5674,12 @@ "dev": true }, "node_modules/modernizr/node_modules/mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", "dev": true, "dependencies": { - "minimist": "^1.2.5" + "minimist": "^1.2.6" }, "bin": { "mkdirp": "bin/cmd.js" @@ -5956,12 +6141,12 @@ "integrity": "sha512-89F9g6RuIfc7fWO5fuBkf8gb1LqxwCuukCDojBpjbgbHA6utnX+UEwGUn92rXciCFQTtkIzewYjtRzLLg2adpQ==" }, "node_modules/pretty-format": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.1.tgz", - "integrity": "sha512-7jRj+yXO0W7e4/tSJKoR7HRIHLPPjtNaUGG2xxKQnGvPNRkgWcQ0AZX6P4KBRJN4FcTBWb3sa7DVUJmocYuoog==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", "dev": true, "dependencies": { - "@jest/schemas": "^29.6.0", + "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", "react-is": "^18.0.0" }, @@ -6016,9 +6201,9 @@ } }, "node_modules/pure-rand": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.2.tgz", - "integrity": "sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==", + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.4.tgz", + "integrity": "sha512-LA0Y9kxMYv47GIPJy6MI84fqTd2HmYZI83W/kM/SkKfDlajnZYfmXFTxkbY+xSBPkLJxltMa9hIkmdc29eguMA==", "dev": true, "funding": [ { @@ -6090,12 +6275,12 @@ "dev": true }, "node_modules/resolve": { - "version": "1.22.2", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz", - "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==", + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", "dev": true, "dependencies": { - "is-core-module": "^2.11.0", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -6180,9 +6365,9 @@ } }, "node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -6538,9 +6723,15 @@ } }, "node_modules/underscore.string/node_modules/sprintf-js": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", - "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", + "dev": true + }, + "node_modules/undici-types": { + "version": "5.25.3", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.25.3.tgz", + "integrity": "sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==", "dev": true }, "node_modules/universalify": { @@ -6553,9 +6744,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", - "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", "dev": true, "funding": [ { @@ -6599,25 +6790,19 @@ "dev": true }, "node_modules/v8-to-istanbul": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz", - "integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==", + "version": "9.1.3", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.3.tgz", + "integrity": "sha512-9lDD+EVI2fjFsMWXc6dy5JJzBsVTcQ2fVkfBvncZ6xJWG9wtBhOldG+mHkSL0+V1K/xgZz0JDO5UT5hFwHUghg==", "dev": true, "dependencies": { "@jridgewell/trace-mapping": "^0.3.12", "@types/istanbul-lib-coverage": "^2.0.1", - "convert-source-map": "^1.6.0" + "convert-source-map": "^2.0.0" }, "engines": { "node": ">=10.12.0" } }, - "node_modules/v8-to-istanbul/node_modules/convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", - "dev": true - }, "node_modules/v8flags": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz", @@ -6806,9 +6991,9 @@ } }, "node_modules/ws": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", - "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", + "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", "dev": true, "engines": { "node": ">=10.0.0" diff --git a/themes/package-lock.json b/themes/package-lock.json index f371997d52e..3afa5b25e72 100644 --- a/themes/package-lock.json +++ b/themes/package-lock.json @@ -44,22 +44,22 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", - "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz", - "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", + "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.22.5", - "chalk": "^2.0.0", + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, "engines": { @@ -153,9 +153,9 @@ } }, "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz", - "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -240,9 +240,9 @@ } }, "node_modules/@types/json-schema": { - "version": "7.0.12", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz", - "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==", + "version": "7.0.14", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.14.tgz", + "integrity": "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==", "dev": true }, "node_modules/@types/json5": { @@ -258,19 +258,19 @@ "dev": true }, "node_modules/@types/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==", "dev": true }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.61.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.61.0.tgz", - "integrity": "sha512-W8VoMjoSg7f7nqAROEmTt6LoBpn81AegP7uKhhW5KzYlehs8VV0ZW0fIDVbcZRcaP3aPSW+JZFua+ysQN+m/Nw==", + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", + "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.61.0", - "@typescript-eslint/visitor-keys": "5.61.0" + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -281,9 +281,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.61.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.61.0.tgz", - "integrity": "sha512-ldyueo58KjngXpzloHUog/h9REmHl59G1b3a5Sng1GfBo14BkS3ZbMEb3693gnP1k//97lh7bKsp6/V/0v1veQ==", + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", + "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -294,13 +294,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.61.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.61.0.tgz", - "integrity": "sha512-Fud90PxONnnLZ36oR5ClJBLTLfU4pIWBmnvGwTbEa2cXIqj70AEDEmOmpkFComjBZ/037ueKrOdHuYmSFVD7Rw==", + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", + "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.61.0", - "@typescript-eslint/visitor-keys": "5.61.0", + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -321,17 +321,17 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "5.61.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.61.0.tgz", - "integrity": "sha512-mV6O+6VgQmVE6+xzlA91xifndPW9ElFW8vbSF0xCT/czPXVhwDewKila1jOyRwa9AE19zKnrr7Cg5S3pJVrTWQ==", + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", + "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@types/json-schema": "^7.0.9", "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.61.0", - "@typescript-eslint/types": "5.61.0", - "@typescript-eslint/typescript-estree": "5.61.0", + "@typescript-eslint/scope-manager": "5.62.0", + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/typescript-estree": "5.62.0", "eslint-scope": "^5.1.1", "semver": "^7.3.7" }, @@ -347,12 +347,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.61.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.61.0.tgz", - "integrity": "sha512-50XQ5VdbWrX06mQXhy93WywSFZZGsv3EOjq+lqp6WC2t+j3mb6A9xYVdrRxafvK88vg9k9u+CT4l6D8PEatjKg==", + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", + "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.61.0", + "@typescript-eslint/types": "5.62.0", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -364,9 +364,9 @@ } }, "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz", - "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -514,15 +514,15 @@ } }, "node_modules/array-includes": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", - "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz", + "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", "is-string": "^1.0.7" }, "engines": { @@ -550,15 +550,34 @@ "node": ">=8" } }, + "node_modules/array.prototype.findlastindex": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", + "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0", + "get-intrinsic": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/array.prototype.flat": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", - "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", + "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" }, "engines": { @@ -569,14 +588,14 @@ } }, "node_modules/array.prototype.flatmap": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz", - "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", + "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" }, "engines": { @@ -586,6 +605,27 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz", + "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", + "is-array-buffer": "^3.0.2", + "is-shared-array-buffer": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/arrify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", @@ -678,13 +718,14 @@ "dev": true }, "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", + "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", "dev": true, "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.1", + "set-function-length": "^1.1.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -910,12 +951,27 @@ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, + "node_modules/define-data-property": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", + "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/define-properties": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", - "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", "dev": true, "dependencies": { + "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" }, @@ -987,12 +1043,13 @@ "dev": true }, "node_modules/enquirer": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", - "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", + "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", "dev": true, "dependencies": { - "ansi-colors": "^4.1.1" + "ansi-colors": "^4.1.1", + "strip-ansi": "^6.0.1" }, "engines": { "node": ">=8.6" @@ -1021,18 +1078,19 @@ } }, "node_modules/es-abstract": { - "version": "1.21.2", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz", - "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==", + "version": "1.22.2", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.2.tgz", + "integrity": "sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA==", "dev": true, "dependencies": { "array-buffer-byte-length": "^1.0.0", + "arraybuffer.prototype.slice": "^1.0.2", "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", "es-set-tostringtag": "^2.0.1", "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.2.0", + "function.prototype.name": "^1.1.6", + "get-intrinsic": "^1.2.1", "get-symbol-description": "^1.0.0", "globalthis": "^1.0.3", "gopd": "^1.0.1", @@ -1047,19 +1105,23 @@ "is-regex": "^1.1.4", "is-shared-array-buffer": "^1.0.2", "is-string": "^1.0.7", - "is-typed-array": "^1.1.10", + "is-typed-array": "^1.1.12", "is-weakref": "^1.0.2", "object-inspect": "^1.12.3", "object-keys": "^1.1.1", "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.4.3", + "regexp.prototype.flags": "^1.5.1", + "safe-array-concat": "^1.0.1", "safe-regex-test": "^1.0.0", - "string.prototype.trim": "^1.2.7", - "string.prototype.trimend": "^1.0.6", - "string.prototype.trimstart": "^1.0.6", + "string.prototype.trim": "^1.2.8", + "string.prototype.trimend": "^1.0.7", + "string.prototype.trimstart": "^1.0.7", + "typed-array-buffer": "^1.0.0", + "typed-array-byte-length": "^1.0.0", + "typed-array-byte-offset": "^1.0.0", "typed-array-length": "^1.0.4", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.9" + "which-typed-array": "^1.1.11" }, "engines": { "node": ">= 0.4" @@ -1204,14 +1266,14 @@ } }, "node_modules/eslint-import-resolver-node": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz", - "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==", + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", "dev": true, "dependencies": { "debug": "^3.2.7", - "is-core-module": "^2.11.0", - "resolve": "^1.22.1" + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" } }, "node_modules/eslint-import-resolver-node/node_modules/debug": { @@ -1269,26 +1331,28 @@ } }, "node_modules/eslint-plugin-import": { - "version": "2.27.5", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz", - "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==", + "version": "2.28.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz", + "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==", "dev": true, "dependencies": { "array-includes": "^3.1.6", + "array.prototype.findlastindex": "^1.2.2", "array.prototype.flat": "^1.3.1", "array.prototype.flatmap": "^1.3.1", "debug": "^3.2.7", "doctrine": "^2.1.0", "eslint-import-resolver-node": "^0.3.7", - "eslint-module-utils": "^2.7.4", + "eslint-module-utils": "^2.8.0", "has": "^1.0.3", - "is-core-module": "^2.11.0", + "is-core-module": "^2.13.0", "is-glob": "^4.0.3", "minimatch": "^3.1.2", + "object.fromentries": "^2.0.6", + "object.groupby": "^1.0.0", "object.values": "^1.1.6", - "resolve": "^1.22.1", - "semver": "^6.3.0", - "tsconfig-paths": "^3.14.1" + "semver": "^6.3.1", + "tsconfig-paths": "^3.14.2" }, "engines": { "node": ">=4" @@ -1319,9 +1383,9 @@ } }, "node_modules/eslint-plugin-import/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -1381,9 +1445,9 @@ } }, "node_modules/eslint-plugin-node/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -1649,9 +1713,9 @@ "dev": true }, "node_modules/fast-glob": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz", - "integrity": "sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", + "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", @@ -1796,22 +1860,23 @@ } }, "node_modules/flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz", + "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==", "dev": true, "dependencies": { - "flatted": "^3.1.0", + "flatted": "^3.2.9", + "keyv": "^4.5.3", "rimraf": "^3.0.2" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=12.0.0" } }, "node_modules/flatted": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", - "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", "dev": true }, "node_modules/for-each": { @@ -1851,9 +1916,9 @@ "dev": true }, "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "hasInstallScript": true, "optional": true, @@ -1865,21 +1930,24 @@ } }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/function.prototype.name": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", - "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "functions-have-names": "^1.2.3" }, "engines": { "node": ">= 0.4" @@ -2018,9 +2086,9 @@ } }, "node_modules/globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", + "version": "13.23.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", + "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -2728,9 +2796,9 @@ } }, "node_modules/gruntify-eslint/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "bin": { "semver": "bin/semver" @@ -2891,13 +2959,10 @@ } }, "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz", + "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==", "dev": true, - "dependencies": { - "function-bind": "^1.1.1" - }, "engines": { "node": ">= 0.4.0" } @@ -3371,9 +3436,9 @@ } }, "node_modules/is-core-module": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz", - "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==", + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", + "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", "dev": true, "dependencies": { "has": "^1.0.3" @@ -3546,16 +3611,12 @@ } }, "node_modules/is-typed-array": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz", - "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", + "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" + "which-typed-array": "^1.1.11" }, "engines": { "node": ">= 0.4" @@ -3603,6 +3664,12 @@ "node": ">=0.10.0" } }, + "node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true + }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -3658,6 +3725,12 @@ "esprima": "^4.0.1" } }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -3682,6 +3755,15 @@ "json5": "lib/cli.js" } }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "dependencies": { + "json-buffer": "3.0.1" + } + }, "node_modules/kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -3881,9 +3963,9 @@ } }, "node_modules/make-dir/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "optional": true, "bin": { @@ -4166,9 +4248,9 @@ } }, "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", + "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -4216,6 +4298,35 @@ "node": ">=0.10.0" } }, + "node_modules/object.fromentries": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz", + "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.groupby": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz", + "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1" + } + }, "node_modules/object.map": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz", @@ -4242,14 +4353,14 @@ } }, "node_modules/object.values": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", - "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz", + "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "engines": { "node": ">= 0.4" @@ -4617,14 +4728,14 @@ } }, "node_modules/regexp.prototype.flags": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", - "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", + "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", - "functions-have-names": "^1.2.3" + "set-function-name": "^2.0.0" }, "engines": { "node": ">= 0.4" @@ -4667,12 +4778,12 @@ } }, "node_modules/resolve": { - "version": "1.22.2", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz", - "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==", + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", "dev": true, "dependencies": { - "is-core-module": "^2.11.0", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -4808,6 +4919,24 @@ "npm": ">=2.0.0" } }, + "node_modules/safe-array-concat": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz", + "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1", + "has-symbols": "^1.0.3", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -4884,6 +5013,35 @@ "node": ">=10" } }, + "node_modules/set-function-length": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", + "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", + "dev": true, + "dependencies": { + "define-data-property": "^1.1.1", + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-function-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", + "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "dev": true, + "dependencies": { + "define-data-property": "^1.0.1", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -4994,14 +5152,14 @@ } }, "node_modules/string.prototype.trim": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", - "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz", + "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "engines": { "node": ">= 0.4" @@ -5011,28 +5169,28 @@ } }, "node_modules/string.prototype.trimend": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", - "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz", + "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/string.prototype.trimstart": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", - "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz", + "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5261,6 +5419,57 @@ "url": "https://bevry.me/fund" } }, + "node_modules/typed-array-buffer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", + "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typed-array-byte-length": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", + "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", + "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", + "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/typed-array-length": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", @@ -5276,9 +5485,9 @@ } }, "node_modules/typescript": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", - "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "dev": true, "peer": true, "bin": { @@ -5339,9 +5548,9 @@ } }, "node_modules/underscore.string/node_modules/sprintf-js": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", - "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", "dev": true }, "node_modules/uri-js": { @@ -5369,9 +5578,9 @@ "dev": true }, "node_modules/v8-compile-cache": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", - "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz", + "integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==", "dev": true }, "node_modules/v8flags": { @@ -5441,17 +5650,16 @@ } }, "node_modules/which-typed-array": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz", - "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz", + "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==", "dev": true, "dependencies": { "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "call-bind": "^1.0.4", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0", - "is-typed-array": "^1.1.10" + "has-tostringtag": "^1.0.0" }, "engines": { "node": ">= 0.4" From 91c973449e5005b751b31ccc35c4cd56bdcb449f Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 6 Nov 2023 10:25:18 +0100 Subject: [PATCH 498/730] chore: Update setasign/fpdi to 2.5.0 --- UPGRADE-5.7.md | 2 +- composer.json | 2 +- composer.lock | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 84b9d237b0e..69e5b0a579b 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -20,7 +20,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `laminas/laminas-code` to version 4.12.0 for PHP 8.1 and newer * Updated `phpunit/phpuit` to version 9.6.11 * Updated `setasign/fpdf` to version 1.8.6 -* Updated `setasign/fpdi` to version 2.4.1 +* Updated `setasign/fpdi` to version 2.5.0 * Updated `symfony/polyfill-php80` to version 1.28.0 * Updated `symfony/polyfill-php81` to version 1.28.0 * Updated `symfony/polyfill-php82` to version 1.28.0 diff --git a/composer.json b/composer.json index e007fd53114..3e63b8dbb59 100644 --- a/composer.json +++ b/composer.json @@ -68,7 +68,7 @@ "psr/log": "1.1.4", "ramsey/uuid": "4.2.3", "setasign/fpdf": "1.8.6", - "setasign/fpdi": "2.4.1", + "setasign/fpdi": "2.5.0", "stecman/symfony-console-completion": "0.11.0", "superbalist/flysystem-google-storage": "7.2.2", "symfony/config": "~4.4.34", diff --git a/composer.lock b/composer.lock index ce37643c3cd..8967af9f5c2 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": "a39fd5ba20eaa67be044cb23fe3255f1", + "content-hash": "f83cc118dae4303b49fd1ec73c78405c", "packages": [ { "name": "aws/aws-crt-php", @@ -3933,16 +3933,16 @@ }, { "name": "setasign/fpdi", - "version": "v2.4.1", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/Setasign/FPDI.git", - "reference": "f4ba73e5bc053ccc90b81717c5df1cb2ea7bae7b" + "reference": "ecf0459643ec963febfb9a5d529dcd93656006a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Setasign/FPDI/zipball/f4ba73e5bc053ccc90b81717c5df1cb2ea7bae7b", - "reference": "f4ba73e5bc053ccc90b81717c5df1cb2ea7bae7b", + "url": "https://api.github.com/repos/Setasign/FPDI/zipball/ecf0459643ec963febfb9a5d529dcd93656006a4", + "reference": "ecf0459643ec963febfb9a5d529dcd93656006a4", "shasum": "" }, "require": { @@ -3993,7 +3993,7 @@ ], "support": { "issues": "https://github.com/Setasign/FPDI/issues", - "source": "https://github.com/Setasign/FPDI/tree/v2.4.1" + "source": "https://github.com/Setasign/FPDI/tree/v2.5.0" }, "funding": [ { @@ -4001,7 +4001,7 @@ "type": "tidelift" } ], - "time": "2023-07-27T08:12:09+00:00" + "time": "2023-09-28T10:46:27+00:00" }, { "name": "stecman/symfony-console-completion", From 4b4d664203780212a3b3510f5c7812f6abfd843e Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 6 Nov 2023 10:27:15 +0100 Subject: [PATCH 499/730] chore: Update friends-of-behat/mink-extension to 2.7.4 --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 3e63b8dbb59..8a9883a7aa1 100644 --- a/composer.json +++ b/composer.json @@ -109,7 +109,7 @@ "behat/gherkin": "4.9.0", "behat/mink": "1.10.0", "behat/mink-selenium2-driver": "1.6.0", - "friends-of-behat/mink-extension": "2.7.3", + "friends-of-behat/mink-extension": "2.7.4", "php-parallel-lint/php-var-dump-check": "^0.5", "phpspec/prophecy-phpunit": "^2.0", "phpstan/extension-installer": "1.3.1", diff --git a/composer.lock b/composer.lock index 8967af9f5c2..30e56bb926f 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": "f83cc118dae4303b49fd1ec73c78405c", + "content-hash": "e848d63406fd41769844b147b2cafb55", "packages": [ { "name": "aws/aws-crt-php", @@ -7918,16 +7918,16 @@ }, { "name": "friends-of-behat/mink-extension", - "version": "v2.7.3", + "version": "v2.7.4", "source": { "type": "git", "url": "https://github.com/FriendsOfBehat/MinkExtension.git", - "reference": "b1ccaef9136f62c8efaad88b966345dd68374fa9" + "reference": "18d5a53dff3e2c8934c53e2db8b02b7ea345fe85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfBehat/MinkExtension/zipball/b1ccaef9136f62c8efaad88b966345dd68374fa9", - "reference": "b1ccaef9136f62c8efaad88b966345dd68374fa9", + "url": "https://api.github.com/repos/FriendsOfBehat/MinkExtension/zipball/18d5a53dff3e2c8934c53e2db8b02b7ea345fe85", + "reference": "18d5a53dff3e2c8934c53e2db8b02b7ea345fe85", "shasum": "" }, "require": { @@ -7977,9 +7977,9 @@ "web" ], "support": { - "source": "https://github.com/FriendsOfBehat/MinkExtension/tree/v2.7.3" + "source": "https://github.com/FriendsOfBehat/MinkExtension/tree/v2.7.4" }, - "time": "2023-09-12T09:50:10+00:00" + "time": "2023-10-03T13:15:12+00:00" }, { "name": "instaclick/php-webdriver", From 0b0d323b23c6d213afdecbce1f8032a733b86d29 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 6 Nov 2023 10:35:33 +0100 Subject: [PATCH 500/730] chore: Update laminas/laminas-code to 4.13.0 --- UPGRADE-5.7.md | 2 +- composer.json | 2 +- composer.lock | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 69e5b0a579b..dfbe69791a1 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -17,7 +17,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `guzzlehttp/guzzle` to version 7.8.0 * Updated `guzzlehttp/psr7` to version 2.6.1 * Updated `mpdf/mpdf` to version 8.2.0 -* Updated `laminas/laminas-code` to version 4.12.0 for PHP 8.1 and newer +* Updated `laminas/laminas-code` to version 4.13.0 for PHP 8.1 and newer * Updated `phpunit/phpuit` to version 9.6.11 * Updated `setasign/fpdf` to version 1.8.6 * Updated `setasign/fpdi` to version 2.5.0 diff --git a/composer.json b/composer.json index 8a9883a7aa1..17c3b65ca42 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,7 @@ "google/cloud-storage": "1.33.2", "guzzlehttp/guzzle": "~7.8.0", "guzzlehttp/psr7": "~2.6.1", - "laminas/laminas-code": "4.7.1 || 4.12.0", + "laminas/laminas-code": "4.7.1 || 4.13.0", "laminas/laminas-escaper": "2.12.0", "league/flysystem": "~1.1.4", "league/flysystem-aws-s3-v3": "1.0.30", diff --git a/composer.lock b/composer.lock index 30e56bb926f..d179d33808c 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": "e848d63406fd41769844b147b2cafb55", + "content-hash": "6be2097e20b0ff67f3933ac8c1eeca64", "packages": [ { "name": "aws/aws-crt-php", From 3f77c231a861c7865ee99322cec76c400d1a96fa Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 6 Nov 2023 10:37:09 +0100 Subject: [PATCH 501/730] chore: Update monolog/monolog to 2.9.2 --- UPGRADE-5.7.md | 1 + composer.json | 2 +- composer.lock | 14 +++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index dfbe69791a1..d5493679bb4 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -16,6 +16,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `google/cloud-storage` to version 1.33.2 * Updated `guzzlehttp/guzzle` to version 7.8.0 * Updated `guzzlehttp/psr7` to version 2.6.1 +* Updated `monolog/monolog` to version 2.9.2 * Updated `mpdf/mpdf` to version 8.2.0 * Updated `laminas/laminas-code` to version 4.13.0 for PHP 8.1 and newer * Updated `phpunit/phpuit` to version 9.6.11 diff --git a/composer.json b/composer.json index 17c3b65ca42..3058a5dd44e 100644 --- a/composer.json +++ b/composer.json @@ -61,7 +61,7 @@ "laminas/laminas-escaper": "2.12.0", "league/flysystem": "~1.1.4", "league/flysystem-aws-s3-v3": "1.0.30", - "monolog/monolog": "2.9.1", + "monolog/monolog": "2.9.2", "mpdf/mpdf": "8.2.0", "ongr/elasticsearch-dsl": "7.2.2", "psr/link": "1.0.0", diff --git a/composer.lock b/composer.lock index d179d33808c..e717cc19a9e 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": "6be2097e20b0ff67f3933ac8c1eeca64", + "content-hash": "ab3935b9f061d9299e78863fe766f743", "packages": [ { "name": "aws/aws-crt-php", @@ -2710,16 +2710,16 @@ }, { "name": "monolog/monolog", - "version": "2.9.1", + "version": "2.9.2", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1" + "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f259e2b15fb95494c83f52d3caad003bbf5ffaa1", - "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", + "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", "shasum": "" }, "require": { @@ -2796,7 +2796,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.9.1" + "source": "https://github.com/Seldaek/monolog/tree/2.9.2" }, "funding": [ { @@ -2808,7 +2808,7 @@ "type": "tidelift" } ], - "time": "2023-02-06T13:44:46+00:00" + "time": "2023-10-27T15:25:26+00:00" }, { "name": "mpdf/mpdf", From fcbd43c0dba71cfc283d4fc0d943b1d33323a47a Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 6 Nov 2023 10:39:17 +0100 Subject: [PATCH 502/730] chore: Update google/cloud-storage to 1.34.0 --- UPGRADE-5.7.md | 2 +- composer.json | 2 +- composer.lock | 66 +++++++++++++++++++++++++------------------------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index d5493679bb4..e97f3241132 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -13,7 +13,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `cocur/slugify` to version 4.5.1 for PHP 8.0 and newer * Updated `doctrine/orm` to version 2.15.5 -* Updated `google/cloud-storage` to version 1.33.2 +* Updated `google/cloud-storage` to version 1.34.0 * Updated `guzzlehttp/guzzle` to version 7.8.0 * Updated `guzzlehttp/psr7` to version 2.6.1 * Updated `monolog/monolog` to version 2.9.2 diff --git a/composer.json b/composer.json index 3058a5dd44e..b74b2d87ed4 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,7 @@ "elasticsearch/elasticsearch": "^7", "fig/link-util": "1.1.2", "friendsofphp/proxy-manager-lts": "1.0.16", - "google/cloud-storage": "1.33.2", + "google/cloud-storage": "1.34.0", "guzzlehttp/guzzle": "~7.8.0", "guzzlehttp/psr7": "~2.6.1", "laminas/laminas-code": "4.7.1 || 4.13.0", diff --git a/composer.lock b/composer.lock index e717cc19a9e..a52ea90677a 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": "ab3935b9f061d9299e78863fe766f743", + "content-hash": "585abaed0bfbf4b96f20661ae9826b4a", "packages": [ { "name": "aws/aws-crt-php", @@ -1718,16 +1718,16 @@ }, { "name": "firebase/php-jwt", - "version": "v6.8.1", + "version": "v6.9.0", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "5dbc8959427416b8ee09a100d7a8588c00fb2e26" + "reference": "f03270e63eaccf3019ef0f32849c497385774e11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/5dbc8959427416b8ee09a100d7a8588c00fb2e26", - "reference": "5dbc8959427416b8ee09a100d7a8588c00fb2e26", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/f03270e63eaccf3019ef0f32849c497385774e11", + "reference": "f03270e63eaccf3019ef0f32849c497385774e11", "shasum": "" }, "require": { @@ -1775,9 +1775,9 @@ ], "support": { "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v6.8.1" + "source": "https://github.com/firebase/php-jwt/tree/v6.9.0" }, - "time": "2023-07-14T18:33:00+00:00" + "time": "2023-10-05T00:24:42+00:00" }, { "name": "friendsofphp/proxy-manager-lts", @@ -1863,16 +1863,16 @@ }, { "name": "google/auth", - "version": "v1.30.0", + "version": "v1.32.1", "source": { "type": "git", "url": "https://github.com/googleapis/google-auth-library-php.git", - "reference": "6028b072aa444d7edecbed603431322026704627" + "reference": "999e9ce8b9d17914f04e1718271a0a46da4de2f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/6028b072aa444d7edecbed603431322026704627", - "reference": "6028b072aa444d7edecbed603431322026704627", + "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/999e9ce8b9d17914f04e1718271a0a46da4de2f3", + "reference": "999e9ce8b9d17914f04e1718271a0a46da4de2f3", "shasum": "" }, "require": { @@ -1915,22 +1915,22 @@ "support": { "docs": "https://googleapis.github.io/google-auth-library-php/main/", "issues": "https://github.com/googleapis/google-auth-library-php/issues", - "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.30.0" + "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.32.1" }, - "time": "2023-09-07T19:13:44+00:00" + "time": "2023-10-17T21:13:22+00:00" }, { "name": "google/cloud-core", - "version": "v1.52.4", + "version": "v1.52.8", "source": { "type": "git", "url": "https://github.com/googleapis/google-cloud-php-core.git", - "reference": "21c004745a32c71e03ab62effd7fbee0cf3ae7c6" + "reference": "2ebcaa410f7e92dca5677dd9cc4ec1f9f315e83c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/21c004745a32c71e03ab62effd7fbee0cf3ae7c6", - "reference": "21c004745a32c71e03ab62effd7fbee0cf3ae7c6", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/2ebcaa410f7e92dca5677dd9cc4ec1f9f315e83c", + "reference": "2ebcaa410f7e92dca5677dd9cc4ec1f9f315e83c", "shasum": "" }, "require": { @@ -1946,7 +1946,7 @@ "require-dev": { "erusev/parsedown": "^1.6", "google/cloud-common-protos": "^0.4", - "google/gax": "^1.19.1", + "google/gax": "^1.24.0", "opis/closure": "^3", "phpdocumentor/reflection": "^5.0", "phpspec/prophecy-phpunit": "^2.0", @@ -1980,26 +1980,26 @@ ], "description": "Google Cloud PHP shared dependency, providing functionality useful to all components.", "support": { - "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.4" + "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.8" }, - "time": "2023-09-15T20:50:36+00:00" + "time": "2023-11-02T19:15:44+00:00" }, { "name": "google/cloud-storage", - "version": "v1.33.2", + "version": "v1.34.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-cloud-php-storage.git", - "reference": "6148b428737eae9b6590ccd8fec508ab8689d096" + "reference": "4589dd3c8f4171db4ce3eb335fc7d894661ca0e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/6148b428737eae9b6590ccd8fec508ab8689d096", - "reference": "6148b428737eae9b6590ccd8fec508ab8689d096", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/4589dd3c8f4171db4ce3eb335fc7d894661ca0e9", + "reference": "4589dd3c8f4171db4ce3eb335fc7d894661ca0e9", "shasum": "" }, "require": { - "google/cloud-core": "^1.51.3", + "google/cloud-core": "^1.52.7", "php": ">=7.4", "ramsey/uuid": "^4.2.3" }, @@ -2036,9 +2036,9 @@ ], "description": "Cloud Storage Client for PHP", "support": { - "source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.33.2" + "source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.34.0" }, - "time": "2023-09-15T20:50:36+00:00" + "time": "2023-11-02T19:15:44+00:00" }, { "name": "guzzlehttp/guzzle", @@ -3259,16 +3259,16 @@ }, { "name": "psr/http-client", - "version": "1.0.2", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/php-fig/http-client.git", - "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31" + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31", - "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90", "shasum": "" }, "require": { @@ -3305,9 +3305,9 @@ "psr-18" ], "support": { - "source": "https://github.com/php-fig/http-client/tree/1.0.2" + "source": "https://github.com/php-fig/http-client" }, - "time": "2023-04-10T20:12:12+00:00" + "time": "2023-09-23T14:17:50+00:00" }, { "name": "psr/http-factory", From 1db51be406842c1e41d58347449483a1f378509e Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 6 Nov 2023 11:46:11 +0100 Subject: [PATCH 503/730] chore: Update friendsofphp/php-cs-fixer to 3.37.1 --- .../SearchTerm/KeywordFinder.php | 4 +- .../Components/Api/Resource/Article.php | 4 +- .../Components/Api/Resource/Variant.php | 2 +- .../Shopware/Components/Model/Generator.php | 2 +- .../Shopware/Components/Model/ModelEntity.php | 4 +- .../Components/MultiEdit/Resource/Product.php | 2 +- .../MultiEdit/Resource/Product/DqlHelper.php | 2 +- .../Components/Theme/Configurator.php | 2 +- .../Shopware/Controllers/Backend/Article.php | 2 +- .../Controllers/Backend/Newsletter.php | 8 ++-- engine/Shopware/Core/sBasket.php | 4 +- engine/Shopware/Models/Document/Order.php | 2 +- vendor-bin/cs-fixer/composer.json | 2 +- vendor-bin/cs-fixer/composer.lock | 40 +++++++++---------- 14 files changed, 39 insertions(+), 41 deletions(-) diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/KeywordFinder.php b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/KeywordFinder.php index 38386a16beb..1d2a50af0d5 100644 --- a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/KeywordFinder.php +++ b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/KeywordFinder.php @@ -161,11 +161,11 @@ private function findFuzzyMatches($term) if (\strlen($term1) < 4) { $relevance = $this->config->get('fuzzySearchMatchFactor', 5); - // ipod === ipods + // ipod === ipods } elseif (\strlen($term1) - \strlen($term2) <= 1) { $relevance = $this->config->get('fuzzySearchExactMatchFactor', 100); - // digital == digi + // digital == digi } elseif ((round(\strlen($term2) / \strlen($term1), 2) * 100) >= $this->config->get('fuzzySearchPartNameDistancen', 25)) { $relevance = $this->config->get('fuzzySearchPatternMatchFactor', 50); } diff --git a/engine/Shopware/Components/Api/Resource/Article.php b/engine/Shopware/Components/Api/Resource/Article.php index 4439e8a9532..25207d51275 100644 --- a/engine/Shopware/Components/Api/Resource/Article.php +++ b/engine/Shopware/Components/Api/Resource/Article.php @@ -1649,7 +1649,7 @@ protected function preparePropertyValuesData($data, ProductModel $article) if (!$value instanceof Value) { throw new CustomValidationException(sprintf('Property value by id "%s" not found', $valueData['id'])); } - // Get / create value by name + // Get / create value by name } elseif (isset($valueData['value'])) { // Get option if (isset($valueData['option'])) { @@ -1668,7 +1668,7 @@ protected function preparePropertyValuesData($data, ProductModel $article) if (!$relation instanceof Relation) { $propertyGroup->addOption($option); } - // Get/create option depending on associated filter groups + // Get/create option depending on associated filter groups } elseif (isset($valueData['option']['name'])) { // If a name is passed and there is a matching option/group relation, get this option // If only a name is passed, create a new option diff --git a/engine/Shopware/Components/Api/Resource/Variant.php b/engine/Shopware/Components/Api/Resource/Variant.php index 6b2f3205655..c94ca840023 100644 --- a/engine/Shopware/Components/Api/Resource/Variant.php +++ b/engine/Shopware/Components/Api/Resource/Variant.php @@ -772,7 +772,7 @@ protected function prepareUnitAssociation($data) throw new CustomValidationException(sprintf('Unit by id %s not found', $data['unitId'])); } - // New unit data send? create new unit for this variant + // New unit data send? create new unit for this variant } elseif (!empty($data['unit'])) { $data['unit'] = $this->updateUnitReference($data['unit']); } diff --git a/engine/Shopware/Components/Model/Generator.php b/engine/Shopware/Components/Model/Generator.php index 0b98e299c62..c42718fafa4 100644 --- a/engine/Shopware/Components/Model/Generator.php +++ b/engine/Shopware/Components/Model/Generator.php @@ -513,7 +513,7 @@ protected function getClassDefinition($table) $parentClass = str_replace('_attributes', '', $table->getName()); $className = $this->getClassNameOfTableName($parentClass); - // If the passed table is not an attribute table, we have to check if the table is already declared + // If the passed table is not an attribute table, we have to check if the table is already declared } elseif (\array_key_exists($table->getName(), $this->getTableMapping())) { // If this is the case we will use the already declared class name $className = $this->tableMapping[$table->getName()]['class']; diff --git a/engine/Shopware/Components/Model/ModelEntity.php b/engine/Shopware/Components/Model/ModelEntity.php index 6ff4a9fee97..1dd410ae4b5 100644 --- a/engine/Shopware/Components/Model/ModelEntity.php +++ b/engine/Shopware/Components/Model/ModelEntity.php @@ -209,10 +209,10 @@ public function setOneToMany($data, $model, $property, $reference = null) if (!$attribute instanceof $model) { $attribute = new $model(); } - // If the item is an array without an id, create a new model. + // If the item is an array without an id, create a new model. } elseif (\is_array($item)) { $attribute = new $model(); - // If the item is no array, it could be an instance of the expected object. + // If the item is no array, it could be an instance of the expected object. } else { $attribute = $item; } diff --git a/engine/Shopware/Components/MultiEdit/Resource/Product.php b/engine/Shopware/Components/MultiEdit/Resource/Product.php index 484a4856254..036044499ff 100644 --- a/engine/Shopware/Components/MultiEdit/Resource/Product.php +++ b/engine/Shopware/Components/MultiEdit/Resource/Product.php @@ -187,7 +187,7 @@ public function save($params) $model->$setter($field['value']); } $entityManager->persist($model); - // price_model + // price_model } else { $detailModel = $entityManager->find(Detail::class, $primaryIdentifiers['detail']); // store net prices diff --git a/engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php b/engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php index 34d5b0a9514..0802b383ce8 100644 --- a/engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php +++ b/engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php @@ -729,7 +729,7 @@ public function getDqlFromTokens($tokens) // Non-numeric tokens will become their quotes removed: if (!is_numeric($token['token'])) { $params[] = substr($token['token'], 1, -1); - // Numeric tokens can simple be appended to the params array + // Numeric tokens can simple be appended to the params array } else { $params[] = $token['token']; } diff --git a/engine/Shopware/Components/Theme/Configurator.php b/engine/Shopware/Components/Theme/Configurator.php index ff24f0523fe..c494cffd09c 100644 --- a/engine/Shopware/Components/Theme/Configurator.php +++ b/engine/Shopware/Components/Theme/Configurator.php @@ -181,7 +181,7 @@ private function validateConfig(Container $container): void if ($element instanceof Container) { $this->validateConfig($element); - // check Form\Field validation + // check Form\Field validation } elseif ($element instanceof Validate) { $element->validate(); } diff --git a/engine/Shopware/Controllers/Backend/Article.php b/engine/Shopware/Controllers/Backend/Article.php index 0a21a9d1109..81a134cb8e9 100644 --- a/engine/Shopware/Controllers/Backend/Article.php +++ b/engine/Shopware/Controllers/Backend/Article.php @@ -4394,7 +4394,7 @@ protected function recursiveInterpreter($cursor, $index, $commands) return implode('.', $results); - // If the result of the current command on the cursor is an object + // If the result of the current command on the cursor is an object } elseif ($result instanceof Product || $result instanceof ProductVariant) { // We have to execute the next command on the result return $this->recursiveInterpreter($result, $index, $commands); diff --git a/engine/Shopware/Controllers/Backend/Newsletter.php b/engine/Shopware/Controllers/Backend/Newsletter.php index 973440eb4a7..51eb6a3606d 100644 --- a/engine/Shopware/Controllers/Backend/Newsletter.php +++ b/engine/Shopware/Controllers/Backend/Newsletter.php @@ -278,10 +278,10 @@ public function mailAction() $validator = $this->container->get(EmailValidator::class); if (!$validator->isValid($user['email'])) { echo "Skipped invalid email\n"; - // SW-4526 - // Don't `continue` with next iteration without setting user's lastmailing - // else the mailing.status will never be set to 2 - // and sending the mail will block + // SW-4526 + // Don't `continue` with next iteration without setting user's lastmailing + // else the mailing.status will never be set to 2 + // and sending the mail will block } else { try { $mail->send(); diff --git a/engine/Shopware/Core/sBasket.php b/engine/Shopware/Core/sBasket.php index 5f56112254e..6f69ac37117 100644 --- a/engine/Shopware/Core/sBasket.php +++ b/engine/Shopware/Core/sBasket.php @@ -2534,7 +2534,7 @@ private function calculateVoucherValues(array $voucherDetails) if ($voucherDetails['taxconfig'] === 'default' || empty($voucherDetails['taxconfig'])) { $tax = round($voucherDetails['value'] / (100 + $this->config->get('sVOUCHERTAX')) * 100, 3) * -1; $taxRate = $this->config->get('sVOUCHERTAX'); - // Pre 3.5.4 behaviour + // Pre 3.5.4 behaviour } elseif ($voucherDetails['taxconfig'] === 'auto') { // Check max. used tax-rate from basket $tax = $this->getMaxTax(); @@ -2724,7 +2724,7 @@ private function getBasketProducts(array $getProducts): array } } elseif ($getProducts[$key]['modus'] == CartPositionsMode::CUSTOMER_GROUP_DISCOUNT) { $getProducts[$key]['amountWithTax'] = round(1 * (round($price, 2) / 100 * (100 + $tax)), 2); - // Basket discount + // Basket discount } elseif ($getProducts[$key]['modus'] == CartPositionsMode::VOUCHER) { $getProducts[$key]['amountWithTax'] = round(1 * (round($price, 2) / 100 * (100 + $tax)), 2); diff --git a/engine/Shopware/Models/Document/Order.php b/engine/Shopware/Models/Document/Order.php index 68fafa8eebc..1d5978ae794 100644 --- a/engine/Shopware/Models/Document/Order.php +++ b/engine/Shopware/Models/Document/Order.php @@ -628,7 +628,7 @@ public function processPositions() if (empty($position['tax_rate'])) { if ($ticketResult['taxconfig'] === 'default' || empty($ticketResult['taxconfig'])) { $position['tax'] = Shopware()->Config()->get('sVOUCHERTAX'); - // Pre 3.5.4 behaviour + // Pre 3.5.4 behaviour } elseif ($ticketResult['taxconfig'] === 'auto') { // Check max. used tax-rate from basket $position['tax'] = $this->getMaxTaxRate(); diff --git a/vendor-bin/cs-fixer/composer.json b/vendor-bin/cs-fixer/composer.json index 020f5c2aadc..f196dc2bf83 100644 --- a/vendor-bin/cs-fixer/composer.json +++ b/vendor-bin/cs-fixer/composer.json @@ -1,6 +1,6 @@ { "require-dev": { - "friendsofphp/php-cs-fixer": "3.30.0", + "friendsofphp/php-cs-fixer": "3.37.1", "kubawerlos/php-cs-fixer-custom-fixers": "3.16.2" }, "sort-packages": true diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock index 0ee778dc817..e4cedb82552 100644 --- a/vendor-bin/cs-fixer/composer.lock +++ b/vendor-bin/cs-fixer/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "76fb5cc6a753441c64120e5da9d28356", + "content-hash": "e7642c7db2f04de1a82f1b385fe41167", "packages": [], "packages-dev": [ { "name": "composer/pcre", - "version": "3.1.0", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2" + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", - "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", + "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", "shasum": "" }, "require": { @@ -60,7 +60,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.0" + "source": "https://github.com/composer/pcre/tree/3.1.1" }, "funding": [ { @@ -76,7 +76,7 @@ "type": "tidelift" } ], - "time": "2022-11-17T09:50:14+00:00" + "time": "2023-10-11T07:11:09+00:00" }, { "name": "composer/semver", @@ -227,16 +227,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.30.0", + "version": "v3.37.1", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "95c64693b2f149966a2bc05a7a4981b0343ea52f" + "reference": "c3fe76976081ab871aa654e872da588077e19679" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/95c64693b2f149966a2bc05a7a4981b0343ea52f", - "reference": "95c64693b2f149966a2bc05a7a4981b0343ea52f", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/c3fe76976081ab871aa654e872da588077e19679", + "reference": "c3fe76976081ab871aa654e872da588077e19679", "shasum": "" }, "require": { @@ -269,8 +269,6 @@ "phpspec/prophecy": "^1.16", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.5", - "phpunitgoodpractices/polyfill": "^1.6", - "phpunitgoodpractices/traits": "^1.9.2", "symfony/phpunit-bridge": "^6.2.3", "symfony/yaml": "^5.4 || ^6.0" }, @@ -310,7 +308,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.30.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.37.1" }, "funding": [ { @@ -318,7 +316,7 @@ "type": "github" } ], - "time": "2023-09-26T22:10:43+00:00" + "time": "2023-10-29T20:51:23+00:00" }, { "name": "kubawerlos/php-cs-fixer-custom-fixers", @@ -1886,16 +1884,16 @@ }, { "name": "symfony/string", - "version": "v5.4.26", + "version": "v5.4.29", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "1181fe9270e373537475e826873b5867b863883c" + "reference": "e41bdc93def20eaf3bfc1537c4e0a2b0680a152d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/1181fe9270e373537475e826873b5867b863883c", - "reference": "1181fe9270e373537475e826873b5867b863883c", + "url": "https://api.github.com/repos/symfony/string/zipball/e41bdc93def20eaf3bfc1537c4e0a2b0680a152d", + "reference": "e41bdc93def20eaf3bfc1537c4e0a2b0680a152d", "shasum": "" }, "require": { @@ -1952,7 +1950,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.26" + "source": "https://github.com/symfony/string/tree/v5.4.29" }, "funding": [ { @@ -1968,7 +1966,7 @@ "type": "tidelift" } ], - "time": "2023-06-28T12:46:07+00:00" + "time": "2023-09-13T11:47:41+00:00" } ], "aliases": [], From 3e3c9aa0fe4e190bb8af89c989831eb3f5d0d4e6 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 6 Nov 2023 13:31:51 +0100 Subject: [PATCH 504/730] chore: Update PHPStan and its plugins --- composer.json | 10 +-- composer.lock | 83 ++++++++++--------- .../Components/Cart/TaxAggregator.php | 2 +- .../Shopware/Controllers/Backend/Address.php | 2 +- 4 files changed, 49 insertions(+), 48 deletions(-) diff --git a/composer.json b/composer.json index b74b2d87ed4..9f265ae4d9d 100644 --- a/composer.json +++ b/composer.json @@ -113,13 +113,13 @@ "php-parallel-lint/php-var-dump-check": "^0.5", "phpspec/prophecy-phpunit": "^2.0", "phpstan/extension-installer": "1.3.1", - "phpstan/phpstan": "1.10.35", - "phpstan/phpstan-doctrine": "1.3.43", - "phpstan/phpstan-phpunit": "1.3.14", - "phpstan/phpstan-symfony": "1.3.2", + "phpstan/phpstan": "1.10.41", + "phpstan/phpstan-doctrine": "1.3.45", + "phpstan/phpstan-phpunit": "1.3.15", + "phpstan/phpstan-symfony": "1.3.5", "phpunit/phpunit": "^9.6", "sensiolabs/behat-page-object-extension": "2.3.7", - "staabm/phpstan-dba": "0.2.75", + "staabm/phpstan-dba": "0.2.79", "symfony/browser-kit": "~4.4.27", "symfony/dom-crawler": "~4.4.30" }, diff --git a/composer.lock b/composer.lock index a52ea90677a..11fd710c353 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": "585abaed0bfbf4b96f20661ae9826b4a", + "content-hash": "4eadb407fa6a8bd1a0a2477d9455dca6", "packages": [ { "name": "aws/aws-crt-php", @@ -8598,16 +8598,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.24.1", + "version": "1.24.2", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01" + "reference": "bcad8d995980440892759db0c32acae7c8e79442" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01", - "reference": "9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bcad8d995980440892759db0c32acae7c8e79442", + "reference": "bcad8d995980440892759db0c32acae7c8e79442", "shasum": "" }, "require": { @@ -8639,22 +8639,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.2" }, - "time": "2023-09-18T12:18:02+00:00" + "time": "2023-09-26T12:28:12+00:00" }, { "name": "phpstan/phpstan", - "version": "1.10.35", + "version": "1.10.41", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "e730e5facb75ffe09dfb229795e8c01a459f26c3" + "reference": "c6174523c2a69231df55bdc65b61655e72876d76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e730e5facb75ffe09dfb229795e8c01a459f26c3", - "reference": "e730e5facb75ffe09dfb229795e8c01a459f26c3", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c6174523c2a69231df55bdc65b61655e72876d76", + "reference": "c6174523c2a69231df55bdc65b61655e72876d76", "shasum": "" }, "require": { @@ -8703,20 +8703,20 @@ "type": "tidelift" } ], - "time": "2023-09-19T15:27:56+00:00" + "time": "2023-11-05T12:57:57+00:00" }, { "name": "phpstan/phpstan-doctrine", - "version": "1.3.43", + "version": "1.3.45", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-doctrine.git", - "reference": "c5015035755ad2d5013bd6bf98ff423ca6150822" + "reference": "90e60ba9dbea4b29c7b87026a29e91ac0a02674e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/c5015035755ad2d5013bd6bf98ff423ca6150822", - "reference": "c5015035755ad2d5013bd6bf98ff423ca6150822", + "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/90e60ba9dbea4b29c7b87026a29e91ac0a02674e", + "reference": "90e60ba9dbea4b29c7b87026a29e91ac0a02674e", "shasum": "" }, "require": { @@ -8771,22 +8771,22 @@ "description": "Doctrine extensions for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-doctrine/issues", - "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.43" + "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.45" }, - "time": "2023-09-01T15:01:13+00:00" + "time": "2023-10-29T08:18:22+00:00" }, { "name": "phpstan/phpstan-phpunit", - "version": "1.3.14", + "version": "1.3.15", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-phpunit.git", - "reference": "614acc10c522e319639bf38b0698a4a566665f04" + "reference": "70ecacc64fe8090d8d2a33db5a51fe8e88acd93a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/614acc10c522e319639bf38b0698a4a566665f04", - "reference": "614acc10c522e319639bf38b0698a4a566665f04", + "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/70ecacc64fe8090d8d2a33db5a51fe8e88acd93a", + "reference": "70ecacc64fe8090d8d2a33db5a51fe8e88acd93a", "shasum": "" }, "require": { @@ -8823,28 +8823,28 @@ "description": "PHPUnit extensions and rules for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-phpunit/issues", - "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.14" + "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.15" }, - "time": "2023-08-25T09:46:39+00:00" + "time": "2023-10-09T18:58:39+00:00" }, { "name": "phpstan/phpstan-symfony", - "version": "1.3.2", + "version": "1.3.5", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-symfony.git", - "reference": "7332b90dfc291ac5b4b83fbca2081936faa1e3f9" + "reference": "27ff6339f83796a7e0dd963cf445cd3c456fc620" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/7332b90dfc291ac5b4b83fbca2081936faa1e3f9", - "reference": "7332b90dfc291ac5b4b83fbca2081936faa1e3f9", + "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/27ff6339f83796a7e0dd963cf445cd3c456fc620", + "reference": "27ff6339f83796a7e0dd963cf445cd3c456fc620", "shasum": "" }, "require": { "ext-simplexml": "*", "php": "^7.2 || ^8.0", - "phpstan/phpstan": "^1.9.18" + "phpstan/phpstan": "^1.10.36" }, "conflict": { "symfony/framework-bundle": "<3.0" @@ -8852,8 +8852,8 @@ "require-dev": { "nikic/php-parser": "^4.13.0", "php-parallel-lint/php-parallel-lint": "^1.2", - "phpstan/phpstan-phpunit": "^1.0", - "phpstan/phpstan-strict-rules": "^1.0", + "phpstan/phpstan-phpunit": "^1.3.11", + "phpstan/phpstan-strict-rules": "^1.5.1", "phpunit/phpunit": "^8.5.29 || ^9.5", "psr/container": "1.0 || 1.1.1", "symfony/config": "^5.4 || ^6.1", @@ -8864,7 +8864,8 @@ "symfony/http-foundation": "^5.4 || ^6.1", "symfony/messenger": "^5.4", "symfony/polyfill-php80": "^1.24", - "symfony/serializer": "^5.4" + "symfony/serializer": "^5.4", + "symfony/service-contracts": "^2.2.0" }, "type": "phpstan-extension", "extra": { @@ -8894,9 +8895,9 @@ "description": "Symfony Framework extensions and rules for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-symfony/issues", - "source": "https://github.com/phpstan/phpstan-symfony/tree/1.3.2" + "source": "https://github.com/phpstan/phpstan-symfony/tree/1.3.5" }, - "time": "2023-05-16T12:46:15+00:00" + "time": "2023-10-30T14:52:15+00:00" }, { "name": "phpunit/php-code-coverage", @@ -10362,16 +10363,16 @@ }, { "name": "staabm/phpstan-dba", - "version": "0.2.75", + "version": "0.2.79", "source": { "type": "git", "url": "https://github.com/staabm/phpstan-dba.git", - "reference": "812b436d601c007e07cba93985a4bc87eccf6be0" + "reference": "14d9afd28413e9964a9a33d30bafa1683d044542" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/staabm/phpstan-dba/zipball/812b436d601c007e07cba93985a4bc87eccf6be0", - "reference": "812b436d601c007e07cba93985a4bc87eccf6be0", + "url": "https://api.github.com/repos/staabm/phpstan-dba/zipball/14d9afd28413e9964a9a33d30bafa1683d044542", + "reference": "14d9afd28413e9964a9a33d30bafa1683d044542", "shasum": "" }, "require": { @@ -10395,7 +10396,7 @@ "phpstan/phpstan-strict-rules": "^1.1", "phpunit/phpunit": "^8.5|^9.5", "symplify/easy-coding-standard": "^11.4", - "tomasvotruba/unused-public": "^0.2.0", + "tomasvotruba/unused-public": "^0.3", "vlucas/phpdotenv": "^5.4" }, "type": "phpstan-extension", @@ -10425,9 +10426,9 @@ ], "support": { "issues": "https://github.com/staabm/phpstan-dba/issues", - "source": "https://github.com/staabm/phpstan-dba/tree/0.2.75" + "source": "https://github.com/staabm/phpstan-dba/tree/0.2.79" }, - "time": "2023-07-30T09:15:23+00:00" + "time": "2023-10-12T07:23:58+00:00" }, { "name": "symfony/browser-kit", diff --git a/engine/Shopware/Components/Cart/TaxAggregator.php b/engine/Shopware/Components/Cart/TaxAggregator.php index b3cdcbd8269..7d1ba486255 100644 --- a/engine/Shopware/Components/Cart/TaxAggregator.php +++ b/engine/Shopware/Components/Cart/TaxAggregator.php @@ -82,7 +82,7 @@ public function positionsTaxSum(array $cart, float $maximumTaxRate): ?array continue; } - /** @var numeric-string $taxRateString */ + /** @var numeric-string&non-empty-string $taxRateString */ $taxRateString = number_format($taxRate, 2); if (!\array_key_exists($taxRateString, $result)) { diff --git a/engine/Shopware/Controllers/Backend/Address.php b/engine/Shopware/Controllers/Backend/Address.php index ea08fcccd97..3b45eb3eb45 100644 --- a/engine/Shopware/Controllers/Backend/Address.php +++ b/engine/Shopware/Controllers/Backend/Address.php @@ -176,7 +176,7 @@ protected function getListQuery() */ protected function getQueryPaginator(QueryBuilder $builder, $hydrationMode = AbstractQuery::HYDRATE_ARRAY) { - /** @var Query $query */ + /** @var Query> $query */ $query = $builder->getQuery(); $query->setHydrationMode($hydrationMode); $query->setHint(Query::HINT_INCLUDE_META_COLUMNS, true); From 2336294db0c54bfaae9786920f9337e936559fc3 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Mon, 6 Nov 2023 13:36:14 +0100 Subject: [PATCH 505/730] chore: Update laminas/laminas-escaper to 2.13.0 for PHP 8.1 and newer --- .github/workflows/phpunit.yml | 2 +- Makefile | 2 +- UPGRADE-5.7.md | 1 + build/build.xml | 2 +- composer.json | 2 +- composer.lock | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index ba85aec8468..01df019ddcf 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -51,7 +51,7 @@ jobs: - run: devenv shell info-setup - run: sudo mount -t tmpfs tmpfs $(pwd)/.devenv/profile/lib/mysql -o size=4G - run: devenv up & - - run: devenv shell composer update laminas/laminas-code cocur/slugify + - run: devenv shell composer update 'laminas/*' cocur/slugify - run: devenv shell test-phpunit mysql: diff --git a/Makefile b/Makefile index 4610d966fa3..b9e28561d5d 100644 --- a/Makefile +++ b/Makefile @@ -130,7 +130,7 @@ debug-config-test: .make.config.build.debug touch $@ .make.install.composer-dependencies: - composer update laminas/laminas-code cocur/slugify + composer update 'laminas/*' cocur/slugify composer install composer install -d recovery/common composer bin all install diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index e97f3241132..725b223bdd2 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -19,6 +19,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `monolog/monolog` to version 2.9.2 * Updated `mpdf/mpdf` to version 8.2.0 * Updated `laminas/laminas-code` to version 4.13.0 for PHP 8.1 and newer +* Updated `laminas/laminas-escaper` to version 2.13.0 for PHP 8.1 and newer * Updated `phpunit/phpuit` to version 9.6.11 * Updated `setasign/fpdf` to version 1.8.6 * Updated `setasign/fpdi` to version 2.5.0 diff --git a/build/build.xml b/build/build.xml index d7015aaea82..97a4b0fdc5d 100644 --- a/build/build.xml +++ b/build/build.xml @@ -99,7 +99,7 @@ - + diff --git a/composer.json b/composer.json index 9f265ae4d9d..52a70ac0fec 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,7 @@ "guzzlehttp/guzzle": "~7.8.0", "guzzlehttp/psr7": "~2.6.1", "laminas/laminas-code": "4.7.1 || 4.13.0", - "laminas/laminas-escaper": "2.12.0", + "laminas/laminas-escaper": "2.12.0 || 2.13.0", "league/flysystem": "~1.1.4", "league/flysystem-aws-s3-v3": "1.0.30", "monolog/monolog": "2.9.2", diff --git a/composer.lock b/composer.lock index 11fd710c353..c08868eb13c 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": "4eadb407fa6a8bd1a0a2477d9455dca6", + "content-hash": "684f2df29dc52cbfeeb671ca0c9a6e18", "packages": [ { "name": "aws/aws-crt-php", From e86ff6527125e4b845a6aa9a90d037a97a0bc7a0 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Tue, 7 Nov 2023 08:27:40 +0100 Subject: [PATCH 506/730] chore: Update symfony components and other third party dependencies --- UPGRADE-5.7.md | 2 +- composer.lock | 124 ++++++++++++++++++++++++------------------------- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 725b223bdd2..bc3bd587f6f 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -26,7 +26,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `symfony/polyfill-php80` to version 1.28.0 * Updated `symfony/polyfill-php81` to version 1.28.0 * Updated `symfony/polyfill-php82` to version 1.28.0 -* Updated `symfony/serializer` to version 5.4.28 +* Updated `symfony/serializer` to version 5.4.30 * Updated `voku/anti-xss` to version 4.1.42 * Updated `wikimedia/less.php` to version 4.1.1 * Updated several indirect dependencies diff --git a/composer.lock b/composer.lock index c08868eb13c..76cf84f14c6 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "aws/aws-crt-php", - "version": "v1.2.2", + "version": "v1.2.3", "source": { "type": "git", "url": "https://github.com/awslabs/aws-crt-php.git", - "reference": "2f1dc7b7eda080498be96a4a6d683a41583030e9" + "reference": "5545a4fa310aec39f54279fdacebcce33b3ff382" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/2f1dc7b7eda080498be96a4a6d683a41583030e9", - "reference": "2f1dc7b7eda080498be96a4a6d683a41583030e9", + "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/5545a4fa310aec39f54279fdacebcce33b3ff382", + "reference": "5545a4fa310aec39f54279fdacebcce33b3ff382", "shasum": "" }, "require": { @@ -56,26 +56,26 @@ ], "support": { "issues": "https://github.com/awslabs/aws-crt-php/issues", - "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.2" + "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.3" }, - "time": "2023-07-20T16:49:55+00:00" + "time": "2023-10-16T20:10:06+00:00" }, { "name": "aws/aws-sdk-php", - "version": "3.281.10", + "version": "3.284.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "049604298f769fa218549d8ff5cac1981f0a349a" + "reference": "eb03db9795bfdaed3501ebc7f33b4e6cee0c15b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/049604298f769fa218549d8ff5cac1981f0a349a", - "reference": "049604298f769fa218549d8ff5cac1981f0a349a", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/eb03db9795bfdaed3501ebc7f33b4e6cee0c15b4", + "reference": "eb03db9795bfdaed3501ebc7f33b4e6cee0c15b4", "shasum": "" }, "require": { - "aws/aws-crt-php": "^1.0.4", + "aws/aws-crt-php": "^1.2.3", "ext-json": "*", "ext-pcre": "*", "ext-simplexml": "*", @@ -151,9 +151,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.281.10" + "source": "https://github.com/aws/aws-sdk-php/tree/3.284.1" }, - "time": "2023-09-19T18:33:42+00:00" + "time": "2023-11-06T19:08:09+00:00" }, { "name": "bcremer/line-reader", @@ -907,16 +907,16 @@ }, { "name": "doctrine/deprecations", - "version": "v1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3" + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", - "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931", + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931", "shasum": "" }, "require": { @@ -948,9 +948,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/v1.1.1" + "source": "https://github.com/doctrine/deprecations/tree/1.1.2" }, - "time": "2023-06-03T09:27:29+00:00" + "time": "2023-09-27T20:04:15+00:00" }, { "name": "doctrine/event-manager", @@ -2654,16 +2654,16 @@ }, { "name": "league/mime-type-detection", - "version": "1.13.0", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96" + "reference": "b6a5854368533df0295c5761a0253656a2e52d9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/a6dfb1194a2946fcdc1f38219445234f65b35c96", - "reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b6a5854368533df0295c5761a0253656a2e52d9e", + "reference": "b6a5854368533df0295c5761a0253656a2e52d9e", "shasum": "" }, "require": { @@ -2694,7 +2694,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.13.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.14.0" }, "funding": [ { @@ -2706,7 +2706,7 @@ "type": "tidelift" } ], - "time": "2023-08-05T12:09:49+00:00" + "time": "2023-10-17T14:13:20+00:00" }, { "name": "monolog/monolog", @@ -2893,16 +2893,16 @@ }, { "name": "mpdf/psr-http-message-shim", - "version": "2.0.0", + "version": "v2.0.1", "source": { "type": "git", "url": "https://github.com/mpdf/psr-http-message-shim.git", - "reference": "1cf4c0b68b8461cea27411ff961482ce7687e34f" + "reference": "f25a0153d645e234f9db42e5433b16d9b113920f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mpdf/psr-http-message-shim/zipball/1cf4c0b68b8461cea27411ff961482ce7687e34f", - "reference": "1cf4c0b68b8461cea27411ff961482ce7687e34f", + "url": "https://api.github.com/repos/mpdf/psr-http-message-shim/zipball/f25a0153d645e234f9db42e5433b16d9b113920f", + "reference": "f25a0153d645e234f9db42e5433b16d9b113920f", "shasum": "" }, "require": { @@ -2935,9 +2935,9 @@ "description": "Shim to allow support of different psr/message versions.", "support": { "issues": "https://github.com/mpdf/psr-http-message-shim/issues", - "source": "https://github.com/mpdf/psr-http-message-shim/tree/2.0.0" + "source": "https://github.com/mpdf/psr-http-message-shim/tree/v2.0.1" }, - "time": "2023-09-01T06:08:18+00:00" + "time": "2023-10-02T14:34:03+00:00" }, { "name": "mpdf/psr-log-aware-trait", @@ -4105,16 +4105,16 @@ }, { "name": "symfony/cache", - "version": "v5.4.28", + "version": "v5.4.30", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "62b7ae3bccc5b474a30fadc7ef6bbc362007d3f9" + "reference": "2742d1b595927210546bb7a0887094cf1494de21" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/62b7ae3bccc5b474a30fadc7ef6bbc362007d3f9", - "reference": "62b7ae3bccc5b474a30fadc7ef6bbc362007d3f9", + "url": "https://api.github.com/repos/symfony/cache/zipball/2742d1b595927210546bb7a0887094cf1494de21", + "reference": "2742d1b595927210546bb7a0887094cf1494de21", "shasum": "" }, "require": { @@ -4142,7 +4142,7 @@ "require-dev": { "cache/integration-tests": "dev-master", "doctrine/cache": "^1.6|^2.0", - "doctrine/dbal": "^2.13.1|^3.0", + "doctrine/dbal": "^2.13.1|^3|^4", "predis/predis": "^1.1", "psr/simple-cache": "^1.0|^2.0", "symfony/config": "^4.4|^5.0|^6.0", @@ -4182,7 +4182,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v5.4.28" + "source": "https://github.com/symfony/cache/tree/v5.4.30" }, "funding": [ { @@ -4198,7 +4198,7 @@ "type": "tidelift" } ], - "time": "2023-08-05T08:32:42+00:00" + "time": "2023-10-17T14:17:25+00:00" }, { "name": "symfony/cache-contracts", @@ -5438,16 +5438,16 @@ }, { "name": "symfony/intl", - "version": "v5.4.26", + "version": "v5.4.30", "source": { "type": "git", "url": "https://github.com/symfony/intl.git", - "reference": "c26c40b64ecdc056810e294ea67ac5b34182cd69" + "reference": "cd6cce16151ac871071a3495e7a325460b952b5a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/intl/zipball/c26c40b64ecdc056810e294ea67ac5b34182cd69", - "reference": "c26c40b64ecdc056810e294ea67ac5b34182cd69", + "url": "https://api.github.com/repos/symfony/intl/zipball/cd6cce16151ac871071a3495e7a325460b952b5a", + "reference": "cd6cce16151ac871071a3495e7a325460b952b5a", "shasum": "" }, "require": { @@ -5507,7 +5507,7 @@ "localization" ], "support": { - "source": "https://github.com/symfony/intl/tree/v5.4.26" + "source": "https://github.com/symfony/intl/tree/v5.4.30" }, "funding": [ { @@ -5523,7 +5523,7 @@ "type": "tidelift" } ], - "time": "2023-07-13T09:02:54+00:00" + "time": "2023-10-28T09:19:54+00:00" }, { "name": "symfony/mime", @@ -6405,16 +6405,16 @@ }, { "name": "symfony/serializer", - "version": "v5.4.28", + "version": "v5.4.30", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "701e2b8d48a3a627ffe128b38fbe6c4cf3ddcb3c" + "reference": "ceadb4e08830e69738d313b667cfb426269f67f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/701e2b8d48a3a627ffe128b38fbe6c4cf3ddcb3c", - "reference": "701e2b8d48a3a627ffe128b38fbe6c4cf3ddcb3c", + "url": "https://api.github.com/repos/symfony/serializer/zipball/ceadb4e08830e69738d313b667cfb426269f67f6", + "reference": "ceadb4e08830e69738d313b667cfb426269f67f6", "shasum": "" }, "require": { @@ -6488,7 +6488,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v5.4.28" + "source": "https://github.com/symfony/serializer/tree/v5.4.30" }, "funding": [ { @@ -6504,7 +6504,7 @@ "type": "tidelift" } ], - "time": "2023-08-24T14:14:18+00:00" + "time": "2023-10-25T18:53:19+00:00" }, { "name": "symfony/service-contracts", @@ -6591,16 +6591,16 @@ }, { "name": "symfony/string", - "version": "v5.4.26", + "version": "v5.4.29", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "1181fe9270e373537475e826873b5867b863883c" + "reference": "e41bdc93def20eaf3bfc1537c4e0a2b0680a152d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/1181fe9270e373537475e826873b5867b863883c", - "reference": "1181fe9270e373537475e826873b5867b863883c", + "url": "https://api.github.com/repos/symfony/string/zipball/e41bdc93def20eaf3bfc1537c4e0a2b0680a152d", + "reference": "e41bdc93def20eaf3bfc1537c4e0a2b0680a152d", "shasum": "" }, "require": { @@ -6657,7 +6657,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.26" + "source": "https://github.com/symfony/string/tree/v5.4.29" }, "funding": [ { @@ -6673,7 +6673,7 @@ "type": "tidelift" } ], - "time": "2023-06-28T12:46:07+00:00" + "time": "2023-09-13T11:47:41+00:00" }, { "name": "symfony/translation-contracts", @@ -6861,16 +6861,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.28", + "version": "v5.4.29", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "684b36ff415e1381d4a943c3ca2502cd2debad73" + "reference": "6172e4ae3534d25ee9e07eb487c20be7760fcc65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/684b36ff415e1381d4a943c3ca2502cd2debad73", - "reference": "684b36ff415e1381d4a943c3ca2502cd2debad73", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6172e4ae3534d25ee9e07eb487c20be7760fcc65", + "reference": "6172e4ae3534d25ee9e07eb487c20be7760fcc65", "shasum": "" }, "require": { @@ -6930,7 +6930,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.28" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.29" }, "funding": [ { @@ -6946,7 +6946,7 @@ "type": "tidelift" } ], - "time": "2023-08-24T13:38:36+00:00" + "time": "2023-09-12T10:09:58+00:00" }, { "name": "symfony/var-exporter", From 52dc5e5eb24ba21b5de39d0a279dfc81dd1672ee Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Tue, 7 Nov 2023 15:20:12 +0100 Subject: [PATCH 507/730] chore: Update mpdf/mpdf to 8.2.1 --- UPGRADE-5.7.md | 2 +- composer.json | 2 +- composer.lock | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index bc3bd587f6f..3ba17aa455a 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -17,7 +17,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `guzzlehttp/guzzle` to version 7.8.0 * Updated `guzzlehttp/psr7` to version 2.6.1 * Updated `monolog/monolog` to version 2.9.2 -* Updated `mpdf/mpdf` to version 8.2.0 +* Updated `mpdf/mpdf` to version 8.2.1 * Updated `laminas/laminas-code` to version 4.13.0 for PHP 8.1 and newer * Updated `laminas/laminas-escaper` to version 2.13.0 for PHP 8.1 and newer * Updated `phpunit/phpuit` to version 9.6.11 diff --git a/composer.json b/composer.json index 52a70ac0fec..d98f54719bd 100644 --- a/composer.json +++ b/composer.json @@ -62,7 +62,7 @@ "league/flysystem": "~1.1.4", "league/flysystem-aws-s3-v3": "1.0.30", "monolog/monolog": "2.9.2", - "mpdf/mpdf": "8.2.0", + "mpdf/mpdf": "8.2.1", "ongr/elasticsearch-dsl": "7.2.2", "psr/link": "1.0.0", "psr/log": "1.1.4", diff --git a/composer.lock b/composer.lock index 76cf84f14c6..97c2e0d5b9d 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": "684f2df29dc52cbfeeb671ca0c9a6e18", + "content-hash": "67bf3a2d0855ef3d9298f86e1336b154", "packages": [ { "name": "aws/aws-crt-php", @@ -2812,16 +2812,16 @@ }, { "name": "mpdf/mpdf", - "version": "v8.2.0", + "version": "v8.2.1", "source": { "type": "git", "url": "https://github.com/mpdf/mpdf.git", - "reference": "170a236a588d177c2aa7447ce490a030ca68e6f4" + "reference": "1045916720a767b8af695ad4f9351c9057b672b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mpdf/mpdf/zipball/170a236a588d177c2aa7447ce490a030ca68e6f4", - "reference": "170a236a588d177c2aa7447ce490a030ca68e6f4", + "url": "https://api.github.com/repos/mpdf/mpdf/zipball/1045916720a767b8af695ad4f9351c9057b672b8", + "reference": "1045916720a767b8af695ad4f9351c9057b672b8", "shasum": "" }, "require": { @@ -2831,7 +2831,7 @@ "mpdf/psr-log-aware-trait": "^2.0 || ^3.0", "myclabs/deep-copy": "^1.7", "paragonie/random_compat": "^1.4|^2.0|^9.99.99", - "php": "^5.6 || ^7.0 || ~8.0.0 || ~8.1.0 || ~8.2.0", + "php": "^5.6 || ^7.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", "psr/http-message": "^1.0 || ^2.0", "psr/log": "^1.0 || ^2.0 || ^3.0", "setasign/fpdi": "^2.1" @@ -2889,7 +2889,7 @@ "type": "custom" } ], - "time": "2023-09-01T11:44:52+00:00" + "time": "2023-11-07T10:23:34+00:00" }, { "name": "mpdf/psr-http-message-shim", From 4c381c3d759f45b1f6aa9ca6f23c651980e451bc Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Tue, 7 Nov 2023 10:47:05 +0100 Subject: [PATCH 508/730] fix: Refactor container test and remove obsolete Prophecy dependency --- .phpstan-baseline.neon | 40 -- .phpstan.neon | 4 + UPGRADE-5.7.md | 3 + composer.json | 1 - composer.lock | 395 +----------------- .../DependencyInjection/ContainerTest.php | 83 ++-- 6 files changed, 54 insertions(+), 472 deletions(-) diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index 8794a9167fd..d31591dd048 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -40675,46 +40675,6 @@ parameters: count: 1 path: tests/Unit/Components/DependencyInjection/Compiler/TagReplaceTraitTest.php - - - message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getSubject\\(\\)\\.$#" - count: 3 - path: tests/Unit/Components/DependencyInjection/ContainerTest.php - - - - message: "#^Call to an undefined method Prophecy\\\\Prophecy\\\\ObjectProphecy\\:\\:notify\\(\\)\\.$#" - count: 7 - path: tests/Unit/Components/DependencyInjection/ContainerTest.php - - - - message: "#^Call to an undefined method Prophecy\\\\Prophecy\\\\ObjectProphecy\\:\\:notifyUntil\\(\\)\\.$#" - count: 4 - path: tests/Unit/Components/DependencyInjection/ContainerTest.php - - - - message: "#^Service \"alias\" is not registered in the container\\.$#" - count: 1 - path: tests/Unit/Components/DependencyInjection/ContainerTest.php - - - - message: "#^Service \"bar\" is not registered in the container\\.$#" - count: 3 - path: tests/Unit/Components/DependencyInjection/ContainerTest.php - - - - message: "#^Service \"foo\" is not registered in the container\\.$#" - count: 5 - path: tests/Unit/Components/DependencyInjection/ContainerTest.php - - - - message: "#^Service \"parent\" is not registered in the container\\.$#" - count: 3 - path: tests/Unit/Components/DependencyInjection/ContainerTest.php - - - - message: "#^Service \"someKey\" is not registered in the container\\.$#" - count: 1 - path: tests/Unit/Components/DependencyInjection/ContainerTest.php - - message: "#^Property Shopware\\\\Tests\\\\Unit\\\\Components\\\\DependencyInjection\\\\ProjectServiceContainer\\:\\:\\$__bar has no type specified\\.$#" count: 1 diff --git a/.phpstan.neon b/.phpstan.neon index bdaa52e9e03..d8ce644c921 100644 --- a/.phpstan.neon +++ b/.phpstan.neon @@ -199,3 +199,7 @@ parameters: message: '#Parameter \#1 \$calculationType of method Shopware\\Bundle\\OrderBundle\\Service\\ShippingCostService::getShippingCostMultiplier\(\) expects 0\|1\|2\|3, 99 given#' count: 1 path: tests/Unit/Bundle/OrderBundle/ShippingConstServiceTest.php + + - # Test services are not recognized correctly by PHPStan in this container test class + message: '#Service ".*" is not registered in the container#' + path: tests/Unit/Components/DependencyInjection/ContainerTest.php diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 3ba17aa455a..d9b09206409 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -33,6 +33,9 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated npm dependencies in `themes/package.json` * Updated npm dependencies in `themes/Frontend/Responsive/package.json` +### Removals + +* Removed development dependency `phpspec/prophecy-phpunit` as it is no longer used due to a refactoring of `Shopware\Tests\Unit\Components\DependencyInjection\ContainerTest` ## 5.7.19 diff --git a/composer.json b/composer.json index d98f54719bd..3a5e8795a5d 100644 --- a/composer.json +++ b/composer.json @@ -111,7 +111,6 @@ "behat/mink-selenium2-driver": "1.6.0", "friends-of-behat/mink-extension": "2.7.4", "php-parallel-lint/php-var-dump-check": "^0.5", - "phpspec/prophecy-phpunit": "^2.0", "phpstan/extension-installer": "1.3.1", "phpstan/phpstan": "1.10.41", "phpstan/phpstan-doctrine": "1.3.45", diff --git a/composer.lock b/composer.lock index 97c2e0d5b9d..d22096c5f46 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": "67bf3a2d0855ef3d9298f86e1336b154", + "content-hash": "1d25b5a3d868b27da86b27c330b6bf81", "packages": [ { "name": "aws/aws-crt-php", @@ -8264,294 +8264,6 @@ }, "time": "2020-08-17T12:12:52+00:00" }, - { - "name": "phpdocumentor/reflection-common", - "version": "2.2.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b", - "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-2.x": "2.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jaap van Otterdijk", - "email": "opensource@ijaap.nl" - } - ], - "description": "Common reflection classes used by phpdocumentor to reflect the code structure", - "homepage": "http://www.phpdoc.org", - "keywords": [ - "FQSEN", - "phpDocumentor", - "phpdoc", - "reflection", - "static analysis" - ], - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues", - "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x" - }, - "time": "2020-06-27T09:03:43+00:00" - }, - { - "name": "phpdocumentor/reflection-docblock", - "version": "5.3.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", - "shasum": "" - }, - "require": { - "ext-filter": "*", - "php": "^7.2 || ^8.0", - "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/type-resolver": "^1.3", - "webmozart/assert": "^1.9.1" - }, - "require-dev": { - "mockery/mockery": "~1.3.2", - "psalm/phar": "^4.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - }, - { - "name": "Jaap van Otterdijk", - "email": "account@ijaap.nl" - } - ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" - }, - "time": "2021-10-19T17:43:47+00:00" - }, - { - "name": "phpdocumentor/type-resolver", - "version": "1.7.3", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", - "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", - "shasum": "" - }, - "require": { - "doctrine/deprecations": "^1.0", - "php": "^7.4 || ^8.0", - "phpdocumentor/reflection-common": "^2.0", - "phpstan/phpdoc-parser": "^1.13" - }, - "require-dev": { - "ext-tokenizer": "*", - "phpbench/phpbench": "^1.2", - "phpstan/extension-installer": "^1.1", - "phpstan/phpstan": "^1.8", - "phpstan/phpstan-phpunit": "^1.1", - "phpunit/phpunit": "^9.5", - "rector/rector": "^0.13.9", - "vimeo/psalm": "^4.25" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", - "support": { - "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.3" - }, - "time": "2023-08-12T11:01:26+00:00" - }, - { - "name": "phpspec/prophecy", - "version": "v1.17.0", - "source": { - "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "15873c65b207b07765dbc3c95d20fdf4a320cbe2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/15873c65b207b07765dbc3c95d20fdf4a320cbe2", - "reference": "15873c65b207b07765dbc3c95d20fdf4a320cbe2", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.2 || ^2.0", - "php": "^7.2 || 8.0.* || 8.1.* || 8.2.*", - "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0", - "sebastian/recursion-context": "^3.0 || ^4.0" - }, - "require-dev": { - "phpspec/phpspec": "^6.0 || ^7.0", - "phpstan/phpstan": "^1.9", - "phpunit/phpunit": "^8.0 || ^9.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Prophecy\\": "src/Prophecy" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - }, - { - "name": "Marcello Duarte", - "email": "marcello.duarte@gmail.com" - } - ], - "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "https://github.com/phpspec/prophecy", - "keywords": [ - "Double", - "Dummy", - "fake", - "mock", - "spy", - "stub" - ], - "support": { - "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.17.0" - }, - "time": "2023-02-02T15:41:36+00:00" - }, - { - "name": "phpspec/prophecy-phpunit", - "version": "v2.0.2", - "source": { - "type": "git", - "url": "https://github.com/phpspec/prophecy-phpunit.git", - "reference": "9f26c224a2fa335f33e6666cc078fbf388255e87" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/9f26c224a2fa335f33e6666cc078fbf388255e87", - "reference": "9f26c224a2fa335f33e6666cc078fbf388255e87", - "shasum": "" - }, - "require": { - "php": "^7.3 || ^8", - "phpspec/prophecy": "^1.3", - "phpunit/phpunit": "^9.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "psr-4": { - "Prophecy\\PhpUnit\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Christophe Coevoet", - "email": "stof@notk.org" - } - ], - "description": "Integrating the Prophecy mocking library in PHPUnit test cases", - "homepage": "http://phpspec.net", - "keywords": [ - "phpunit", - "prophecy" - ], - "support": { - "issues": "https://github.com/phpspec/prophecy-phpunit/issues", - "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.0.2" - }, - "time": "2023-04-18T11:58:05+00:00" - }, { "name": "phpstan/extension-installer", "version": "1.3.1", @@ -8596,53 +8308,6 @@ }, "time": "2023-05-24T08:59:17+00:00" }, - { - "name": "phpstan/phpdoc-parser", - "version": "1.24.2", - "source": { - "type": "git", - "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "bcad8d995980440892759db0c32acae7c8e79442" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bcad8d995980440892759db0c32acae7c8e79442", - "reference": "bcad8d995980440892759db0c32acae7c8e79442", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0" - }, - "require-dev": { - "doctrine/annotations": "^2.0", - "nikic/php-parser": "^4.15", - "php-parallel-lint/php-parallel-lint": "^1.2", - "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^1.5", - "phpstan/phpstan-phpunit": "^1.1", - "phpstan/phpstan-strict-rules": "^1.0", - "phpunit/phpunit": "^9.5", - "symfony/process": "^5.2" - }, - "type": "library", - "autoload": { - "psr-4": { - "PHPStan\\PhpDocParser\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "PHPDoc parser with support for nullable, intersection and generic types", - "support": { - "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.2" - }, - "time": "2023-09-26T12:28:12+00:00" - }, { "name": "phpstan/phpstan", "version": "1.10.41", @@ -10855,64 +10520,6 @@ } ], "time": "2021-07-28T10:34:58+00:00" - }, - { - "name": "webmozart/assert", - "version": "1.11.0", - "source": { - "type": "git", - "url": "https://github.com/webmozarts/assert.git", - "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991", - "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991", - "shasum": "" - }, - "require": { - "ext-ctype": "*", - "php": "^7.2 || ^8.0" - }, - "conflict": { - "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<4.6.1 || 4.6.2" - }, - "require-dev": { - "phpunit/phpunit": "^8.5.13" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.10-dev" - } - }, - "autoload": { - "psr-4": { - "Webmozart\\Assert\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "Assertions to validate method input/output with nice error messages.", - "keywords": [ - "assert", - "check", - "validate" - ], - "support": { - "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.11.0" - }, - "time": "2022-06-03T18:03:27+00:00" } ], "aliases": [], diff --git a/tests/Unit/Components/DependencyInjection/ContainerTest.php b/tests/Unit/Components/DependencyInjection/ContainerTest.php index 66cec512284..0e01da8867a 100644 --- a/tests/Unit/Components/DependencyInjection/ContainerTest.php +++ b/tests/Unit/Components/DependencyInjection/ContainerTest.php @@ -27,8 +27,6 @@ use Enlight_Event_EventManager; use Exception; use PHPUnit\Framework\TestCase; -use Prophecy\Argument; -use Prophecy\PhpUnit\ProphecyTrait; use Shopware\Components\ContainerAwareEventManager; use Shopware\Components\DependencyInjection\Container; use stdClass; @@ -37,12 +35,7 @@ class ContainerTest extends TestCase { - use ProphecyTrait; - - /** - * @var Container - */ - private $container; + private Container $container; protected function setUp(): void { @@ -97,46 +90,61 @@ public function testGetOnNonExistentWithIgnoreBehaviour(): void public function testEventsAreEmittedDuringServiceInitialisation(): void { - $service = $this->prophesize(Enlight_Event_EventManager::class); - - $service->notify('Enlight_Bootstrap_AfterRegisterResource_events', Argument::any())->shouldBeCalled(); - $service->notifyUntil('Enlight_Bootstrap_InitResource_bar', Argument::any())->shouldBeCalled(); - $service->notify('Enlight_Bootstrap_AfterInitResource_bar', Argument::any())->shouldBeCalled(); + $eventManager = $this->createMock(Enlight_Event_EventManager::class); + $eventManager->expects(static::exactly(2)) + ->method('notify') + ->with(static::logicalOr( + 'Enlight_Bootstrap_AfterRegisterResource_events', + 'Enlight_Bootstrap_AfterInitResource_bar' + )); + $eventManager->expects(static::once()) + ->method('notifyUntil') + ->with('Enlight_Bootstrap_InitResource_bar'); - $service = $service->reveal(); - $this->container->set('events', $service); + $this->container->set('events', $eventManager); static::assertInstanceOf('stdClass', $this->container->get('bar')); } public function testEventsAreEmitedDuringServiceInitialisationWhenUsingAlias(): void { - $service = $this->prophesize(Enlight_Event_EventManager::class); - - $service->notify('Enlight_Bootstrap_AfterRegisterResource_events', Argument::any())->shouldBeCalled(); - $service->notifyUntil('Enlight_Bootstrap_InitResource_bar', Argument::any())->shouldBeCalled(); - $service->notifyUntil('Enlight_Bootstrap_InitResource_alias', Argument::any())->shouldBeCalled(); - $service->notify('Enlight_Bootstrap_AfterInitResource_bar', Argument::any())->shouldBeCalled(); - $service->notify('Enlight_Bootstrap_AfterInitResource_alias', Argument::any())->shouldBeCalled(); + $eventManager = $this->createMock(Enlight_Event_EventManager::class); + $eventManager->expects(static::exactly(3)) + ->method('notify') + ->with(static::logicalOr( + 'Enlight_Bootstrap_AfterRegisterResource_events', + 'Enlight_Bootstrap_AfterInitResource_bar', + 'Enlight_Bootstrap_AfterInitResource_alias' + )); + $eventManager->expects(static::exactly(2)) + ->method('notifyUntil') + ->with(static::logicalOr( + 'Enlight_Bootstrap_InitResource_bar', + 'Enlight_Bootstrap_InitResource_alias' + )); - $service = $service->reveal(); - $this->container->set('events', $service); + $this->container->set('events', $eventManager); static::assertInstanceOf('stdClass', $this->container->get('alias')); } public function testEventsAreEmitedDuringServiceInitialisationWhenUsingUnknownServices(): void { - $service = $this->prophesize(Enlight_Event_EventManager::class); - - $service->notify('Enlight_Bootstrap_AfterRegisterResource_events', Argument::any())->shouldBeCalled(); - $service->notifyUntil('Enlight_Bootstrap_InitResource_foo', Argument::any())->shouldBeCalled(); - $service->notify('Enlight_Bootstrap_AfterInitResource_foo', Argument::any())->shouldBeCalled(); + $eventManager = $this->createMock(Enlight_Event_EventManager::class); + $eventManager->expects(static::exactly(2)) + ->method('notify') + ->with(static::logicalOr( + 'Enlight_Bootstrap_AfterRegisterResource_events', + 'Enlight_Bootstrap_AfterInitResource_foo' + )); + $eventManager->expects(static::once()) + ->method('notifyUntil') + ->with('Enlight_Bootstrap_InitResource_foo'); - $service = $service->reveal(); - $this->container->set('events', $service); + $this->container->set('events', $eventManager); $this->expectException(Exception::class); + $this->expectExceptionMessage('You have requested a non-existent service "foo".'); $this->container->get('foo'); } @@ -153,8 +161,9 @@ public function testAfterInitEventDecorator(): void $this->container->get('events')->addListener( 'Enlight_Bootstrap_AfterInitResource_bar', function (Enlight_Event_EventArgs $e) use ($class) { - /** @var ProjectServiceContainer $container */ - $container = $e->getSubject(); + $container = $e->get('subject'); + self::assertInstanceOf(ProjectServiceContainer::class, $container); + $container->set('bar', $class); } ); @@ -190,8 +199,8 @@ public function testServiceCircularReferenceExceptionException(): void $this->container->get('events')->addListener( 'Enlight_Bootstrap_InitResource_child', function (Enlight_Event_EventArgs $e) { - /** @var ProjectServiceContainer $container */ - $container = $e->getSubject(); + $container = $e->get('subject'); + self::assertInstanceOf(ProjectServiceContainer::class, $container); // Cause circular reference $container->get('parent'); @@ -201,8 +210,8 @@ function (Enlight_Event_EventArgs $e) { $this->container->get('events')->addListener( 'Enlight_Bootstrap_AfterInitResource_parent', function (Enlight_Event_EventArgs $e) { - /** @var ProjectServiceContainer $container */ - $container = $e->getSubject(); + $container = $e->get('subject'); + self::assertInstanceOf(ProjectServiceContainer::class, $container); $coreParent = $container->get('parent'); From eff5a194f05d3c90e3833b58382c389f0119b29b Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 21 Sep 2023 16:21:35 +0200 Subject: [PATCH 509/730] ci: Add PHP 8.3 to the test matrix --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 01df019ddcf..6b6347c1f1f 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -14,7 +14,7 @@ jobs: php: strategy: matrix: - php: ['7.4', '8.0', '8.1', '8.2'] + php: ['7.4', '8.0', '8.1', '8.2', '8.3'] mysql: ['pkgs.mysql80'] runs-on: ubuntu-latest steps: From 5e35624a38d4bbf908aeec7d83fb71b590acfa90 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 21 Sep 2023 16:22:05 +0200 Subject: [PATCH 510/730] feat: Allow installation on PHP 8.3 in composer.json --- UPGRADE-5.7.md | 5 +++ composer.json | 3 +- composer.lock | 84 ++++++++++++++++++++++++++++++++++- recovery/common/composer.json | 2 +- recovery/common/composer.lock | 4 +- 5 files changed, 92 insertions(+), 6 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index d9b09206409..6483de47d8b 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -6,6 +6,11 @@ This changelog references changes done in Shopware 5.7 patch versions. [View all changes from v5.7.19...v5.7.20](https://github.com/shopware5/shopware/compare/v5.7.19...v5.7.20) +### Additions + +* Added compatibility with PHP 8.3 +* Added new polyfill `symfony/polyfill-php83` to be able to use PHP 8.3 features + ### Changes * Changed behaviour of the translation transfer while setting a product variant as the main variant diff --git a/composer.json b/composer.json index 3a5e8795a5d..c113e271f1b 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "issues": "https://issues.shopware.com" }, "require": { - "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0", + "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", "ext-ctype": "*", "ext-curl": "*", "ext-date": "*", @@ -84,6 +84,7 @@ "symfony/polyfill-php80": "^1.23", "symfony/polyfill-php81": "^1.23", "symfony/polyfill-php82": "^1.26", + "symfony/polyfill-php83": "^1.28", "symfony/process": "~4.4.34", "symfony/serializer": "~5.4.0", "symfony/validator": "~4.4.34", diff --git a/composer.lock b/composer.lock index d22096c5f46..f78c0951554 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": "1d25b5a3d868b27da86b27c330b6bf81", + "content-hash": "b0ea6c0efc0378d9808bdb6072617119", "packages": [ { "name": "aws/aws-crt-php", @@ -6169,6 +6169,86 @@ ], "time": "2023-08-25T17:27:25+00:00" }, + { + "name": "symfony/polyfill-php83", + "version": "v1.28.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php83.git", + "reference": "b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11", + "reference": "b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11", + "shasum": "" + }, + "require": { + "php": ">=7.1", + "symfony/polyfill-php80": "^1.14" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.28-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php83\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.3+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php83/tree/v1.28.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-08-16T06:22:46+00:00" + }, { "name": "symfony/process", "version": "v4.4.44", @@ -10528,7 +10608,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0", + "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", "ext-ctype": "*", "ext-curl": "*", "ext-date": "*", diff --git a/recovery/common/composer.json b/recovery/common/composer.json index c3bfab730d5..cd2632a4d6f 100644 --- a/recovery/common/composer.json +++ b/recovery/common/composer.json @@ -1,6 +1,6 @@ { "require": { - "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0", + "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", "knplabs/gaufrette": "0.11.1", "pimple/pimple": "3.5.0", "slim/slim": "2.6.3", diff --git a/recovery/common/composer.lock b/recovery/common/composer.lock index d3069143ba3..6d60879c133 100644 --- a/recovery/common/composer.lock +++ b/recovery/common/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": "5e12e58996c7d623ea395eeaf95a1a88", + "content-hash": "c6ceb3b9ec9de94345bd1d0c524c235a", "packages": [ { "name": "knplabs/gaufrette", @@ -1381,7 +1381,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" }, "platform-dev": [], "plugin-api-version": "2.3.0" From 268f77b6bc5e7efa44d17f147e8b49ccfee891ea Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Mon, 4 Dec 2023 09:18:50 +0000 Subject: [PATCH 511/730] fix: Drop usage of xml_set_object() (#2615) Use normal callables instead of `ext/xml`'s strange feature --- engine/Library/Zend/Translate/Adapter/XmlTm.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/engine/Library/Zend/Translate/Adapter/XmlTm.php b/engine/Library/Zend/Translate/Adapter/XmlTm.php index 9a3ff7fcb55..4b808105a03 100644 --- a/engine/Library/Zend/Translate/Adapter/XmlTm.php +++ b/engine/Library/Zend/Translate/Adapter/XmlTm.php @@ -60,10 +60,9 @@ protected function _loadTranslationData($filename, $locale, array $options = arr $encoding = $this->_findEncoding($filename); $this->_file = xml_parser_create($encoding); - xml_set_object($this->_file, $this); xml_parser_set_option($this->_file, XML_OPTION_CASE_FOLDING, 0); - xml_set_element_handler($this->_file, "_startElement", "_endElement"); - xml_set_character_data_handler($this->_file, "_contentElement"); + xml_set_element_handler($this->_file, [$this, "_startElement"], [$this, "_endElement"]); + xml_set_character_data_handler($this->_file, [$this, "_contentElement"]); if (!xml_parse($this->_file, file_get_contents($filename))) { $ex = sprintf('XML error: %s at line %d of file %s', From 94a60eedd1716d3399c20a80ae1bf7302f60255c Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 13 Dec 2023 11:34:10 +0100 Subject: [PATCH 512/730] chore: Update phpstan/phpstan to 1.10.50 --- .phpstan-baseline.neon | 47 +------------------ .phpstan.neon | 5 -- composer.json | 2 +- composer.lock | 12 ++--- engine/Library/Enlight/Event/EventManager.php | 14 +++--- .../Service/LegacyPluginExtractor.php | 43 ++++++++--------- .../Service/PluginZipDetector.php | 6 +++ .../Components/Cart/TaxAggregator.php | 7 --- .../Frontend/AdvancedMenu/Bootstrap.php | 2 +- .../Components/Cart/TaxAggregatorTest.php | 13 ----- 10 files changed, 43 insertions(+), 108 deletions(-) diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index d31591dd048..9cddc1f61b8 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -2720,11 +2720,6 @@ parameters: count: 1 path: engine/Library/Enlight/Event/EventHandler.php - - - message: "#^Method Enlight_Event_EventManager\\:\\:buildEventArgs\\(\\) has parameter \\$eventArgs with no value type specified in iterable type array\\.$#" - count: 1 - path: engine/Library/Enlight/Event/EventManager.php - - message: "#^Method Enlight_Event_EventManager\\:\\:collect\\(\\) has parameter \\$collection with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#" count: 1 @@ -7675,41 +7670,6 @@ parameters: count: 1 path: engine/Shopware/Bundle/PluginInstallerBundle/Service/InstallerService.php - - - message: "#^Cannot access offset 'name' on array\\|false\\.$#" - count: 4 - path: engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginExtractor.php - - - - message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\LegacyPluginExtractor\\:\\:assertNoDirectoryTraversal\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginExtractor.php - - - - message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\LegacyPluginExtractor\\:\\:assertPrefix\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginExtractor.php - - - - message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\LegacyPluginExtractor\\:\\:assertValid\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginExtractor.php - - - - message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\LegacyPluginExtractor\\:\\:clearOpcodeCache\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginExtractor.php - - - - message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\LegacyPluginExtractor\\:\\:extract\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginExtractor.php - - - - message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\LegacyPluginExtractor\\:\\:validatePluginZip\\(\\) has no return type specified\\.$#" - count: 1 - path: engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginExtractor.php - - message: "#^Cannot call method Collection\\(\\) on Shopware_Components_Plugin_Bootstrap\\|null\\.$#" count: 3 @@ -7995,11 +7955,6 @@ parameters: count: 1 path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginViewService.php - - - message: "#^Cannot access offset 'name' on array\\|false\\.$#" - count: 2 - path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginZipDetector.php - - message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Struct\\\\BasketPositionStruct\\:\\:setPlugin\\(\\) has no return type specified\\.$#" count: 1 @@ -26006,7 +25961,7 @@ parameters: path: engine/Shopware/Core/sBasket.php - - message: "#^Parameter \\#1 \\$moneyfloat of method sArticles\\:\\:sRound\\(\\) expects float\\|string\\|null, array\\|float\\|void\\|false given\\.$#" + message: "#^Parameter \\#1 \\$moneyfloat of method sArticles\\:\\:sRound\\(\\) expects float\\|string\\|null, array\\|float\\|false\\|null given\\.$#" count: 2 path: engine/Shopware/Core/sBasket.php diff --git a/.phpstan.neon b/.phpstan.neon index d8ce644c921..7dad8f86ec9 100644 --- a/.phpstan.neon +++ b/.phpstan.neon @@ -185,11 +185,6 @@ parameters: count: 1 path: tests/Functional/Components/Cart/CartToOrderAttributeTest.php - - # Bug in PHPStan. See https://github.com/phpstan/phpstan/issues/6653 - message: "#^Method sArticles\\:\\:sGetProductByOrdernumber\\(\\) should return array\\\\|false but returns array\\\\|bool\\.$#" - count: 1 - path: engine/Shopware/Core/sArticles.php - - # In this case PHPStan does not consider the second parameter flag of \Symfony\Component\DependencyInjection\ContainerInterface::get message: '#Method Shopware\\Tests\\Mink\\Tests\\General\\Helpers\\SubContext::getService\(\) should return TService of object but returns object\|null#' count: 1 diff --git a/composer.json b/composer.json index c113e271f1b..9018bfa55f8 100644 --- a/composer.json +++ b/composer.json @@ -113,7 +113,7 @@ "friends-of-behat/mink-extension": "2.7.4", "php-parallel-lint/php-var-dump-check": "^0.5", "phpstan/extension-installer": "1.3.1", - "phpstan/phpstan": "1.10.41", + "phpstan/phpstan": "1.10.49", "phpstan/phpstan-doctrine": "1.3.45", "phpstan/phpstan-phpunit": "1.3.15", "phpstan/phpstan-symfony": "1.3.5", diff --git a/composer.lock b/composer.lock index f78c0951554..1c8781c40e0 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": "b0ea6c0efc0378d9808bdb6072617119", + "content-hash": "28e090f8a6cb914bb81d05f789b43e6f", "packages": [ { "name": "aws/aws-crt-php", @@ -8390,16 +8390,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.41", + "version": "1.10.49", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "c6174523c2a69231df55bdc65b61655e72876d76" + "reference": "9367ba4c4f6ad53e9efb594d74a8941563caccf6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c6174523c2a69231df55bdc65b61655e72876d76", - "reference": "c6174523c2a69231df55bdc65b61655e72876d76", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9367ba4c4f6ad53e9efb594d74a8941563caccf6", + "reference": "9367ba4c4f6ad53e9efb594d74a8941563caccf6", "shasum": "" }, "require": { @@ -8448,7 +8448,7 @@ "type": "tidelift" } ], - "time": "2023-11-05T12:57:57+00:00" + "time": "2023-12-12T10:05:12+00:00" }, { "name": "phpstan/phpstan-doctrine", diff --git a/engine/Library/Enlight/Event/EventManager.php b/engine/Library/Enlight/Event/EventManager.php index 5fc1fefff5f..84efdd79272 100644 --- a/engine/Library/Enlight/Event/EventManager.php +++ b/engine/Library/Enlight/Event/EventManager.php @@ -382,19 +382,21 @@ public function reset() } /** - * @param Enlight_Event_EventArgs|array|null $eventArgs + * @param Enlight_Event_EventArgs|array|mixed|null $eventArgs * * @throws Enlight_Event_Exception - * - * @return Enlight_Event_EventArgs */ - private function buildEventArgs($eventArgs = null) + private function buildEventArgs($eventArgs = null): Enlight_Event_EventArgs { if (isset($eventArgs) && \is_array($eventArgs)) { return new Enlight_Event_EventArgs($eventArgs); - } elseif (!isset($eventArgs)) { + } + + if (!isset($eventArgs)) { return new Enlight_Event_EventArgs(); - } elseif (!$eventArgs instanceof Enlight_Event_EventArgs) { + } + + if (!$eventArgs instanceof Enlight_Event_EventArgs) { throw new Enlight_Event_Exception('Parameter "eventArgs" must be an instance of "Enlight_Event_EventArgs"'); } diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginExtractor.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginExtractor.php index 92e3e2e8121..ac27b8ddbe2 100644 --- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginExtractor.php +++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginExtractor.php @@ -36,6 +36,8 @@ class LegacyPluginExtractor * @param string $destination * * @throws Exception + * + * @return void */ public function extract($archive, $destination) { @@ -57,32 +59,32 @@ public function extract($archive, $destination) * * @throws Exception */ - private function validatePluginZip(ZipArchive $archive) + private function validatePluginZip(ZipArchive $archive): void { $prefix = $this->getLegacyPluginPrefix($archive); $this->assertValid($archive, $prefix); } - /** - * @param string $prefix - */ - private function assertValid(ZipArchive $archive, $prefix) + private function assertValid(ZipArchive $archive, string $prefix): void { for ($i = 2; $i < $archive->numFiles; ++$i) { $stat = $archive->statIndex($i); + if (!\is_array($stat)) { + continue; + } $this->assertNoDirectoryTraversal($stat['name']); $this->assertPrefix($stat['name'], $prefix); } } - /** - * @return string - */ - private function getLegacyPluginPrefix(ZipArchive $archive) + private function getLegacyPluginPrefix(ZipArchive $archive): string { $segments = $archive->statIndex(0); + if (!\is_array($segments)) { + throw new RuntimeException('Uploaded zip archive contains no plugin namespace directory'); + } $segments = array_filter(explode('/', $segments['name'])); if (!\in_array($segments[0], ['Frontend', 'Backend', 'Core'])) { @@ -90,8 +92,10 @@ private function getLegacyPluginPrefix(ZipArchive $archive) } if (\count($segments) <= 1) { - $segments = $archive->statIndex(1); - $segments = array_filter(explode('/', $segments['name'])); + $segmentsTmp = $archive->statIndex(1); + if (\is_array($segmentsTmp)) { + $segments = array_filter(explode('/', $segmentsTmp['name'])); + } } return implode('/', [$segments[0], $segments[1]]); @@ -101,7 +105,7 @@ private function getLegacyPluginPrefix(ZipArchive $archive) * Clear opcode caches to make sure that the * updated plugin files are used in the following requests. */ - private function clearOpcodeCache() + private function clearOpcodeCache(): void { if (\function_exists('opcache_reset')) { opcache_reset(); @@ -112,23 +116,16 @@ private function clearOpcodeCache() } } - /** - * @param string $filename - * @param string $prefix - */ - private function assertPrefix($filename, $prefix) + private function assertPrefix(string $filename, string $prefix): void { - if (strpos($filename, $prefix) !== 0) { + if (!str_starts_with($filename, $prefix)) { throw new RuntimeException(sprintf('Detected invalid file/directory %s in the plugin zip: %s', $filename, $prefix)); } } - /** - * @param string $filename - */ - private function assertNoDirectoryTraversal($filename) + private function assertNoDirectoryTraversal(string $filename): void { - if (strpos($filename, '../') !== false) { + if (str_contains($filename, '../')) { throw new RuntimeException('Directory Traversal detected'); } } diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginZipDetector.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginZipDetector.php index 7bf82a123f5..2da9ba52767 100644 --- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginZipDetector.php +++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginZipDetector.php @@ -33,6 +33,9 @@ class PluginZipDetector public function isLegacyPlugin(ZipArchive $archive) { $entry = $archive->statIndex(0); + if (!\is_array($entry)) { + return false; + } $rootDirectory = explode('/', $entry['name'])[0]; return \in_array($rootDirectory, ['Frontend', 'Backend', 'Core']); @@ -44,6 +47,9 @@ public function isLegacyPlugin(ZipArchive $archive) public function isPlugin(ZipArchive $archive) { $entry = $archive->statIndex(0); + if (!\is_array($entry)) { + return false; + } $pluginName = explode('/', $entry['name'])[0]; $bootstrapFile = $pluginName . '/' . $pluginName . '.php'; diff --git a/engine/Shopware/Components/Cart/TaxAggregator.php b/engine/Shopware/Components/Cart/TaxAggregator.php index 7d1ba486255..8159d0edcb1 100644 --- a/engine/Shopware/Components/Cart/TaxAggregator.php +++ b/engine/Shopware/Components/Cart/TaxAggregator.php @@ -217,13 +217,6 @@ private function resolveTaxRateAndTax(array $cartPosition, float $maximumTaxRate ]; } - if (!empty($cartPosition['taxPercent'])) { - return [ - $cartPosition['taxPercent'], - $tax, - ]; - } - if ($cartPosition['modus'] == CartPositionsMode::VOUCHER) { return [ $this->getVoucherTaxRate($cartPosition['ordernumber'], $maximumTaxRate) ?: 0.0, diff --git a/engine/Shopware/Plugins/Default/Frontend/AdvancedMenu/Bootstrap.php b/engine/Shopware/Plugins/Default/Frontend/AdvancedMenu/Bootstrap.php index ad35251c969..068fa288fe4 100644 --- a/engine/Shopware/Plugins/Default/Frontend/AdvancedMenu/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Frontend/AdvancedMenu/Bootstrap.php @@ -88,7 +88,7 @@ public function onCollectLessFiles(): ArrayCollection } /** - * @return ArrayCollection + * @return ArrayCollection */ public function onCollectJavascriptFiles(): ArrayCollection { diff --git a/tests/Unit/Components/Cart/TaxAggregatorTest.php b/tests/Unit/Components/Cart/TaxAggregatorTest.php index 1db39f3ae85..7a898cd3305 100644 --- a/tests/Unit/Components/Cart/TaxAggregatorTest.php +++ b/tests/Unit/Components/Cart/TaxAggregatorTest.php @@ -105,19 +105,6 @@ public function positionsTaxSumDataProvider(): Generator ], ]; - yield 'Item with "taxPercent" set' => [ - [ - sprintf('%.2f', self::REGULAR_TAX_RATE) => 1.1, - ], - self::MAXIMUM_TAX_RATE, - [ - [ - 'taxPercent' => self::REGULAR_TAX_RATE, - 'tax' => 1.1, - ], - ], - ]; - yield 'Voucher item' => [ null, self::MAXIMUM_TAX_RATE, From aa7e162b855ecf63688811fdd8c715b9eb6a8f0c Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 27 Dec 2023 15:37:49 +0100 Subject: [PATCH 513/730] chore: Update phpstan/phpstan-doctrine to 1.3.53 --- .phpstan-baseline.neon | 5 +++++ composer.json | 4 ++-- composer.lock | 24 ++++++++++++------------ 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index 9cddc1f61b8..69896054c2c 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -28200,6 +28200,11 @@ parameters: count: 1 path: engine/Shopware/Models/Blog/Repository.php + - + message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getAverageVoteQuery\\(\\) should return Doctrine\\\\ORM\\\\Query\\ but returns Doctrine\\\\ORM\\\\Query\\\\>\\.$#" + count: 1 + path: engine/Shopware/Models/Blog/Repository.php + - message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getBackedDetailQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#" count: 1 diff --git a/composer.json b/composer.json index 9018bfa55f8..11d3290eaa6 100644 --- a/composer.json +++ b/composer.json @@ -113,8 +113,8 @@ "friends-of-behat/mink-extension": "2.7.4", "php-parallel-lint/php-var-dump-check": "^0.5", "phpstan/extension-installer": "1.3.1", - "phpstan/phpstan": "1.10.49", - "phpstan/phpstan-doctrine": "1.3.45", + "phpstan/phpstan": "1.10.50", + "phpstan/phpstan-doctrine": "1.3.53", "phpstan/phpstan-phpunit": "1.3.15", "phpstan/phpstan-symfony": "1.3.5", "phpunit/phpunit": "^9.6", diff --git a/composer.lock b/composer.lock index 1c8781c40e0..20225b031c7 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": "28e090f8a6cb914bb81d05f789b43e6f", + "content-hash": "dae04513d343b37bdaa2f7f21623325b", "packages": [ { "name": "aws/aws-crt-php", @@ -8390,16 +8390,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.49", + "version": "1.10.50", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "9367ba4c4f6ad53e9efb594d74a8941563caccf6" + "reference": "06a98513ac72c03e8366b5a0cb00750b487032e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9367ba4c4f6ad53e9efb594d74a8941563caccf6", - "reference": "9367ba4c4f6ad53e9efb594d74a8941563caccf6", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/06a98513ac72c03e8366b5a0cb00750b487032e4", + "reference": "06a98513ac72c03e8366b5a0cb00750b487032e4", "shasum": "" }, "require": { @@ -8448,20 +8448,20 @@ "type": "tidelift" } ], - "time": "2023-12-12T10:05:12+00:00" + "time": "2023-12-13T10:59:42+00:00" }, { "name": "phpstan/phpstan-doctrine", - "version": "1.3.45", + "version": "1.3.53", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-doctrine.git", - "reference": "90e60ba9dbea4b29c7b87026a29e91ac0a02674e" + "reference": "85def57e5db6ac6c8a512200c0cfadf7b6621b10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/90e60ba9dbea4b29c7b87026a29e91ac0a02674e", - "reference": "90e60ba9dbea4b29c7b87026a29e91ac0a02674e", + "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/85def57e5db6ac6c8a512200c0cfadf7b6621b10", + "reference": "85def57e5db6ac6c8a512200c0cfadf7b6621b10", "shasum": "" }, "require": { @@ -8516,9 +8516,9 @@ "description": "Doctrine extensions for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-doctrine/issues", - "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.45" + "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.53" }, - "time": "2023-10-29T08:18:22+00:00" + "time": "2023-11-21T10:31:58+00:00" }, { "name": "phpstan/phpstan-phpunit", From 7cfe18f5457c3f1b3d8b07664699cf4194d0a4cc Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 27 Dec 2023 15:54:21 +0100 Subject: [PATCH 514/730] chore: Update symfony components --- UPGRADE-5.7.md | 3 ++- composer.lock | 72 +++++++++++++++++++++++++------------------------- 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 6483de47d8b..a659b09fbe2 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -31,7 +31,8 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `symfony/polyfill-php80` to version 1.28.0 * Updated `symfony/polyfill-php81` to version 1.28.0 * Updated `symfony/polyfill-php82` to version 1.28.0 -* Updated `symfony/serializer` to version 5.4.30 +* Updated `symfony/http-kernel` to version 4.4.51 +* Updated `symfony/serializer` to version 5.4.33 * Updated `voku/anti-xss` to version 4.1.42 * Updated `wikimedia/less.php` to version 4.1.1 * Updated several indirect dependencies diff --git a/composer.lock b/composer.lock index 20225b031c7..51965c4b331 100644 --- a/composer.lock +++ b/composer.lock @@ -4105,16 +4105,16 @@ }, { "name": "symfony/cache", - "version": "v5.4.30", + "version": "v5.4.32", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "2742d1b595927210546bb7a0887094cf1494de21" + "reference": "2553faca77502a4f68dc93cd2f3b9ec650751e40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/2742d1b595927210546bb7a0887094cf1494de21", - "reference": "2742d1b595927210546bb7a0887094cf1494de21", + "url": "https://api.github.com/repos/symfony/cache/zipball/2553faca77502a4f68dc93cd2f3b9ec650751e40", + "reference": "2553faca77502a4f68dc93cd2f3b9ec650751e40", "shasum": "" }, "require": { @@ -4182,7 +4182,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v5.4.30" + "source": "https://github.com/symfony/cache/tree/v5.4.32" }, "funding": [ { @@ -4198,7 +4198,7 @@ "type": "tidelift" } ], - "time": "2023-10-17T14:17:25+00:00" + "time": "2023-11-24T13:04:07+00:00" }, { "name": "symfony/cache-contracts", @@ -4823,16 +4823,16 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v1.1.13", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e" + "reference": "761c8b8387cfe5f8026594a75fdf0a4e83ba6974" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/1d5cd762abaa6b2a4169d3e77610193a7157129e", - "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/761c8b8387cfe5f8026594a75fdf0a4e83ba6974", + "reference": "761c8b8387cfe5f8026594a75fdf0a4e83ba6974", "shasum": "" }, "require": { @@ -4882,7 +4882,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.13" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.10.0" }, "funding": [ { @@ -4898,7 +4898,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:41:36+00:00" + "time": "2022-07-20T09:59:04+00:00" }, { "name": "symfony/expression-language", @@ -5334,16 +5334,16 @@ }, { "name": "symfony/http-kernel", - "version": "v4.4.50", + "version": "v4.4.51", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "aa6df6c045f034aa13ac752fc234bb300b9488ef" + "reference": "ad8ab192cb619ff7285c95d28c69b36d718416c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/aa6df6c045f034aa13ac752fc234bb300b9488ef", - "reference": "aa6df6c045f034aa13ac752fc234bb300b9488ef", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/ad8ab192cb619ff7285c95d28c69b36d718416c7", + "reference": "ad8ab192cb619ff7285c95d28c69b36d718416c7", "shasum": "" }, "require": { @@ -5418,7 +5418,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v4.4.50" + "source": "https://github.com/symfony/http-kernel/tree/v4.4.51" }, "funding": [ { @@ -5434,7 +5434,7 @@ "type": "tidelift" } ], - "time": "2023-02-01T08:01:31+00:00" + "time": "2023-11-10T13:31:29+00:00" }, { "name": "symfony/intl", @@ -6485,16 +6485,16 @@ }, { "name": "symfony/serializer", - "version": "v5.4.30", + "version": "v5.4.33", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "ceadb4e08830e69738d313b667cfb426269f67f6" + "reference": "d751878816665fa3e51c75f01d31c6ee62e94ce5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/ceadb4e08830e69738d313b667cfb426269f67f6", - "reference": "ceadb4e08830e69738d313b667cfb426269f67f6", + "url": "https://api.github.com/repos/symfony/serializer/zipball/d751878816665fa3e51c75f01d31c6ee62e94ce5", + "reference": "d751878816665fa3e51c75f01d31c6ee62e94ce5", "shasum": "" }, "require": { @@ -6568,7 +6568,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v5.4.30" + "source": "https://github.com/symfony/serializer/tree/v5.4.33" }, "funding": [ { @@ -6584,7 +6584,7 @@ "type": "tidelift" } ], - "time": "2023-10-25T18:53:19+00:00" + "time": "2023-12-01T10:42:49+00:00" }, { "name": "symfony/service-contracts", @@ -6671,16 +6671,16 @@ }, { "name": "symfony/string", - "version": "v5.4.29", + "version": "v5.4.32", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "e41bdc93def20eaf3bfc1537c4e0a2b0680a152d" + "reference": "91bf4453d65d8231688a04376c3a40efe0770f04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/e41bdc93def20eaf3bfc1537c4e0a2b0680a152d", - "reference": "e41bdc93def20eaf3bfc1537c4e0a2b0680a152d", + "url": "https://api.github.com/repos/symfony/string/zipball/91bf4453d65d8231688a04376c3a40efe0770f04", + "reference": "91bf4453d65d8231688a04376c3a40efe0770f04", "shasum": "" }, "require": { @@ -6737,7 +6737,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.29" + "source": "https://github.com/symfony/string/tree/v5.4.32" }, "funding": [ { @@ -6753,7 +6753,7 @@ "type": "tidelift" } ], - "time": "2023-09-13T11:47:41+00:00" + "time": "2023-11-26T13:43:46+00:00" }, { "name": "symfony/translation-contracts", @@ -7030,16 +7030,16 @@ }, { "name": "symfony/var-exporter", - "version": "v5.4.26", + "version": "v5.4.32", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "11401fe94f960249b3c63a488c63ba73091c1e4a" + "reference": "fdb022f0d3d41df240c18e2eb9a117c430f06add" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/11401fe94f960249b3c63a488c63ba73091c1e4a", - "reference": "11401fe94f960249b3c63a488c63ba73091c1e4a", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/fdb022f0d3d41df240c18e2eb9a117c430f06add", + "reference": "fdb022f0d3d41df240c18e2eb9a117c430f06add", "shasum": "" }, "require": { @@ -7083,7 +7083,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v5.4.26" + "source": "https://github.com/symfony/var-exporter/tree/v5.4.32" }, "funding": [ { @@ -7099,7 +7099,7 @@ "type": "tidelift" } ], - "time": "2023-07-20T07:21:16+00:00" + "time": "2023-11-16T19:33:05+00:00" }, { "name": "symfony/web-link", From 000b6f55f1ddef36252c764d6fa41953b0aea43d Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 27 Dec 2023 15:57:46 +0100 Subject: [PATCH 515/730] chore: Update guzzlehttp components --- UPGRADE-5.7.md | 4 ++-- composer.lock | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index a659b09fbe2..5999dac1551 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -19,8 +19,8 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `cocur/slugify` to version 4.5.1 for PHP 8.0 and newer * Updated `doctrine/orm` to version 2.15.5 * Updated `google/cloud-storage` to version 1.34.0 -* Updated `guzzlehttp/guzzle` to version 7.8.0 -* Updated `guzzlehttp/psr7` to version 2.6.1 +* Updated `guzzlehttp/guzzle` to version 7.8.1 +* Updated `guzzlehttp/psr7` to version 2.6.2 * Updated `monolog/monolog` to version 2.9.2 * Updated `mpdf/mpdf` to version 8.2.1 * Updated `laminas/laminas-code` to version 4.13.0 for PHP 8.1 and newer diff --git a/composer.lock b/composer.lock index 51965c4b331..ca5f551aee2 100644 --- a/composer.lock +++ b/composer.lock @@ -2042,16 +2042,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.8.0", + "version": "7.8.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9" + "reference": "41042bc7ab002487b876a0683fc8dce04ddce104" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1110f66a6530a40fe7aea0378fe608ee2b2248f9", - "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104", + "reference": "41042bc7ab002487b876a0683fc8dce04ddce104", "shasum": "" }, "require": { @@ -2066,11 +2066,11 @@ "psr/http-client-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.1", + "bamarni/composer-bin-plugin": "^1.8.2", "ext-curl": "*", "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", "php-http/message-factory": "^1.1", - "phpunit/phpunit": "^8.5.29 || ^9.5.23", + "phpunit/phpunit": "^8.5.36 || ^9.6.15", "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { @@ -2148,7 +2148,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.8.0" + "source": "https://github.com/guzzle/guzzle/tree/7.8.1" }, "funding": [ { @@ -2164,28 +2164,28 @@ "type": "tidelift" } ], - "time": "2023-08-27T10:20:53+00:00" + "time": "2023-12-03T20:35:24+00:00" }, { "name": "guzzlehttp/promises", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "111166291a0f8130081195ac4556a5587d7f1b5d" + "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/111166291a0f8130081195ac4556a5587d7f1b5d", - "reference": "111166291a0f8130081195ac4556a5587d7f1b5d", + "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223", + "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.1", - "phpunit/phpunit": "^8.5.29 || ^9.5.23" + "bamarni/composer-bin-plugin": "^1.8.2", + "phpunit/phpunit": "^8.5.36 || ^9.6.15" }, "type": "library", "extra": { @@ -2231,7 +2231,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.1" + "source": "https://github.com/guzzle/promises/tree/2.0.2" }, "funding": [ { @@ -2247,20 +2247,20 @@ "type": "tidelift" } ], - "time": "2023-08-03T15:11:55+00:00" + "time": "2023-12-03T20:19:20+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.6.1", + "version": "2.6.2", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "be45764272e8873c72dbe3d2edcfdfcc3bc9f727" + "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/be45764272e8873c72dbe3d2edcfdfcc3bc9f727", - "reference": "be45764272e8873c72dbe3d2edcfdfcc3bc9f727", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221", + "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221", "shasum": "" }, "require": { @@ -2274,9 +2274,9 @@ "psr/http-message-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.1", + "bamarni/composer-bin-plugin": "^1.8.2", "http-interop/http-factory-tests": "^0.9", - "phpunit/phpunit": "^8.5.29 || ^9.5.23" + "phpunit/phpunit": "^8.5.36 || ^9.6.15" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" @@ -2347,7 +2347,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.6.1" + "source": "https://github.com/guzzle/psr7/tree/2.6.2" }, "funding": [ { @@ -2363,7 +2363,7 @@ "type": "tidelift" } ], - "time": "2023-08-27T10:13:57+00:00" + "time": "2023-12-03T20:05:35+00:00" }, { "name": "laminas/laminas-code", From 77ef36557c5251815e0ada8ecaf96d37b568dd0e Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 27 Dec 2023 16:10:01 +0100 Subject: [PATCH 516/730] chore: Update code style fixer tools --- .phpstan-baseline.neon | 25 ----- engine/Library/Enlight/Class.php | 14 +-- .../Enlight/Controller/Dispatcher/Default.php | 5 +- .../Controller/Plugins/Json/Bootstrap.php | 2 +- .../Enlight/Controller/Request/Request.php | 4 +- .../Controller/Request/RequestHttp.php | 5 +- .../Enlight/Controller/Response/Response.php | 26 ++--- engine/Library/Enlight/Hook/HookArgs.php | 4 +- .../Enlight/Plugin/Namespace/Config.php | 2 +- engine/Library/Enlight/Template/Manager.php | 6 +- .../Template/Plugins/function.action.php | 1 - .../Plugins/function.compileJavascript.php | 16 +-- .../Template/Plugins/function.compileLess.php | 16 +-- .../Template/Plugins/modifier.date.php | 2 +- engine/Library/Enlight/View/Default.php | 2 +- .../Controllers/Backend/AttributeData.php | 4 +- .../Indexing/AnalyzedCustomer.php | 2 +- .../Commands/MediaOptimizeCommand.php | 2 +- .../MediaBundle/MediaServiceFactory.php | 3 +- .../CategoryTreeFacetResultBuilder.php | 2 +- .../StoreFrontCriteriaFactory.php | 2 +- .../StoreFrontCriteriaFactoryInterface.php | 2 +- .../SearchTerm/KeywordFinder.php | 2 +- .../Gateway/CategoryGatewayInterface.php | 2 +- .../Gateway/CheapestPriceGatewayInterface.php | 2 +- .../Gateway/CountryGatewayInterface.php | 6 +- .../Gateway/CustomerGroupGatewayInterface.php | 2 +- .../Gateway/DownloadGatewayInterface.php | 2 +- .../GraduatedPricesGatewayInterface.php | 2 +- .../Gateway/LinkGatewayInterface.php | 2 +- .../Gateway/ListProductGatewayInterface.php | 2 +- .../Gateway/ManufacturerGatewayInterface.php | 2 +- .../Gateway/MediaGatewayInterface.php | 4 +- .../ProductConfigurationGatewayInterface.php | 2 +- .../Gateway/ProductMediaGatewayInterface.php | 4 +- .../ProductPropertyGatewayInterface.php | 2 +- .../VariantCheapestPriceGatewayInterface.php | 2 +- .../Gateway/VariantMediaGatewayInterface.php | 4 +- .../Gateway/VoteAverageGatewayInterface.php | 2 +- .../Gateway/VoteGatewayInterface.php | 2 +- .../AdditionalTextServiceInterface.php | 2 +- .../Service/CheapestPriceServiceInterface.php | 2 +- .../GraduatedPricesServiceInterface.php | 2 +- .../Service/ListProductServiceInterface.php | 2 +- .../Service/MediaServiceInterface.php | 4 +- .../ProductDownloadServiceInterface.php | 2 +- .../Service/ProductLinkServiceInterface.php | 2 +- .../Service/ProductServiceInterface.php | 2 +- .../Service/PropertyServiceInterface.php | 2 +- .../RelatedProductStreamsServiceInterface.php | 2 +- .../RelatedProductsServiceInterface.php | 4 +- .../SimilarProductsServiceInterface.php | 4 +- .../StoreFrontBundle/Struct/Category.php | 4 +- .../Struct/Configurator/Option.php | 2 +- .../Struct/Configurator/Set.php | 4 +- .../Struct/Product/PriceDiscount.php | 4 +- .../StoreFrontBundle/Struct/Property/Set.php | 4 +- .../Bundle/StoreFrontBundle/Struct/Shop.php | 4 +- .../Commands/PluginRefreshCommand.php | 3 +- .../Commands/PluginReinstallCommand.php | 3 +- .../SettingsLabelsFindMissingCommand.php | 13 +-- .../Commands/ThemeInitializeCommand.php | 8 +- .../Components/Api/Resource/EmotionPreset.php | 2 +- engine/Shopware/Components/Auth.php | 10 +- .../Shopware/Components/CacheSubscriber.php | 2 +- .../Cart/BasketQueryHelperInterface.php | 2 +- engine/Shopware/Components/CsvIterator.php | 2 +- .../DependencyInjection/Bridge/Router.php | 7 +- engine/Shopware/Components/Document.php | 3 +- .../Components/Model/Configuration.php | 15 ++- engine/Shopware/Components/Modules.php | 6 +- .../MultiEdit/Resource/Product/Queue.php | 2 +- .../Shopware/Components/Plugin/Namespace.php | 10 +- .../Shopware/Components/ReflectionHelper.php | 2 +- .../Shopware/Components/Routing/Context.php | 2 +- .../Components/SitemapXMLRepository.php | 2 +- engine/Shopware/Components/StringCompiler.php | 4 +- engine/Shopware/Components/TemplateMail.php | 2 +- engine/Shopware/Components/Translation.php | 2 +- engine/Shopware/Controllers/Api/Caches.php | 2 +- .../Controllers/Api/CustomerGroups.php | 2 +- engine/Shopware/Controllers/Api/Media.php | 2 +- engine/Shopware/Controllers/Api/Orders.php | 2 +- engine/Shopware/Controllers/Api/Shops.php | 2 +- engine/Shopware/Controllers/Backend/Blog.php | 4 +- .../Shopware/Controllers/Backend/Category.php | 12 ++- engine/Shopware/Controllers/Backend/Login.php | 2 +- .../Controllers/Backend/PluginInstaller.php | 2 +- .../Controllers/Backend/ProductFeed.php | 10 +- .../Shopware/Controllers/Backend/Property.php | 26 ++--- engine/Shopware/Controllers/Backend/Site.php | 2 +- .../Shopware/Controllers/Backend/Snippet.php | 8 +- .../Controllers/Backend/Translation.php | 2 +- .../Controllers/Backend/UpdateWizard.php | 17 ++-- .../Shopware/Controllers/Backend/Voucher.php | 2 +- .../Controllers/Frontend/AjaxSearch.php | 3 +- .../Shopware/Controllers/Frontend/Index.php | 2 +- .../Shopware/Controllers/Frontend/Payment.php | 2 - .../Controllers/Frontend/Tellafriend.php | 1 - engine/Shopware/Core/sAdmin.php | 1 - engine/Shopware/Core/sBasket.php | 98 +++++++++---------- engine/Shopware/Core/sOrder.php | 8 +- engine/Shopware/Core/sRewriteTable.php | 4 +- .../Configurator/Template/Template.php | 2 +- engine/Shopware/Models/Article/Download.php | 2 +- engine/Shopware/Models/Article/Image/Rule.php | 6 +- engine/Shopware/Models/Config/Element.php | 2 +- engine/Shopware/Models/Country/Area.php | 4 +- .../Shopware/Models/Customer/PriceGroup.php | 4 +- .../CustomerStreamRepository.php | 14 ++- engine/Shopware/Models/Document/Document.php | 26 ++--- .../Models/Emotion/ElementViewport.php | 4 +- engine/Shopware/Models/Emotion/Preset.php | 8 +- .../Models/Emotion/PresetTranslation.php | 2 +- engine/Shopware/Models/MultiEdit/Queue.php | 4 +- .../Shopware/Models/Newsletter/Newsletter.php | 13 +-- engine/Shopware/Models/Order/History.php | 44 ++++----- engine/Shopware/Models/Partner/Partner.php | 11 ++- engine/Shopware/Models/Plugin/License.php | 2 +- engine/Shopware/Models/Plugin/Plugin.php | 8 +- engine/Shopware/Models/Price/Discount.php | 2 +- engine/Shopware/Models/Price/Group.php | 6 +- engine/Shopware/Models/Property/Relation.php | 12 +-- engine/Shopware/Models/Site/Group.php | 6 +- engine/Shopware/Models/Snippet/Snippet.php | 14 +-- .../Models/Translation/Translation.php | 2 +- engine/Shopware/Models/User/Resource.php | 6 +- engine/Shopware/Models/User/Role.php | 8 +- .../Default/Backend/Auth/Bootstrap.php | 4 +- .../Default/Core/PostFilter/Bootstrap.php | 2 +- .../Core/RebuildIndex/Controllers/Seo.php | 17 ++-- .../Plugins/Default/Core/System/Bootstrap.php | 4 +- .../Frontend/CronRefresh/Bootstrap.php | 18 ++-- .../Frontend/InputFilter/Bootstrap.php | 5 +- recovery/common/autoload.php | 4 +- recovery/install/src/app.php | 45 +++++---- recovery/update/src/Steps/MigrationStep.php | 2 +- recovery/update/src/Steps/UnpackStep.php | 4 +- .../Bundle/AttributeBundle/DataLoaderTest.php | 11 ++- .../CustomerAttributeConditionHandlerTest.php | 11 +-- .../HandlerRegistryTest.php | 6 +- .../Components/Cart/BasketQueryHelperTest.php | 2 +- .../Components/Model/GeneratorTest.php | 14 ++- .../Components/OptinServiceTest.php | 2 +- .../Functional/Components/Plugin/TestCase.php | 2 +- .../Plugins/Core/HttpCache/BootstrapTest.php | 8 +- .../MarketingAggregate/AbstractMarketing.php | 4 +- .../Bundle/SitemapBundle/SitemapLockTest.php | 2 +- vendor-bin/cs-fixer/composer.json | 4 +- vendor-bin/cs-fixer/composer.lock | 87 ++++++++-------- 150 files changed, 514 insertions(+), 519 deletions(-) diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon index 69896054c2c..e12ec30d075 100644 --- a/.phpstan-baseline.neon +++ b/.phpstan-baseline.neon @@ -35455,21 +35455,6 @@ parameters: count: 5 path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandlerTest.php - - - message: "#^Call to method delete\\(\\) on an unknown class Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\CrudService\\.$#" - count: 1 - path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/CustomerAttributeConditionHandlerTest.php - - - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\CustomerAttributeConditionHandlerTest\\:\\:testAttribute\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/CustomerAttributeConditionHandlerTest.php - - - - message: "#^PHPDoc tag @var for variable \\$service contains unknown class Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\CrudService\\.$#" - count: 1 - path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/CustomerAttributeConditionHandlerTest.php - - message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasAddressWithCountryConditionHandlerTest\\:\\:testOneCountry\\(\\) has no return type specified\\.$#" count: 1 @@ -39130,11 +39115,6 @@ parameters: count: 1 path: tests/Mink/Page/Frontend/Detail/Detail.php - - - message: "#^Parameter \\#2 \\$value of method Behat\\\\Mink\\\\Element\\\\TraversableElement\\:\\:fillField\\(\\) expects string, int given\\.$#" - count: 1 - path: tests/Mink/Page/Frontend/Detail/Detail.php - - message: "#^Strict comparison using \\=\\=\\= between '' and 'select' will always evaluate to false\\.$#" count: 2 @@ -39160,11 +39140,6 @@ parameters: count: 1 path: tests/Mink/Page/Frontend/Generic/GenericPage.php - - - message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Elements\\\\Banner\\:\\:click\\(\\) has no return type specified\\.$#" - count: 1 - path: tests/Mink/Page/Frontend/Homepage/Elements/Banner.php - - message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Elements\\\\Banner\\:\\:getImageProperty\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 diff --git a/engine/Library/Enlight/Class.php b/engine/Library/Enlight/Class.php index 12f3a445664..fd1ddde5565 100644 --- a/engine/Library/Enlight/Class.php +++ b/engine/Library/Enlight/Class.php @@ -43,7 +43,7 @@ abstract class Enlight_Class * If an hook proxy exist for the class, the constructor will prevent the initialization and throw an exception * that the instance method should be used. * - * @throws \Enlight_Exception + * @throws Enlight_Exception */ public function __construct() { @@ -80,7 +80,7 @@ public function __construct() * @param string $name * @param array $args * - * @throws \Enlight_Exception + * @throws Enlight_Exception */ public function __call($name, $args = null) { @@ -96,7 +96,7 @@ public function __call($name, $args = null) * @param string $name * @param array $args * - * @throws \Enlight_Exception + * @throws Enlight_Exception */ public static function __callStatic($name, $args = null) { @@ -111,7 +111,7 @@ public static function __callStatic($name, $args = null) * * @param string $name * - * @throws \Enlight_Exception + * @throws Enlight_Exception */ public function __get($name) { @@ -123,7 +123,7 @@ public function __get($name) * * @param string $name * - * @throws \Enlight_Exception + * @throws Enlight_Exception */ public function __set($name, $value = null) { @@ -134,7 +134,7 @@ public function __set($name, $value = null) * Returns the class name of the given class. If no class is given, the class will drawn by * get_called_class(). If the given class has an hook proxy the function will return the proxy class. * - * @throws \Enlight_Exception + * @throws Enlight_Exception * * @return class-string */ @@ -167,7 +167,7 @@ public static function getClassName($class = null) * @param class-string|null $class * @param array|null $args * - * @throws \ReflectionException + * @throws ReflectionException * * @return TClass */ diff --git a/engine/Library/Enlight/Controller/Dispatcher/Default.php b/engine/Library/Enlight/Controller/Dispatcher/Default.php index 4288027c99f..4baad56b74b 100644 --- a/engine/Library/Enlight/Controller/Dispatcher/Default.php +++ b/engine/Library/Enlight/Controller/Dispatcher/Default.php @@ -18,6 +18,7 @@ */ use Shopware\Components\DependencyInjection\ContainerAwareInterface; +use Shopware\Components\DispatchFormatHelper; use Symfony\Component\DependencyInjection\ContainerInterface as Container; /** @@ -83,7 +84,7 @@ class Enlight_Controller_Dispatcher_Default extends Enlight_Controller_Dispatche protected $modules = ['frontend', 'api', 'widgets', 'backend']; /** - * @var \Shopware\Components\DispatchFormatHelper + * @var DispatchFormatHelper */ protected $dispatchFormatHelper; @@ -105,7 +106,7 @@ public function __construct(array $controllers, Container $container) } /** - * @return \Shopware\Components\DispatchFormatHelper + * @return DispatchFormatHelper */ public function getDispatchFormatHelper() { diff --git a/engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php b/engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php index 6023a3aa1a9..154fdf1e9d1 100644 --- a/engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php +++ b/engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php @@ -195,7 +195,7 @@ public function getRenderer() * * @param string $encoding * - * @return \Enlight_Controller_Plugins_Json_Bootstrap + * @return Enlight_Controller_Plugins_Json_Bootstrap */ public function setEncoding($encoding) { diff --git a/engine/Library/Enlight/Controller/Request/Request.php b/engine/Library/Enlight/Controller/Request/Request.php index cf642009532..5f08647c229 100644 --- a/engine/Library/Enlight/Controller/Request/Request.php +++ b/engine/Library/Enlight/Controller/Request/Request.php @@ -39,7 +39,7 @@ public function __get($key); * * @param string $key * - * @throws \Exception + * @throws Exception */ public function __set($key, $value); @@ -626,7 +626,7 @@ public function setRequestUri($requestUri = null); * * @param string $header HTTP header name * - * @throws \Exception + * @throws Exception * * @return string|false|null HTTP header value, or false if not found */ diff --git a/engine/Library/Enlight/Controller/Request/RequestHttp.php b/engine/Library/Enlight/Controller/Request/RequestHttp.php index 3f62c2280ec..60d35a640e0 100644 --- a/engine/Library/Enlight/Controller/Request/RequestHttp.php +++ b/engine/Library/Enlight/Controller/Request/RequestHttp.php @@ -17,6 +17,7 @@ * @license http://enlight.de/license New BSD License */ +use Shopware\Components\DispatchFormatHelper; use Symfony\Component\HttpFoundation\Request; /** @@ -100,7 +101,7 @@ class Enlight_Controller_Request_RequestHttp extends Request implements Enlight_ protected $_params = []; /** - * @var \Shopware\Components\DispatchFormatHelper + * @var DispatchFormatHelper */ private $nameFormatter; @@ -129,7 +130,7 @@ public function __isset($key) } /** - * @return \Shopware\Components\DispatchFormatHelper + * @return DispatchFormatHelper */ public function getNameFormatter() { diff --git a/engine/Library/Enlight/Controller/Response/Response.php b/engine/Library/Enlight/Controller/Response/Response.php index 554fce50011..1def792fc81 100644 --- a/engine/Library/Enlight/Controller/Response/Response.php +++ b/engine/Library/Enlight/Controller/Response/Response.php @@ -35,7 +35,7 @@ interface Enlight_Controller_Response_Response * @param bool $secure * @param bool $httpOnly * - * @return \Enlight_Controller_Response_Response + * @return Enlight_Controller_Response_Response */ public function setCookie($name, $value = null, $expire = 0, $path = null, $domain = null, $secure = false, $httpOnly = false); @@ -59,7 +59,7 @@ public function unsetExceptions(); * @param string $value * @param bool $replace * - * @return \Enlight_Controller_Response_Response + * @return Enlight_Controller_Response_Response */ public function setHeader($name, $value, $replace = false); @@ -72,7 +72,7 @@ public function setHeader($name, $value, $replace = false); * @param string $url * @param int $code * - * @return \Enlight_Controller_Response_Response + * @return Enlight_Controller_Response_Response */ public function setRedirect($url, $code = 302); @@ -93,7 +93,7 @@ public function getHeaders(); /** * Clear headers * - * @return \Enlight_Controller_Response_Response + * @return Enlight_Controller_Response_Response */ public function clearHeaders(); @@ -102,14 +102,14 @@ public function clearHeaders(); * * @param string $name * - * @return \Enlight_Controller_Response_Response + * @return Enlight_Controller_Response_Response */ public function clearHeader($name); /** * Clear all headers, normal and raw * - * @return \Enlight_Controller_Response_Response + * @return Enlight_Controller_Response_Response */ public function clearAllHeaders(); @@ -118,7 +118,7 @@ public function clearAllHeaders(); * * @param int $code * - * @return \Enlight_Controller_Response_Response + * @return Enlight_Controller_Response_Response */ public function setHttpResponseCode($code); @@ -146,7 +146,7 @@ public function canSendHeaders($throw = false); * Sends any headers specified. If an {@link setHttpResponseCode() HTTP response code} * has been specified, it is sent with the first header. * - * @return \Enlight_Controller_Response_Response + * @return Enlight_Controller_Response_Response */ public function sendHeaders(); @@ -161,7 +161,7 @@ public function sendHeaders(); * * @param string|null $name * - * @return \Enlight_Controller_Response_Response + * @return Enlight_Controller_Response_Response */ public function setBody($content, $name = null); @@ -171,7 +171,7 @@ public function setBody($content, $name = null); * @param string $content * @param string|null $name * - * @return \Enlight_Controller_Response_Response + * @return Enlight_Controller_Response_Response */ public function appendBody($content, $name = null); @@ -211,7 +211,7 @@ public function getBody($spec = false); * @param string $name * @param string $content * - * @return \Enlight_Controller_Response_Response + * @return Enlight_Controller_Response_Response */ public function append($name, $content); @@ -229,14 +229,14 @@ public function prepend($name, $content); /** * Register an exception with the response * - * @return \Enlight_Controller_Response_Response + * @return Enlight_Controller_Response_Response */ public function setException(Exception $e); /** * Retrieve the exception stack * - * @return \Exception[] + * @return Exception[] */ public function getException(); diff --git a/engine/Library/Enlight/Hook/HookArgs.php b/engine/Library/Enlight/Hook/HookArgs.php index 5dc54007eaf..b892bc0406b 100644 --- a/engine/Library/Enlight/Hook/HookArgs.php +++ b/engine/Library/Enlight/Hook/HookArgs.php @@ -75,7 +75,7 @@ public function getArgs() /** * Sets the given property to null. * - * @return \Enlight_Hook_HookArgs + * @return Enlight_Hook_HookArgs */ public function remove($key) { @@ -87,7 +87,7 @@ public function remove($key) /** * Default set function to set the value to the given property * - * @return \Enlight_Hook_HookArgs + * @return Enlight_Hook_HookArgs */ public function set($key, $value) { diff --git a/engine/Library/Enlight/Plugin/Namespace/Config.php b/engine/Library/Enlight/Plugin/Namespace/Config.php index c98f08fafcd..e825a9b970d 100644 --- a/engine/Library/Enlight/Plugin/Namespace/Config.php +++ b/engine/Library/Enlight/Plugin/Namespace/Config.php @@ -64,7 +64,7 @@ public function __construct($name, $storage = null) * @param string $name * @param bool $throwException * - * @return \Enlight_Plugin_Namespace_Config|\Enlight_Plugin_PluginCollection + * @return Enlight_Plugin_Namespace_Config|\Enlight_Plugin_PluginCollection */ public function load($name, $throwException = true) { diff --git a/engine/Library/Enlight/Template/Manager.php b/engine/Library/Enlight/Template/Manager.php index 01c5e4d3826..917d095b8a0 100644 --- a/engine/Library/Enlight/Template/Manager.php +++ b/engine/Library/Enlight/Template/Manager.php @@ -17,6 +17,8 @@ * @license http://enlight.de/license New BSD License */ +use Shopware\Components\Theme; + /** * The Enlight_Template_Manager is an extension of smarty to manually set the config in the class constructor. * @@ -252,7 +254,7 @@ public function resolveTemplateDir($templateDir, $key = null) } /** - * @param \Enlight_Event_EventManager $eventManager + * @param Enlight_Event_EventManager $eventManager * * @return Enlight_Template_Manager */ @@ -302,7 +304,7 @@ public function buildInheritance($themeDirectories, $pluginDirs) $class = '\\Shopware\\Themes\\' . $name . '\\Theme'; - /** @var \Shopware\Components\Theme $theme */ + /** @var Theme $theme */ $theme = new $class(); if ($theme->injectBeforePlugins()) { diff --git a/engine/Library/Enlight/Template/Plugins/function.action.php b/engine/Library/Enlight/Template/Plugins/function.action.php index b54c62f0ad4..a0c5ee5b305 100644 --- a/engine/Library/Enlight/Template/Plugins/function.action.php +++ b/engine/Library/Enlight/Template/Plugins/function.action.php @@ -53,7 +53,6 @@ function smarty_function_action($params, Enlight_Template_Default $template) $params = array_merge($userParams, $params); - /** @var \Shopware_Plugins_Core_HttpCache_Bootstrap $httpCache */ $httpCache = Shopware()->Plugins()->Core()->HttpCache(); if ($esiTag = $httpCache->renderEsiTag($request, $params)) { return $esiTag; diff --git a/engine/Library/Enlight/Template/Plugins/function.compileJavascript.php b/engine/Library/Enlight/Template/Plugins/function.compileJavascript.php index 656154151f5..01518daf301 100644 --- a/engine/Library/Enlight/Template/Plugins/function.compileJavascript.php +++ b/engine/Library/Enlight/Template/Plugins/function.compileJavascript.php @@ -17,6 +17,11 @@ * @license http://enlight.de/license New BSD License */ +use Doctrine\ORM\AbstractQuery; +use Shopware\Components\Theme\PathResolver; +use Shopware\Components\Theme\Service; +use Shopware\Models\Theme\Settings; + /** * @param string $template * @@ -27,15 +32,13 @@ function smarty_function_compileJavascript(array $params, $template) $time = $params['timestamp']; $output = $params['output']; - /** @var \Shopware\Components\Theme\PathResolver $pathResolver */ - $pathResolver = Shopware()->Container()->get(\Shopware\Components\Theme\PathResolver::class); + $pathResolver = Shopware()->Container()->get(PathResolver::class); - /** @var \Shopware\Models\Shop\Shop $shop */ $shop = Shopware()->Container()->get('shop'); - /** @var \Shopware\Models\Theme\Settings $settings */ - $settings = Shopware()->Container()->get(\Shopware\Components\Theme\Service::class)->getSystemConfiguration( - \Doctrine\ORM\AbstractQuery::HYDRATE_OBJECT + /** @var Settings $settings */ + $settings = Shopware()->Container()->get(Service::class)->getSystemConfiguration( + AbstractQuery::HYDRATE_OBJECT ); $file = $pathResolver->getJsFilePath($shop, $time); @@ -48,7 +51,6 @@ function smarty_function_compileJavascript(array $params, $template) return; } - /** @var \Shopware\Components\Theme\Compiler $compiler */ $compiler = Shopware()->Container()->get('theme_compiler'); $compiler->compileJavascript($time, $shop->getTemplate(), $shop); $template->assign($output, [$url]); diff --git a/engine/Library/Enlight/Template/Plugins/function.compileLess.php b/engine/Library/Enlight/Template/Plugins/function.compileLess.php index 19db17a1c43..229b9514a40 100644 --- a/engine/Library/Enlight/Template/Plugins/function.compileLess.php +++ b/engine/Library/Enlight/Template/Plugins/function.compileLess.php @@ -17,6 +17,11 @@ * @license http://enlight.de/license New BSD License */ +use Doctrine\ORM\AbstractQuery; +use Shopware\Components\Theme\PathResolver; +use Shopware\Components\Theme\Service; +use Shopware\Models\Theme\Settings; + /** * @param array $params * @param array $template @@ -28,15 +33,13 @@ function smarty_function_compileLess($params, $template) $time = $params['timestamp']; $output = $params['output']; - /** @var \Shopware\Components\Theme\PathResolver $pathResolver */ - $pathResolver = Shopware()->Container()->get(\Shopware\Components\Theme\PathResolver::class); + $pathResolver = Shopware()->Container()->get(PathResolver::class); - /** @var \Shopware\Models\Shop\Shop $shop */ $shop = Shopware()->Container()->get('shop'); - /** @var \Shopware\Models\Theme\Settings $settings */ - $settings = Shopware()->Container()->get(\Shopware\Components\Theme\Service::class)->getSystemConfiguration( - \Doctrine\ORM\AbstractQuery::HYDRATE_OBJECT + /** @var Settings $settings */ + $settings = Shopware()->Container()->get(Service::class)->getSystemConfiguration( + AbstractQuery::HYDRATE_OBJECT ); $file = $pathResolver->getCssFilePath($shop, $time); @@ -49,7 +52,6 @@ function smarty_function_compileLess($params, $template) return; } - /** @var \Shopware\Components\Theme\Compiler $compiler */ $compiler = Shopware()->Container()->get('theme_compiler'); $compiler->compileLess($time, $shop->getTemplate(), $shop); $template->assign($output, [$url]); diff --git a/engine/Library/Enlight/Template/Plugins/modifier.date.php b/engine/Library/Enlight/Template/Plugins/modifier.date.php index dc009edd549..76bc7b6123e 100644 --- a/engine/Library/Enlight/Template/Plugins/modifier.date.php +++ b/engine/Library/Enlight/Template/Plugins/modifier.date.php @@ -52,7 +52,7 @@ function smarty_modifier_date($value, $format = null, $type = null) if (\is_string($value)) { $value = strtotime($value); } elseif ($value instanceof DateTime) { - /** @var \DateTime $value */ + /** @var DateTime $value */ $value = $value->getTimestamp(); } diff --git a/engine/Library/Enlight/View/Default.php b/engine/Library/Enlight/View/Default.php index c136b20d6a8..c781f6f6177 100644 --- a/engine/Library/Enlight/View/Default.php +++ b/engine/Library/Enlight/View/Default.php @@ -222,7 +222,7 @@ public function templateExists($template_name) * @param bool|null $nocache * @param int|null $scope * - * @return \Enlight_View|\Enlight_View_Default + * @return Enlight_View|\Enlight_View_Default */ public function assign($spec, $value = null, $nocache = null, $scope = null) { diff --git a/engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/AttributeData.php b/engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/AttributeData.php index d306118d1cb..c44dab94111 100644 --- a/engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/AttributeData.php +++ b/engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/AttributeData.php @@ -24,6 +24,7 @@ use Shopware\Bundle\AttributeBundle\Service\ConfigurationStruct; use Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface; use Shopware\Bundle\AttributeBundle\Service\DataLoaderInterface; +use Shopware\Bundle\AttributeBundle\Service\DataPersisterInterface; class Shopware_Controllers_Backend_AttributeData extends Shopware_Controllers_Backend_ExtJs { @@ -58,8 +59,7 @@ public function loadDataAction() public function saveDataAction() { - /** @var \Shopware\Bundle\AttributeBundle\Service\DataPersisterInterface $dataPersister */ - $dataPersister = $this->get(\Shopware\Bundle\AttributeBundle\Service\DataPersisterInterface::class); + $dataPersister = $this->get(DataPersisterInterface::class); $data = []; foreach ($this->Request()->getParams() as $key => $value) { diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/AnalyzedCustomer.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/AnalyzedCustomer.php index d6b5a98cde4..c9d65792da5 100644 --- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/AnalyzedCustomer.php +++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/AnalyzedCustomer.php @@ -46,7 +46,7 @@ public static function createFromCustomer(Customer $customer) } /** - * @return \Shopware\Bundle\CustomerSearchBundleDBAL\Indexing\CustomerOrder + * @return CustomerOrder */ public function getOrderInformation() { diff --git a/engine/Shopware/Bundle/MediaBundle/Commands/MediaOptimizeCommand.php b/engine/Shopware/Bundle/MediaBundle/Commands/MediaOptimizeCommand.php index ef064d1ae5e..fe7ad873b3a 100644 --- a/engine/Shopware/Bundle/MediaBundle/Commands/MediaOptimizeCommand.php +++ b/engine/Shopware/Bundle/MediaBundle/Commands/MediaOptimizeCommand.php @@ -92,7 +92,7 @@ protected function configure() protected function execute(InputInterface $input, OutputInterface $output) { $optimizerService = $this->getContainer()->get('shopware_media.cdn_optimizer_service'); - $mediaService = $this->getContainer()->get(\Shopware\Bundle\MediaBundle\MediaServiceInterface::class); + $mediaService = $this->getContainer()->get(MediaServiceInterface::class); if ($input->getOption('modified')) { $errors = date_parse($input->getOption('modified'))['errors']; diff --git a/engine/Shopware/Bundle/MediaBundle/MediaServiceFactory.php b/engine/Shopware/Bundle/MediaBundle/MediaServiceFactory.php index 4a0368a70b1..3b35ef20aff 100644 --- a/engine/Shopware/Bundle/MediaBundle/MediaServiceFactory.php +++ b/engine/Shopware/Bundle/MediaBundle/MediaServiceFactory.php @@ -30,6 +30,7 @@ use League\Flysystem\AdapterInterface; use League\Flysystem\Filesystem; use Shopware\Bundle\MediaBundle\Adapters\AdapterFactoryInterface; +use Shopware\Bundle\MediaBundle\Strategy\StrategyFactory; use Symfony\Component\DependencyInjection\ContainerInterface; class MediaServiceFactory @@ -77,7 +78,7 @@ public function factory($backendName) $filesystem = new Filesystem($adapter, ['visibility' => AdapterInterface::VISIBILITY_PUBLIC]); // Strategy - $strategyFactory = $this->container->get(\Shopware\Bundle\MediaBundle\Strategy\StrategyFactory::class); + $strategyFactory = $this->container->get(StrategyFactory::class); $strategyName = isset($config['strategy']) ? $config['strategy'] : $this->cdnConfig['strategy']; $strategy = $strategyFactory->factory($strategyName); diff --git a/engine/Shopware/Bundle/SearchBundle/FacetResult/CategoryTreeFacetResultBuilder.php b/engine/Shopware/Bundle/SearchBundle/FacetResult/CategoryTreeFacetResultBuilder.php index 6eb22e49080..13e96711ab2 100644 --- a/engine/Shopware/Bundle/SearchBundle/FacetResult/CategoryTreeFacetResultBuilder.php +++ b/engine/Shopware/Bundle/SearchBundle/FacetResult/CategoryTreeFacetResultBuilder.php @@ -118,7 +118,7 @@ private function getCategoriesOfParent(array $categories, int $parentId): array * @param Category[] $categories * @param int[] $actives * - * @return \Shopware\Bundle\SearchBundle\FacetResult\TreeItem + * @return TreeItem */ private function createTreeItem(array $categories, Category $category, array $actives = []) { diff --git a/engine/Shopware/Bundle/SearchBundle/StoreFrontCriteriaFactory.php b/engine/Shopware/Bundle/SearchBundle/StoreFrontCriteriaFactory.php index 35b47927498..4036f66bdc1 100644 --- a/engine/Shopware/Bundle/SearchBundle/StoreFrontCriteriaFactory.php +++ b/engine/Shopware/Bundle/SearchBundle/StoreFrontCriteriaFactory.php @@ -189,7 +189,7 @@ public function createAjaxCountCriteria(Request $request, ShopContextInterface $ /** * @param int $categoryId * - * @return \Shopware\Bundle\SearchBundle\Criteria + * @return Criteria */ public function createProductNavigationCriteria( Request $request, diff --git a/engine/Shopware/Bundle/SearchBundle/StoreFrontCriteriaFactoryInterface.php b/engine/Shopware/Bundle/SearchBundle/StoreFrontCriteriaFactoryInterface.php index fcbe2f99fc9..1a49468c2b2 100644 --- a/engine/Shopware/Bundle/SearchBundle/StoreFrontCriteriaFactoryInterface.php +++ b/engine/Shopware/Bundle/SearchBundle/StoreFrontCriteriaFactoryInterface.php @@ -63,7 +63,7 @@ public function createAjaxCountCriteria(Request $request, ShopContextInterface $ /** * @param int $categoryId * - * @return \Shopware\Bundle\SearchBundle\Criteria + * @return Criteria */ public function createProductNavigationCriteria(Request $request, ShopContextInterface $context, $categoryId); } diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/KeywordFinder.php b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/KeywordFinder.php index 1d2a50af0d5..cec5ed2b233 100644 --- a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/KeywordFinder.php +++ b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/KeywordFinder.php @@ -42,7 +42,7 @@ class KeywordFinder implements KeywordFinderInterface private $config; /** - * @var \Doctrine\DBAL\Connection + * @var Connection */ private $connection; diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CategoryGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CategoryGatewayInterface.php index 655096a35ba..7be6012eeda 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CategoryGatewayInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CategoryGatewayInterface.php @@ -33,7 +33,7 @@ interface CategoryGatewayInterface * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Gateway\CategoryGatewayInterface::get() + * @see CategoryGatewayInterface::get() * * @param array $ids * diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CheapestPriceGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CheapestPriceGatewayInterface.php index b8aaec21c7a..8ff1c63e2a5 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CheapestPriceGatewayInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CheapestPriceGatewayInterface.php @@ -34,7 +34,7 @@ interface CheapestPriceGatewayInterface * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Gateway\CheapestPriceGatewayInterface::get() + * @see CheapestPriceGatewayInterface::get() * * @param BaseProduct[] $products * diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CountryGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CountryGatewayInterface.php index 1dd09c48b86..0bab1725a6e 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CountryGatewayInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CountryGatewayInterface.php @@ -44,7 +44,7 @@ public function getArea($id, ShopContextInterface $context); * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Gateway\CountryGatewayInterface::getState() + * @see CountryGatewayInterface::getState() * * @param int[] $ids * @@ -56,7 +56,7 @@ public function getStates(array $ids, ShopContextInterface $context); * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Gateway\CountryGatewayInterface::getCountry() + * @see CountryGatewayInterface::getCountry() * * @param int[] $ids * @@ -68,7 +68,7 @@ public function getCountries(array $ids, ShopContextInterface $context); * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Gateway\CountryGatewayInterface::getArea() + * @see CountryGatewayInterface::getArea() * * @param int[] $ids * diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CustomerGroupGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CustomerGroupGatewayInterface.php index d8f68d70d09..2684f68af7d 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CustomerGroupGatewayInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CustomerGroupGatewayInterface.php @@ -31,7 +31,7 @@ interface CustomerGroupGatewayInterface * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Gateway\CustomerGroupGatewayInterface::get() + * @see CustomerGroupGatewayInterface::get() * * @param array $keys * diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DownloadGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DownloadGatewayInterface.php index a6fbf4b66bf..3be84861936 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DownloadGatewayInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DownloadGatewayInterface.php @@ -33,7 +33,7 @@ interface DownloadGatewayInterface * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Gateway\DownloadGatewayInterface::get() + * @see DownloadGatewayInterface::get() * * @param BaseProduct[] $products * diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/GraduatedPricesGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/GraduatedPricesGatewayInterface.php index db40ea45b2c..96ad29539e3 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/GraduatedPricesGatewayInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/GraduatedPricesGatewayInterface.php @@ -34,7 +34,7 @@ interface GraduatedPricesGatewayInterface * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Gateway\GraduatedPricesGatewayInterface::get() + * @see GraduatedPricesGatewayInterface::get() * * @param ListProduct[] $products * diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/LinkGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/LinkGatewayInterface.php index 1d0d104a5bf..810026bdb1f 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/LinkGatewayInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/LinkGatewayInterface.php @@ -33,7 +33,7 @@ interface LinkGatewayInterface * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Gateway\LinkGatewayInterface::get() + * @see LinkGatewayInterface::get() * * @param BaseProduct[] $products * diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ListProductGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ListProductGatewayInterface.php index 4a1a1c9c6f8..ef906387b26 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ListProductGatewayInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ListProductGatewayInterface.php @@ -32,7 +32,7 @@ interface ListProductGatewayInterface * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Gateway\ListProductGatewayInterface::get() + * @see ListProductGatewayInterface::get() * * @param array $numbers * diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ManufacturerGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ManufacturerGatewayInterface.php index 6ccf348fa48..b68747fb466 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ManufacturerGatewayInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ManufacturerGatewayInterface.php @@ -32,7 +32,7 @@ interface ManufacturerGatewayInterface * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Gateway\ManufacturerGatewayInterface::get() + * @see ManufacturerGatewayInterface::get() * * @param array $ids * diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/MediaGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/MediaGatewayInterface.php index c6c9c767efb..c9af1162db3 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/MediaGatewayInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/MediaGatewayInterface.php @@ -32,7 +32,7 @@ interface MediaGatewayInterface * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Gateway\ProductMediaGatewayInterface::get() + * @see ProductMediaGatewayInterface::get() * * @param array $ids * @@ -44,7 +44,7 @@ public function getList($ids, ShopContextInterface $context); * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Gateway\ProductMediaGatewayInterface::get() + * @see ProductMediaGatewayInterface::get() * * @param int $id * diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductConfigurationGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductConfigurationGatewayInterface.php index 7196f7f46a3..f07104d8d06 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductConfigurationGatewayInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductConfigurationGatewayInterface.php @@ -33,7 +33,7 @@ interface ProductConfigurationGatewayInterface * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Gateway\ProductConfigurationGatewayInterface::get() + * @see ProductConfigurationGatewayInterface::get() * * @param BaseProduct[] $products * diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductMediaGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductMediaGatewayInterface.php index 69fc94edf30..77448849201 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductMediaGatewayInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductMediaGatewayInterface.php @@ -33,7 +33,7 @@ interface ProductMediaGatewayInterface * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Gateway\ProductMediaGatewayInterface::get() + * @see ProductMediaGatewayInterface::get() * * The passed $products array contains in some cases two variations of the same product. * For example: @@ -102,7 +102,7 @@ public function get(BaseProduct $product, ShopContextInterface $context); * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Gateway\ProductMediaGatewayInterface::getCover() + * @see ProductMediaGatewayInterface::getCover() * * The passed $products array contains in some case two variations of the same product. * For example: diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductPropertyGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductPropertyGatewayInterface.php index 9ec3e4ee04e..b2d97c9b43f 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductPropertyGatewayInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductPropertyGatewayInterface.php @@ -33,7 +33,7 @@ interface ProductPropertyGatewayInterface * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Gateway\ProductPropertyGatewayInterface::get() + * @see ProductPropertyGatewayInterface::get() * * @param BaseProduct[] $products * diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VariantCheapestPriceGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VariantCheapestPriceGatewayInterface.php index bb83380fb09..b4b5010ebfe 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VariantCheapestPriceGatewayInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VariantCheapestPriceGatewayInterface.php @@ -35,7 +35,7 @@ interface VariantCheapestPriceGatewayInterface * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Gateway\VariantCheapestPriceGatewayInterface::get() + * @see VariantCheapestPriceGatewayInterface::get() * * @param BaseProduct[] $products * diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VariantMediaGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VariantMediaGatewayInterface.php index b92bd7b6a26..d4562b95dac 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VariantMediaGatewayInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VariantMediaGatewayInterface.php @@ -33,7 +33,7 @@ interface VariantMediaGatewayInterface * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Gateway\VariantMediaGatewayInterface::get() + * @see VariantMediaGatewayInterface::get() * * The passed $products array contains in some case two variations of the same product. * For example: @@ -100,7 +100,7 @@ public function get(BaseProduct $product, ShopContextInterface $context); * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Gateway\VariantMediaGatewayInterface::getCover() + * @see VariantMediaGatewayInterface::getCover() * * The passed $products array contains in some case two variations of the same product. * For example: diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VoteAverageGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VoteAverageGatewayInterface.php index 6e104b25fe7..46b5ef491aa 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VoteAverageGatewayInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VoteAverageGatewayInterface.php @@ -33,7 +33,7 @@ interface VoteAverageGatewayInterface * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Gateway\VoteAverageGatewayInterface::get() + * @see VoteAverageGatewayInterface::get() * * @param BaseProduct[] $products * diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VoteGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VoteGatewayInterface.php index c92ea3dc28c..8aef18b2b3d 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VoteGatewayInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VoteGatewayInterface.php @@ -33,7 +33,7 @@ interface VoteGatewayInterface * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Gateway\VoteGatewayInterface::get() + * @see VoteGatewayInterface::get() * * @param BaseProduct[] $products * diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/AdditionalTextServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/AdditionalTextServiceInterface.php index ef791a624a4..fc3767692f5 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Service/AdditionalTextServiceInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/AdditionalTextServiceInterface.php @@ -44,7 +44,7 @@ public function buildAdditionalText(ListProduct $product, ShopContextInterface $ /** * Determines the 'additional text' value for multiple ListProduct. * - * @see \Shopware\Bundle\StoreFrontBundle\Service\AdditionalTextServiceInterface::buildAdditionalText() + * @see AdditionalTextServiceInterface::buildAdditionalText() * * @param array $products * diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/CheapestPriceServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/CheapestPriceServiceInterface.php index 2c867fe911d..cc0813ce01a 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Service/CheapestPriceServiceInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/CheapestPriceServiceInterface.php @@ -31,7 +31,7 @@ interface CheapestPriceServiceInterface { /** - * @see \Shopware\Bundle\StoreFrontBundle\Service\Core\CheapestPriceServiceInterface::get() + * @see Core\CheapestPriceServiceInterface::get * @deprecated 5.7, interface will require a ShopContextInterface in 5.8 * * @param ListProduct[] $products diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/GraduatedPricesServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/GraduatedPricesServiceInterface.php index 68988d0712c..b649d979d27 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Service/GraduatedPricesServiceInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/GraduatedPricesServiceInterface.php @@ -31,7 +31,7 @@ interface GraduatedPricesServiceInterface { /** - * @see \Shopware\Bundle\StoreFrontBundle\Service\Core\GraduatedPricesServiceInterface::get() + * @see Core\GraduatedPricesServiceInterface::get() * @deprecated 5.7, interface will require a ShopContextInterface in 5.8 * * @param ListProduct[] $products diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/ListProductServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/ListProductServiceInterface.php index aee6eb2c4a1..93580457ac9 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Service/ListProductServiceInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/ListProductServiceInterface.php @@ -34,7 +34,7 @@ interface ListProductServiceInterface * please refer to the linked classes. * * @deprecated 5.7, interface will require a ShopContextInterface in 5.8 - * @see \Shopware\Bundle\StoreFrontBundle\Service\ListProductServiceInterface::get() + * @see ListProductServiceInterface::get() * * @param array $numbers * diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/MediaServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/MediaServiceInterface.php index c766db68c33..14cfd719c9b 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Service/MediaServiceInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/MediaServiceInterface.php @@ -54,7 +54,7 @@ public function get($id, ShopContextInterface $context); public function getList($ids, ShopContextInterface $context); /** - * @see \Shopware\Bundle\StoreFrontBundle\Service\MediaServiceInterface::getProductMedia() + * @see MediaServiceInterface::getProductMedia() * * @param BaseProduct[] $products * @@ -80,7 +80,7 @@ public function getProductsMedia($products, ShopContextInterface $context); public function getCover(BaseProduct $product, ShopContextInterface $context); /** - * @see \Shopware\Bundle\StoreFrontBundle\Service\MediaServiceInterface::getCover() + * @see MediaServiceInterface::getCover() * * @param BaseProduct[] $products * diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductDownloadServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductDownloadServiceInterface.php index 91aeb70a082..8aa289c69bb 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductDownloadServiceInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductDownloadServiceInterface.php @@ -33,7 +33,7 @@ interface ProductDownloadServiceInterface * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Service\ProductDownloadServiceInterface::get() + * @see ProductDownloadServiceInterface::get() * * @param BaseProduct[] $products * diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductLinkServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductLinkServiceInterface.php index 2d417f8a03d..5fadc7a2b41 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductLinkServiceInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductLinkServiceInterface.php @@ -33,7 +33,7 @@ interface ProductLinkServiceInterface * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Service\ProductLinkServiceInterface::get() + * @see ProductLinkServiceInterface::get() * * @param BaseProduct[] $products * diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductServiceInterface.php index 675168bd068..0b43cdc6a74 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductServiceInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductServiceInterface.php @@ -30,7 +30,7 @@ interface ProductServiceInterface extends ListProductServiceInterface { /** - * @see \Shopware\Bundle\StoreFrontBundle\Service\ProductServiceInterface::get() + * @see ProductServiceInterface::get() * @deprecated 5.7, interface will require a ShopContextInterface in 5.8 * * @param string[] $numbers diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/PropertyServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/PropertyServiceInterface.php index cfdd08bb4d6..9178fc31574 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Service/PropertyServiceInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/PropertyServiceInterface.php @@ -33,7 +33,7 @@ interface PropertyServiceInterface * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Service\PropertyServiceInterface::get() + * @see PropertyServiceInterface::get() * * @param BaseProduct[] $products * diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/RelatedProductStreamsServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/RelatedProductStreamsServiceInterface.php index 1a8786581bb..2b6598f4191 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Service/RelatedProductStreamsServiceInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/RelatedProductStreamsServiceInterface.php @@ -30,7 +30,7 @@ interface RelatedProductStreamsServiceInterface { /** - * @see \Shopware\Bundle\StoreFrontBundle\Service\RelatedProductStreamsServiceInterface::get() + * @see RelatedProductStreamsServiceInterface::get() * * @param BaseProduct[] $products * diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/RelatedProductsServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/RelatedProductsServiceInterface.php index cc7732b3a09..fbcf51ade85 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Service/RelatedProductsServiceInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/RelatedProductsServiceInterface.php @@ -31,7 +31,7 @@ interface RelatedProductsServiceInterface { /** - * @see \Shopware\Bundle\StoreFrontBundle\Service\RelatedProductsServiceInterface::get() + * @see RelatedProductsServiceInterface::get() * @deprecated 5.7, interface will require a ShopContextInterface in 5.8 * * @param BaseProduct[] $products @@ -50,7 +50,7 @@ public function getList($products, ProductContextInterface $context); * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Service\ListProductServiceInterface::get() + * @see ListProductServiceInterface::get() * @deprecated 5.7, interface will require a ShopContextInterface in 5.8 * * @return array|null indexed by the product order number diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/SimilarProductsServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/SimilarProductsServiceInterface.php index 9d35606b23f..94f28530564 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Service/SimilarProductsServiceInterface.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/SimilarProductsServiceInterface.php @@ -29,7 +29,7 @@ interface SimilarProductsServiceInterface { /** - * @see \Shopware\Bundle\StoreFrontBundle\Service\SimilarProductsServiceInterface::get() + * @see SimilarProductsServiceInterface::get() * @deprecated 5.7, interface will require a ShopContextInterface in 5.8 * * @param ListProduct[] $products @@ -51,7 +51,7 @@ public function getList($products, ProductContextInterface $context); * To get detailed information about the selection conditions, structure and content of the returned object, * please refer to the linked classes. * - * @see \Shopware\Bundle\StoreFrontBundle\Service\ListProductServiceInterface::get() + * @see ListProductServiceInterface::get() * @deprecated 5.7, interface will require a ShopContextInterface in 5.8 * * @return array|null indexed by the product order number diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Category.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Category.php index d09186ebdb6..ef70041f326 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Category.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Category.php @@ -359,7 +359,7 @@ public function setBlog($blog) } /** - * @param \Shopware\Bundle\StoreFrontBundle\Struct\Media $media + * @param Media $media */ public function setMedia($media) { @@ -367,7 +367,7 @@ public function setMedia($media) } /** - * @return \Shopware\Bundle\StoreFrontBundle\Struct\Media|null + * @return Media|null */ public function getMedia() { diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Option.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Option.php index 708772b6c7b..2033075017f 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Option.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Option.php @@ -110,7 +110,7 @@ public function getMedia() } /** - * @param \Shopware\Bundle\StoreFrontBundle\Struct\Media $media + * @param Media $media */ public function setMedia($media) { diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Set.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Set.php index 13c6c74ec38..ad7aa0563a0 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Set.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Set.php @@ -96,7 +96,7 @@ public function getType() } /** - * @return \Shopware\Bundle\StoreFrontBundle\Struct\Configurator\Group[] + * @return Group[] */ public function getGroups() { @@ -104,7 +104,7 @@ public function getGroups() } /** - * @param \Shopware\Bundle\StoreFrontBundle\Struct\Configurator\Group[] $groups + * @param Group[] $groups */ public function setGroups($groups) { diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/PriceDiscount.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/PriceDiscount.php index d67aefdf00a..127f90d2e25 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/PriceDiscount.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/PriceDiscount.php @@ -65,7 +65,7 @@ public function getId() } /** - * @param \Shopware\Bundle\StoreFrontBundle\Struct\Customer\Group $customerGroup + * @param Group $customerGroup */ public function setCustomerGroup($customerGroup) { @@ -73,7 +73,7 @@ public function setCustomerGroup($customerGroup) } /** - * @return \Shopware\Bundle\StoreFrontBundle\Struct\Customer\Group + * @return Group */ public function getCustomerGroup() { diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Property/Set.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Property/Set.php index 0f9c24bc043..efe067d68d8 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Property/Set.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Property/Set.php @@ -108,7 +108,7 @@ public function getName() } /** - * @param \Shopware\Bundle\StoreFrontBundle\Struct\Property\Group[] $groups + * @param Group[] $groups * * @return $this */ @@ -120,7 +120,7 @@ public function setGroups($groups) } /** - * @return \Shopware\Bundle\StoreFrontBundle\Struct\Property\Group[] + * @return Group[] */ public function getGroups() { diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Shop.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Shop.php index bd521feb672..043afcf3a93 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Shop.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Shop.php @@ -276,7 +276,7 @@ public function getHost() } /** - * @return \Shopware\Bundle\StoreFrontBundle\Struct\Category + * @return Category */ public function getCategory() { @@ -284,7 +284,7 @@ public function getCategory() } /** - * @param \Shopware\Bundle\StoreFrontBundle\Struct\Category $category + * @param Category $category */ public function setCategory($category) { diff --git a/engine/Shopware/Commands/PluginRefreshCommand.php b/engine/Shopware/Commands/PluginRefreshCommand.php index e4f81f2bd71..af84ef45e2e 100644 --- a/engine/Shopware/Commands/PluginRefreshCommand.php +++ b/engine/Shopware/Commands/PluginRefreshCommand.php @@ -45,8 +45,7 @@ protected function configure() */ protected function execute(InputInterface $input, OutputInterface $output) { - /** @var InstallerService $pluginManager */ - $pluginManager = $this->container->get(\Shopware\Bundle\PluginInstallerBundle\Service\InstallerService::class); + $pluginManager = $this->container->get(InstallerService::class); $pluginManager->refreshPluginList(); $output->writeln(sprintf('Successfully refreshed')); diff --git a/engine/Shopware/Commands/PluginReinstallCommand.php b/engine/Shopware/Commands/PluginReinstallCommand.php index 289f50768ad..81cde24f901 100644 --- a/engine/Shopware/Commands/PluginReinstallCommand.php +++ b/engine/Shopware/Commands/PluginReinstallCommand.php @@ -89,8 +89,7 @@ protected function configure() */ protected function execute(InputInterface $input, OutputInterface $output) { - /** @var InstallerService $pluginManager */ - $pluginManager = $this->container->get(\Shopware\Bundle\PluginInstallerBundle\Service\InstallerService::class); + $pluginManager = $this->container->get(InstallerService::class); if (!$input->getOption('no-refresh')) { $pluginManager->refreshPluginList(); $output->writeln('Successfully refreshed'); diff --git a/engine/Shopware/Commands/SettingsLabelsFindMissingCommand.php b/engine/Shopware/Commands/SettingsLabelsFindMissingCommand.php index 374f5710f86..2cdb8d4a99c 100644 --- a/engine/Shopware/Commands/SettingsLabelsFindMissingCommand.php +++ b/engine/Shopware/Commands/SettingsLabelsFindMissingCommand.php @@ -25,6 +25,7 @@ use Exception; use RuntimeException; +use Shopware\Components\Model\ModelManager; use Shopware\Models\Shop\Locale; use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface; use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext; @@ -106,8 +107,8 @@ protected function execute(InputInterface $input, OutputInterface $output) } /** @var Locale|null $locale */ - $locale = $this->container->get(\Shopware\Components\Model\ModelManager::class) - ->getRepository(\Shopware\Models\Shop\Locale::class) + $locale = $this->container->get(ModelManager::class) + ->getRepository(Locale::class) ->findOneByLocale($input->getArgument('locale')); if (!$locale) { $output->writeln('Provided locale not found'); @@ -125,14 +126,14 @@ protected function execute(InputInterface $input, OutputInterface $output) /** * Exports form labels from the database into a php file containing an array * - * @param \Shopware\Models\Shop\Locale $locale - * @param string $dir + * @param Locale $locale + * @param string $dir * * @throws Exception */ protected function exportFormLabels(OutputInterface $output, $locale, $dir) { - $formQueryBuilder = $this->container->get(\Shopware\Components\Model\ModelManager::class)->getDBALQueryBuilder(); + $formQueryBuilder = $this->container->get(ModelManager::class)->getDBALQueryBuilder(); $statement = $formQueryBuilder ->select('form.name AS name', 'form.label AS label', 'form.description AS description') ->from('s_core_config_forms', 'form') @@ -169,7 +170,7 @@ protected function exportFormLabels(OutputInterface $output, $locale, $dir) */ protected function exportElementLabels(OutputInterface $output, $locale, $dir) { - $elementsQueryBuilder = $this->container->get(\Shopware\Components\Model\ModelManager::class)->getDBALQueryBuilder(); + $elementsQueryBuilder = $this->container->get(ModelManager::class)->getDBALQueryBuilder(); $statement = $elementsQueryBuilder ->select('form.name AS formName', 'elem.name AS elementName', 'elem.label AS label') ->from('s_core_config_forms', 'form') diff --git a/engine/Shopware/Commands/ThemeInitializeCommand.php b/engine/Shopware/Commands/ThemeInitializeCommand.php index 410c7316640..2f520088f00 100644 --- a/engine/Shopware/Commands/ThemeInitializeCommand.php +++ b/engine/Shopware/Commands/ThemeInitializeCommand.php @@ -23,6 +23,7 @@ namespace Shopware\Commands; +use Doctrine\DBAL\Connection; use RuntimeException; use Shopware\Components\Theme\Installer; use Symfony\Component\Console\Input\InputInterface; @@ -31,7 +32,7 @@ class ThemeInitializeCommand extends ShopwareCommand { /** - * @var \Doctrine\DBAL\Connection + * @var Connection */ private $conn; @@ -50,11 +51,10 @@ protected function configure() */ protected function execute(InputInterface $input, OutputInterface $output) { - /** @var Installer $themeInstaller */ - $themeInstaller = $this->container->get(\Shopware\Components\Theme\Installer::class); + $themeInstaller = $this->container->get(Installer::class); $themeInstaller->synchronize(); - $this->conn = $this->container->get(\Doctrine\DBAL\Connection::class); + $this->conn = $this->container->get(Connection::class); $templateId = $this->getResponsiveTemplateId(); $this->updateDefaultTemplateId($templateId); diff --git a/engine/Shopware/Components/Api/Resource/EmotionPreset.php b/engine/Shopware/Components/Api/Resource/EmotionPreset.php index d1780e87d05..ca6b6118d2c 100644 --- a/engine/Shopware/Components/Api/Resource/EmotionPreset.php +++ b/engine/Shopware/Components/Api/Resource/EmotionPreset.php @@ -126,7 +126,7 @@ public function create(array $data, $locale = 'de_DE') * @param int $id * @param string $locale * - * @throws \Shopware\Components\Api\Exception\NotFoundException + * @throws NotFoundException * * @return Preset */ diff --git a/engine/Shopware/Components/Auth.php b/engine/Shopware/Components/Auth.php index f96f581597c..189fce845a0 100644 --- a/engine/Shopware/Components/Auth.php +++ b/engine/Shopware/Components/Auth.php @@ -36,7 +36,7 @@ class Shopware_Components_Auth extends Enlight_Components_Auth /** * Adapter that is current active - has a valid user session * - * @var \Zend_Auth_Adapter_Interface + * @var Zend_Auth_Adapter_Interface */ protected $_baseAdapter; // Current active adapter @@ -99,9 +99,9 @@ public function login($username, $password) /** * Set current active adapter * - * @param \Zend_Auth_Adapter_Interface|null $adapter + * @param Zend_Auth_Adapter_Interface|null $adapter * - * @return \Shopware_Components_Auth + * @return Shopware_Components_Auth */ public function setBaseAdapter($adapter) { @@ -113,7 +113,7 @@ public function setBaseAdapter($adapter) /** * Get current active adapter * - * @return \Zend_Auth_Adapter_Interface + * @return Zend_Auth_Adapter_Interface */ public function getBaseAdapter() { @@ -164,7 +164,7 @@ public static function getInstance() self::$_instance = new self(); } - /** @var \Shopware_Components_Auth $return */ + /** @var Shopware_Components_Auth $return */ $return = self::$_instance; return $return; diff --git a/engine/Shopware/Components/CacheSubscriber.php b/engine/Shopware/Components/CacheSubscriber.php index 55b0b80dd6a..d99eab8d3ec 100644 --- a/engine/Shopware/Components/CacheSubscriber.php +++ b/engine/Shopware/Components/CacheSubscriber.php @@ -59,7 +59,7 @@ public static function getSubscribedEvents(): array public function onConfigElement(Enlight_Event_EventArgs $args): void { - /** @var \Shopware\Models\Config\Value $entity */ + /** @var Value $entity */ $entity = $args->get('entity'); $this->addTagsConfigValue($entity); diff --git a/engine/Shopware/Components/Cart/BasketQueryHelperInterface.php b/engine/Shopware/Components/Cart/BasketQueryHelperInterface.php index 12a83c62bbc..be84da056ac 100644 --- a/engine/Shopware/Components/Cart/BasketQueryHelperInterface.php +++ b/engine/Shopware/Components/Cart/BasketQueryHelperInterface.php @@ -45,7 +45,7 @@ public function getPositionPricesQuery(DiscountContext $discountContext); public function getInsertDiscountQuery(DiscountContext $discountContext); /** - * @return \Doctrine\DBAL\Query\QueryBuilder + * @return QueryBuilder */ public function getInsertDiscountAttributeQuery(DiscountContext $discountContext); diff --git a/engine/Shopware/Components/CsvIterator.php b/engine/Shopware/Components/CsvIterator.php index 8a75dba2309..5c8144f0cc3 100644 --- a/engine/Shopware/Components/CsvIterator.php +++ b/engine/Shopware/Components/CsvIterator.php @@ -214,7 +214,7 @@ public function valid() /** * Helper function to determine the newline type of the file * - * @throws \Exception + * @throws Exception * * @return string Detected new line type */ diff --git a/engine/Shopware/Components/DependencyInjection/Bridge/Router.php b/engine/Shopware/Components/DependencyInjection/Bridge/Router.php index 3712de53154..fe0eeafb9e1 100644 --- a/engine/Shopware/Components/DependencyInjection/Bridge/Router.php +++ b/engine/Shopware/Components/DependencyInjection/Bridge/Router.php @@ -27,7 +27,6 @@ use Enlight_Controller_Front; use Enlight_Event_EventArgs; use Enlight_Event_EventManager as EnlightEventManager; -use Shopware\Components\DependencyInjection\Container; use Shopware\Components\Routing\Context; use Shopware\Components\Routing\Router as RoutingRouter; use Shopware\Components\Routing\RouterInterface; @@ -71,13 +70,9 @@ public function factory( public function onAfterRegisterShop(Enlight_Event_EventArgs $args) { - /** @var Container $container */ $container = $args->getSubject(); - /** @var RouterInterface $router */ - $router = $container->get(\Shopware\Components\Routing\RouterInterface::class); - /** @var \Shopware\Models\Shop\Shop $shop */ + $router = $container->get(RouterInterface::class); $shop = $container->get('shop'); - /** @var Shopware_Components_Config $config */ $config = $container->get(Shopware_Components_Config::class); // Register the shop (we're too soon) $config->setShop($shop); diff --git a/engine/Shopware/Components/Document.php b/engine/Shopware/Components/Document.php index fa55b770167..4cb864400f0 100644 --- a/engine/Shopware/Components/Document.php +++ b/engine/Shopware/Components/Document.php @@ -36,6 +36,7 @@ use Shopware\Models\Shop\Currency; use Shopware\Models\Shop\Shop; use Shopware\Models\Shop\Template; +use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException as SymfonyInvalidArgumentException; /** * Shopware document generator @@ -261,7 +262,7 @@ public static function initDocument($orderID, $documentID, array $config = []) * @param string $_renderer optional define renderer (pdf,html,return) * * @throws Enlight_Event_Exception - * @throws \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException + * @throws SymfonyInvalidArgumentException */ public function render($_renderer = '') { diff --git a/engine/Shopware/Components/Model/Configuration.php b/engine/Shopware/Components/Model/Configuration.php index 0be3773199c..0f42eb22f07 100644 --- a/engine/Shopware/Components/Model/Configuration.php +++ b/engine/Shopware/Components/Model/Configuration.php @@ -31,8 +31,10 @@ use Doctrine\Common\Cache\RedisCache; use Doctrine\Common\Cache\XcacheCache; use Doctrine\Common\Proxy\AbstractProxyFactory; +use Doctrine\DBAL\DBALException; use Doctrine\DBAL\Types\Type; use Doctrine\ORM\Configuration as BaseConfiguration; +use Doctrine\ORM\ORMException; use Doctrine\ORM\Repository\RepositoryFactory; use DoctrineExtensions\Query\Mysql\DateFormat; use DoctrineExtensions\Query\Mysql\GroupConcat; @@ -44,6 +46,9 @@ use Redis; use RuntimeException; use Shopware\Components\CacheManager; +use Shopware\Components\Model\DBAL\Types\AllowInvalidArrayType; +use Shopware\Components\Model\DBAL\Types\DateStringType; +use Shopware\Components\Model\DBAL\Types\DateTimeStringType; use Shopware\Components\ShopwareReleaseStruct; use Zend_Cache_Core; @@ -71,8 +76,8 @@ class Configuration extends BaseConfiguration /** * @throws Exception * @throws RuntimeException - * @throws \Doctrine\ORM\ORMException - * @throws \Doctrine\DBAL\DBALException + * @throws ORMException + * @throws DBALException */ public function __construct(array $options, Zend_Cache_Core $cache, RepositoryFactory $repositoryFactory, ShopwareReleaseStruct $release) { @@ -88,9 +93,9 @@ public function __construct(array $options, Zend_Cache_Core $cache, RepositoryFa $this->setAttributeDir($options['attributeDir']); - Type::overrideType('datetime', \Shopware\Components\Model\DBAL\Types\DateTimeStringType::class); - Type::overrideType('date', \Shopware\Components\Model\DBAL\Types\DateStringType::class); - Type::overrideType('array', \Shopware\Components\Model\DBAL\Types\AllowInvalidArrayType::class); + Type::overrideType('datetime', DateTimeStringType::class); + Type::overrideType('date', DateStringType::class); + Type::overrideType('array', AllowInvalidArrayType::class); $this->addCustomStringFunction('DATE_FORMAT', DateFormat::class); $this->addCustomStringFunction('IFNULL', IfNull::class); diff --git a/engine/Shopware/Components/Modules.php b/engine/Shopware/Components/Modules.php index 73fd601f111..2d061116623 100644 --- a/engine/Shopware/Components/Modules.php +++ b/engine/Shopware/Components/Modules.php @@ -26,7 +26,7 @@ class Shopware_Components_Modules extends Enlight_Class implements ArrayAccess { /** - * @var \sSystem + * @var sSystem */ protected $system; @@ -49,7 +49,7 @@ public function __call($name, $value = null) /** * Set class property * - * @param \sSystem $system + * @param sSystem $system * * @return void */ @@ -166,7 +166,7 @@ public function Marketing() } /** - * @return \sSystem + * @return sSystem */ public function System() { diff --git a/engine/Shopware/Components/MultiEdit/Resource/Product/Queue.php b/engine/Shopware/Components/MultiEdit/Resource/Product/Queue.php index 732e6ab6ad7..f2b8049527c 100644 --- a/engine/Shopware/Components/MultiEdit/Resource/Product/Queue.php +++ b/engine/Shopware/Components/MultiEdit/Resource/Product/Queue.php @@ -182,7 +182,7 @@ public function create($filterArray, $operations, $offset, $limit, $queueId) } /** @var Detail $detail */ - $detail = $entityManager->getReference(\Shopware\Models\Article\Detail::class, $detailId); + $detail = $entityManager->getReference(Detail::class, $detailId); $model = new QueueArticle(); $model->setQueue($queue); diff --git a/engine/Shopware/Components/Plugin/Namespace.php b/engine/Shopware/Components/Plugin/Namespace.php index f0a428ffdd7..0e26b0d23c5 100644 --- a/engine/Shopware/Components/Plugin/Namespace.php +++ b/engine/Shopware/Components/Plugin/Namespace.php @@ -22,6 +22,8 @@ */ use Doctrine\DBAL\Connection; +use Doctrine\ORM\OptimisticLockException; +use Doctrine\ORM\ORMInvalidArgumentException; use Shopware\Components\Plugin\Configuration\ReaderInterface as ConfigurationReader; use Shopware\Components\Snippet\DatabaseHandler; use Shopware\Models\Plugin\Plugin; @@ -436,10 +438,10 @@ public function uninstallPlugin(Shopware_Components_Plugin_Bootstrap $bootstrap, /** * Registers a plugin in the collection. * - * @throws \Enlight_Config_Exception - * @throws \Enlight_Event_Exception - * @throws \Doctrine\ORM\OptimisticLockException - * @throws \Doctrine\ORM\ORMInvalidArgumentException + * @throws Enlight_Config_Exception + * @throws Enlight_Event_Exception + * @throws OptimisticLockException + * @throws ORMInvalidArgumentException * @throws Exception * * @return bool|array diff --git a/engine/Shopware/Components/ReflectionHelper.php b/engine/Shopware/Components/ReflectionHelper.php index a5bbb685012..43682ea35b6 100644 --- a/engine/Shopware/Components/ReflectionHelper.php +++ b/engine/Shopware/Components/ReflectionHelper.php @@ -41,7 +41,7 @@ class ReflectionHelper * @param string $docPath Optional document root parameter where the class should be found * @param array $directories an array of directories in which the class should be found * - * @see \Shopware\Components\ReflectionHelper::verifyClass() + * @see ReflectionHelper::verifyClass() * * @throws ReflectionException Class could not be found * @throws InvalidArgumentException diff --git a/engine/Shopware/Components/Routing/Context.php b/engine/Shopware/Components/Routing/Context.php index d312fb22650..6e4e0b7b969 100644 --- a/engine/Shopware/Components/Routing/Context.php +++ b/engine/Shopware/Components/Routing/Context.php @@ -32,7 +32,7 @@ /** * @see http://php.net/manual/en/reflectionclass.iscloneable.php * @see http://api.symfony.com/2.0/Symfony/Component/Routing/RequestContext.html - * @see \Enlight_Controller_Request_Request + * @see EnlightRequest */ class Context implements JsonSerializable { diff --git a/engine/Shopware/Components/SitemapXMLRepository.php b/engine/Shopware/Components/SitemapXMLRepository.php index 35a55079810..b0d0a64663f 100644 --- a/engine/Shopware/Components/SitemapXMLRepository.php +++ b/engine/Shopware/Components/SitemapXMLRepository.php @@ -204,7 +204,7 @@ private function readBlogUrls($parentId) { $blogs = []; - $categoryRepository = $this->em->getRepository(\Shopware\Models\Category\Category::class); + $categoryRepository = $this->em->getRepository(Category::class); $query = $categoryRepository->getBlogCategoriesByParentQuery($parentId); $blogCategories = $query->getArrayResult(); diff --git a/engine/Shopware/Components/StringCompiler.php b/engine/Shopware/Components/StringCompiler.php index 9661072d5fb..377e009a799 100644 --- a/engine/Shopware/Components/StringCompiler.php +++ b/engine/Shopware/Components/StringCompiler.php @@ -27,7 +27,7 @@ class Shopware_Components_StringCompiler { /** - * @var \Enlight_Template_Manager + * @var Enlight_Template_Manager */ protected $view; @@ -79,7 +79,7 @@ public function getContext() /** * Return View Object * - * @return \Enlight_Template_Manager + * @return Enlight_Template_Manager */ public function getView() { diff --git a/engine/Shopware/Components/TemplateMail.php b/engine/Shopware/Components/TemplateMail.php index ee2aaa2cca7..9959084023f 100644 --- a/engine/Shopware/Components/TemplateMail.php +++ b/engine/Shopware/Components/TemplateMail.php @@ -116,7 +116,7 @@ public function getShop() } /** - * @throws \Exception + * @throws Exception * * @return Shopware_Components_Translation */ diff --git a/engine/Shopware/Components/Translation.php b/engine/Shopware/Components/Translation.php index 1647b711ad3..6cb69ca4dd6 100644 --- a/engine/Shopware/Components/Translation.php +++ b/engine/Shopware/Components/Translation.php @@ -665,7 +665,7 @@ protected function getMapping($type) * @param int $articleId * @param string $data * - * @throws \Exception + * @throws Exception */ protected function fixArticleTranslation($languageId, $articleId, $data) { diff --git a/engine/Shopware/Controllers/Api/Caches.php b/engine/Shopware/Controllers/Api/Caches.php index 2925f31c719..8111a74af03 100644 --- a/engine/Shopware/Controllers/Api/Caches.php +++ b/engine/Shopware/Controllers/Api/Caches.php @@ -26,7 +26,7 @@ class Shopware_Controllers_Api_Caches extends Shopware_Controllers_Api_Rest { /** - * @var Shopware\Components\Api\Resource\Cache + * @var Cache */ protected $resource; diff --git a/engine/Shopware/Controllers/Api/CustomerGroups.php b/engine/Shopware/Controllers/Api/CustomerGroups.php index 43a8ae44fde..1ad3922ebb7 100644 --- a/engine/Shopware/Controllers/Api/CustomerGroups.php +++ b/engine/Shopware/Controllers/Api/CustomerGroups.php @@ -26,7 +26,7 @@ class Shopware_Controllers_Api_CustomerGroups extends Shopware_Controllers_Api_Rest { /** - * @var Shopware\Components\Api\Resource\CustomerGroup + * @var CustomerGroup */ protected $resource; diff --git a/engine/Shopware/Controllers/Api/Media.php b/engine/Shopware/Controllers/Api/Media.php index d6fe79b7203..2c351fc8395 100644 --- a/engine/Shopware/Controllers/Api/Media.php +++ b/engine/Shopware/Controllers/Api/Media.php @@ -27,7 +27,7 @@ class Shopware_Controllers_Api_Media extends Shopware_Controllers_Api_Rest { /** - * @var Shopware\Components\Api\Resource\Media + * @var Media */ protected $resource; diff --git a/engine/Shopware/Controllers/Api/Orders.php b/engine/Shopware/Controllers/Api/Orders.php index 27214467900..fe538b266e1 100644 --- a/engine/Shopware/Controllers/Api/Orders.php +++ b/engine/Shopware/Controllers/Api/Orders.php @@ -26,7 +26,7 @@ class Shopware_Controllers_Api_Orders extends Shopware_Controllers_Api_Rest { /** - * @var Shopware\Components\Api\Resource\Order + * @var Order */ protected $resource; diff --git a/engine/Shopware/Controllers/Api/Shops.php b/engine/Shopware/Controllers/Api/Shops.php index cf20870077c..3f597ad66fb 100644 --- a/engine/Shopware/Controllers/Api/Shops.php +++ b/engine/Shopware/Controllers/Api/Shops.php @@ -26,7 +26,7 @@ class Shopware_Controllers_Api_Shops extends Shopware_Controllers_Api_Rest { /** - * @var Shopware\Components\Api\Resource\Shop + * @var Shop */ protected $resource; diff --git a/engine/Shopware/Controllers/Backend/Blog.php b/engine/Shopware/Controllers/Backend/Blog.php index 1865bf082be..54533e8a3d3 100644 --- a/engine/Shopware/Controllers/Backend/Blog.php +++ b/engine/Shopware/Controllers/Backend/Blog.php @@ -75,7 +75,7 @@ class Shopware_Controllers_Backend_Blog extends Shopware_Controllers_Backend_Ext * * Helper Method to get access to the category repository. * - * @return Shopware\Models\Category\Repository + * @return CategoryRepository */ public function getCategoryRepository() { @@ -111,7 +111,7 @@ public function getArticleRepository() * * Helper Method to get access to the blog repository. * - * @return Shopware\Models\Blog\Repository + * @return BlogRepository */ public function getRepository() { diff --git a/engine/Shopware/Controllers/Backend/Category.php b/engine/Shopware/Controllers/Backend/Category.php index 904b6bcf6fe..36e9a11ba67 100644 --- a/engine/Shopware/Controllers/Backend/Category.php +++ b/engine/Shopware/Controllers/Backend/Category.php @@ -29,8 +29,10 @@ use Shopware\Components\Model\ModelManager; use Shopware\Models\Article\Article; use Shopware\Models\Category\Category; +use Shopware\Models\Category\Repository as CategoryRepository; use Shopware\Models\Customer\Customer; use Shopware\Models\Customer\Group; +use Shopware\Models\Customer\Repository as CustomerRepository; use Shopware\Models\Media\Media; use Shopware\Models\ProductStream\ProductStream; use Shopware_Components_Snippet_Manager as SnippetManager; @@ -43,12 +45,12 @@ class Shopware_Controllers_Backend_Category extends Shopware_Controllers_Backend_ExtJs { /** - * @var \Shopware\Models\Category\Repository + * @var CategoryRepository */ protected $repository; /** - * @var \Shopware\Models\Customer\Repository + * @var CustomerRepository */ protected $customerRepository; @@ -75,7 +77,7 @@ public function __construct(ModelManager $em, SnippetManager $translation) * * Helper Method to get access to the category repository. * - * @return Shopware\Models\Category\Repository + * @return CategoryRepository */ public function getRepository() { @@ -901,7 +903,7 @@ protected function addCategoryArticles($categoryId, $articleIds) protected function prepareMediaAssociatedData($data) { if (!empty($data['imagePath'])) { - $data['media'] = $this->get(\Shopware\Components\Model\ModelManager::class)->find(Media::class, $data['imagePath']); + $data['media'] = $this->get(ModelManager::class)->find(Media::class, $data['imagePath']); } else { $data['media'] = null; } @@ -912,7 +914,7 @@ protected function prepareMediaAssociatedData($data) /** * Helper Method to get access to the customer repository. * - * @return \Shopware\Models\Customer\Repository + * @return CustomerRepository */ private function getCustomerRepository() { diff --git a/engine/Shopware/Controllers/Backend/Login.php b/engine/Shopware/Controllers/Backend/Login.php index 6f89086e88e..517620a10d3 100644 --- a/engine/Shopware/Controllers/Backend/Login.php +++ b/engine/Shopware/Controllers/Backend/Login.php @@ -131,7 +131,7 @@ public function logoutAction() /** * @deprecated in 5.6, will be private in 5.8 * - * @return \Shopware_Plugins_Backend_Auth_Bootstrap + * @return Shopware_Plugins_Backend_Auth_Bootstrap */ public function getPlugin() { diff --git a/engine/Shopware/Controllers/Backend/PluginInstaller.php b/engine/Shopware/Controllers/Backend/PluginInstaller.php index 13efb944841..eb659cffd86 100644 --- a/engine/Shopware/Controllers/Backend/PluginInstaller.php +++ b/engine/Shopware/Controllers/Backend/PluginInstaller.php @@ -48,7 +48,7 @@ public function preDispatch() { parent::preDispatch(); - $this->pluginManager = $this->get(\Shopware\Bundle\PluginInstallerBundle\Service\InstallerService::class); + $this->pluginManager = $this->get(InstallerService::class); } public function installPluginAction() diff --git a/engine/Shopware/Controllers/Backend/ProductFeed.php b/engine/Shopware/Controllers/Backend/ProductFeed.php index 316b9470d9c..03ae120ae8e 100644 --- a/engine/Shopware/Controllers/Backend/ProductFeed.php +++ b/engine/Shopware/Controllers/Backend/ProductFeed.php @@ -23,9 +23,11 @@ use Doctrine\Common\Collections\ArrayCollection; use Shopware\Models\Article\Article; +use Shopware\Models\Article\Repository as ProductRepository; use Shopware\Models\Article\Supplier; use Shopware\Models\Category\Category; use Shopware\Models\ProductFeed\ProductFeed; +use Shopware\Models\Shop\Repository as ShopRepository; use Shopware\Models\Shop\Shop; /** @@ -38,12 +40,12 @@ class Shopware_Controllers_Backend_ProductFeed extends Shopware_Controllers_Backend_ExtJs { /** - * @var \Shopware\Models\Article\Repository + * @var ProductRepository */ protected $articleRepository; /** - * @var \Shopware\Models\Shop\Repository + * @var ShopRepository */ protected $shopRepository; @@ -287,7 +289,7 @@ protected function initAcl() /** * Helper function to get access to the shop repository. * - * @return \Shopware\Models\Shop\Repository + * @return ShopRepository */ private function getShopRepository() { @@ -301,7 +303,7 @@ private function getShopRepository() /** * Helper function to get access to the article repository. * - * @return \Shopware\Models\Article\Repository + * @return ProductRepository */ private function getArticleRepository() { diff --git a/engine/Shopware/Controllers/Backend/Property.php b/engine/Shopware/Controllers/Backend/Property.php index 9f55693085a..c5c01266d6c 100644 --- a/engine/Shopware/Controllers/Backend/Property.php +++ b/engine/Shopware/Controllers/Backend/Property.php @@ -21,9 +21,11 @@ * our trademarks remain entirely with the shopware AG. */ +use Shopware\Components\Model\ModelManager; use Shopware\Models\Media\Media; use Shopware\Models\Property\Group; use Shopware\Models\Property\Option; +use Shopware\Models\Property\Repository; use Shopware\Models\Property\Value; class Shopware_Controllers_Backend_Property extends Shopware_Controllers_Backend_ExtJs @@ -31,12 +33,12 @@ class Shopware_Controllers_Backend_Property extends Shopware_Controllers_Backend /** * Entity Manager * - * @var \Shopware\Components\Model\ModelManager + * @var ModelManager */ protected $manager; /** - * @var \Shopware\Models\Property\Repository + * @var Repository */ protected $propertyRepository; @@ -87,7 +89,7 @@ public function createSetAction() $group = new Group(); $group->fromArray($params); - $modelManager = $this->get(\Shopware\Components\Model\ModelManager::class); + $modelManager = $this->get(ModelManager::class); try { $modelManager->persist($group); $modelManager->flush(); @@ -148,14 +150,14 @@ public function deleteSetAction() return; } - $group = $this->get(\Shopware\Components\Model\ModelManager::class)->getRepository(Group::class)->find($id); + $group = $this->get(ModelManager::class)->getRepository(Group::class)->find($id); if (!$group) { $this->View()->assign(['success' => false, 'message' => 'Group not found']); return; } - $modelManager = $this->get(\Shopware\Components\Model\ModelManager::class); + $modelManager = $this->get(ModelManager::class); try { $modelManager->remove($group); $modelManager->flush(); @@ -278,7 +280,7 @@ public function createGroupAction() $option = new Option(); $option->fromArray($params); - $modelManager = $this->get(\Shopware\Components\Model\ModelManager::class); + $modelManager = $this->get(ModelManager::class); try { $modelManager->persist($option); $modelManager->flush(); @@ -344,7 +346,7 @@ public function deleteGroupAction() return; } - $modelManager = $this->get(\Shopware\Components\Model\ModelManager::class); + $modelManager = $this->get(ModelManager::class); try { // Cascades remove to associated values $modelManager->remove($option); @@ -396,7 +398,7 @@ public function createOptionAction() $postValue = $request->getPost('value'); $value = new Value($option, $postValue); - $modelManager = $this->get(\Shopware\Components\Model\ModelManager::class); + $modelManager = $this->get(ModelManager::class); try { $modelManager->persist($value); $modelManager->flush(); @@ -429,7 +431,7 @@ public function updateOptionAction() $value->setValue($request->getPost('value')); if ($request->has('mediaId') && $request->getParam('mediaId')) { - $media = $this->get(\Shopware\Components\Model\ModelManager::class)->find(Media::class, $request->getPost('mediaId')); + $media = $this->get(ModelManager::class)->find(Media::class, $request->getPost('mediaId')); $value->setMedia($media); } else { $value->setMedia(null); @@ -469,7 +471,7 @@ public function deleteOptionAction() return; } - $modelManager = $this->get(\Shopware\Components\Model\ModelManager::class); + $modelManager = $this->get(ModelManager::class); try { $modelManager->remove($value); $modelManager->flush(); @@ -549,7 +551,7 @@ public function changeAssignmentPositionAction() /** * Helper function to get access to the property repository. * - * @return \Shopware\Models\Property\Repository + * @return Repository */ private function getPropertyRepository() { @@ -563,7 +565,7 @@ private function getPropertyRepository() /** * Internal helper function to get access to the entity manager. * - * @return \Shopware\Components\Model\ModelManager + * @return ModelManager */ private function getManager() { diff --git a/engine/Shopware/Controllers/Backend/Site.php b/engine/Shopware/Controllers/Backend/Site.php index e197f29cacb..db499acaace 100644 --- a/engine/Shopware/Controllers/Backend/Site.php +++ b/engine/Shopware/Controllers/Backend/Site.php @@ -394,7 +394,7 @@ private function getSiteRepository() /** * Internal helper function to get access to the entity manager. * - * @return Shopware\Components\Model\ModelManager + * @return ModelManager */ private function getManager() { diff --git a/engine/Shopware/Controllers/Backend/Snippet.php b/engine/Shopware/Controllers/Backend/Snippet.php index c2a75716cb8..406970361eb 100644 --- a/engine/Shopware/Controllers/Backend/Snippet.php +++ b/engine/Shopware/Controllers/Backend/Snippet.php @@ -668,10 +668,7 @@ public function getNamespacesAction() return; } - /** @var \Doctrine\ORM\QueryBuilder $builder */ - $builder = $this->get('models') - ->getRepository('Shopware\Models\Snippet\Snippet') - ->createQueryBuilder('snippet'); + $builder = $this->get('models')->getRepository(Snippet::class)->createQueryBuilder('snippet'); $builder->select('snippet.namespace, count(snippet.id) as snippetCount') ->groupBy('snippet.namespace') @@ -699,10 +696,9 @@ public function removeNamespaceAction() return; } - /** @var \Doctrine\ORM\QueryBuilder $builder */ $builder = $this->get('models')->createQueryBuilder(); - $builder->delete('Shopware\Models\Snippet\Snippet', 's') + $builder->delete(Snippet::class, 's') ->andWhere('s.namespace LIKE :namespace') ->orWhere('s.namespace LIKE :namespaceWildcard') ->setParameter('namespace', $namespace) diff --git a/engine/Shopware/Controllers/Backend/Translation.php b/engine/Shopware/Controllers/Backend/Translation.php index bc5e0209ed9..d4481cf6a3b 100644 --- a/engine/Shopware/Controllers/Backend/Translation.php +++ b/engine/Shopware/Controllers/Backend/Translation.php @@ -26,7 +26,7 @@ class Shopware_Controllers_Backend_Translation extends Shopware_Controllers_Backend_ExtJs { /** - * @var \Shopware_Components_Translation|null + * @var Shopware_Components_Translation|null */ protected $translation; diff --git a/engine/Shopware/Controllers/Backend/UpdateWizard.php b/engine/Shopware/Controllers/Backend/UpdateWizard.php index 1ea16d0157d..50a6f77cf5a 100644 --- a/engine/Shopware/Controllers/Backend/UpdateWizard.php +++ b/engine/Shopware/Controllers/Backend/UpdateWizard.php @@ -28,29 +28,29 @@ use Shopware\Bundle\PluginInstallerBundle\Service\AccountManagerService; use Shopware\Bundle\PluginInstallerBundle\Service\PluginLicenceService; use Shopware\Bundle\PluginInstallerBundle\Struct\AccessTokenStruct; +use Shopware\Components\CacheManager; +use ShopwarePlugins\SwagUpdate\Components\PluginCheck; class Shopware_Controllers_Backend_UpdateWizard extends Shopware_Controllers_Backend_ExtJs { public function indexAction() { /** @var Connection $connection */ - $connection = $this->get(\Doctrine\DBAL\Connection::class); + $connection = $this->get(Connection::class); $sql = "INSERT IGNORE INTO `s_core_config_elements` (`id`, `form_id`, `name`, `value`, `label`, `description`, `type`, `required`, `position`, `scope`) VALUES (NULL, '0', 'updateWizardStarted', 'b:1;', '', '', 'checkbox', '0', '0', '1');"; $connection->executeUpdate($sql); - Shopware()->Container()->get(\Shopware\Components\CacheManager::class)->clearConfigCache(); + Shopware()->Container()->get(CacheManager::class)->clearConfigCache(); } public function updateAction() { - $pluginCheck = new \ShopwarePlugins\SwagUpdate\Components\PluginCheck($this->container); + $pluginCheck = new PluginCheck($this->container); - /** @var PluginLicenceService $licenceService */ - $licenceService = $this->get(\Shopware\Bundle\PluginInstallerBundle\Service\PluginLicenceService::class); + $licenceService = $this->get(PluginLicenceService::class); - /** @var AccountManagerService $accountService */ - $accountService = $this->get(\Shopware\Bundle\PluginInstallerBundle\Service\AccountManagerService::class); + $accountService = $this->get(AccountManagerService::class); $request = new UpdateLicencesRequest( $this->getVersion(), @@ -99,7 +99,7 @@ private function getVersion(): string $version = $this->container->getParameter('shopware.release.version'); if (!\is_string($version)) { - throw new \RuntimeException('Parameter shopware.release.version has to be an string'); + throw new RuntimeException('Parameter shopware.release.version has to be an string'); } return $version; @@ -149,7 +149,6 @@ private function handleException(Exception $e) */ private function getExceptionMessage(StoreException $exception) { - /** @var \Enlight_Components_Snippet_Namespace $namespace */ $namespace = $this->get('snippets') ->getNamespace('backend/plugin_manager/exceptions'); diff --git a/engine/Shopware/Controllers/Backend/Voucher.php b/engine/Shopware/Controllers/Backend/Voucher.php index b0ee01509ef..8502da0f322 100644 --- a/engine/Shopware/Controllers/Backend/Voucher.php +++ b/engine/Shopware/Controllers/Backend/Voucher.php @@ -489,7 +489,7 @@ private function getVoucherRepository() /** * Internal helper function to get access to the entity manager. * - * @return Shopware\Components\Model\ModelManager + * @return ModelManager */ private function getManager() { diff --git a/engine/Shopware/Controllers/Frontend/AjaxSearch.php b/engine/Shopware/Controllers/Frontend/AjaxSearch.php index 86446c8719f..cb7e7994567 100644 --- a/engine/Shopware/Controllers/Frontend/AjaxSearch.php +++ b/engine/Shopware/Controllers/Frontend/AjaxSearch.php @@ -40,8 +40,7 @@ public function indexAction() { $this->View()->loadTemplate('frontend/search/ajax.tpl'); - /** @var SearchTermPreProcessorInterface $processor */ - $processor = $this->get(\Shopware\Bundle\SearchBundle\SearchTermPreProcessorInterface::class); + $processor = $this->get(SearchTermPreProcessorInterface::class); $term = $processor->process($this->Request()->getParam('sSearch')); if (!$term || \strlen($term) < Shopware()->Config()->get('MinSearchLenght')) { diff --git a/engine/Shopware/Controllers/Frontend/Index.php b/engine/Shopware/Controllers/Frontend/Index.php index 8b682ce3fba..c5860e47d74 100644 --- a/engine/Shopware/Controllers/Frontend/Index.php +++ b/engine/Shopware/Controllers/Frontend/Index.php @@ -71,7 +71,7 @@ private function handleThemeHash() return false; } - $optinService = $this->container->get(\Shopware\Components\OptinServiceInterface::class); + $optinService = $this->container->get(OptinServiceInterface::class); $data = $optinService->get(OptinServiceInterface::TYPE_THEME_PREVIEW, $hash); diff --git a/engine/Shopware/Controllers/Frontend/Payment.php b/engine/Shopware/Controllers/Frontend/Payment.php index 3f1f6c47684..2a5685c523d 100644 --- a/engine/Shopware/Controllers/Frontend/Payment.php +++ b/engine/Shopware/Controllers/Frontend/Payment.php @@ -324,7 +324,6 @@ protected function sendSignatureIsInvalidNotificationMail($paymentName, $orderNu $content = sprintf($content, $paymentName, $orderNumber, $transactionNumber); try { - /** @var Enlight_Components_Mail $mail */ $mail = $this->get('mail'); $mail->addTo($this->get(\Shopware_Components_Config::class)->get('mail')); $mail->setSubject('An invalid basket signature occured'); @@ -334,7 +333,6 @@ protected function sendSignatureIsInvalidNotificationMail($paymentName, $orderNu } catch (Exception $e) { } - /** @var \Shopware\Components\Logger $logger */ $logger = $this->get('corelogger'); $logger->log('error', $content); } diff --git a/engine/Shopware/Controllers/Frontend/Tellafriend.php b/engine/Shopware/Controllers/Frontend/Tellafriend.php index c6945dee8ea..17010c8e8ae 100644 --- a/engine/Shopware/Controllers/Frontend/Tellafriend.php +++ b/engine/Shopware/Controllers/Frontend/Tellafriend.php @@ -88,7 +88,6 @@ public function indexAction() } if (!empty(Shopware()->Config()->get('CaptchaColor'))) { - /** @var \Shopware\Components\Captcha\CaptchaValidator $captchaValidator */ $captchaValidator = $this->container->get('shopware.captcha.validator'); if (!$captchaValidator->validate($this->Request())) { diff --git a/engine/Shopware/Core/sAdmin.php b/engine/Shopware/Core/sAdmin.php index 3771b1ff3b2..31acfc5a528 100644 --- a/engine/Shopware/Core/sAdmin.php +++ b/engine/Shopware/Core/sAdmin.php @@ -1117,7 +1117,6 @@ public function sSaveRegisterSendConfirmation($email) return false; } - /** @var \Shopware\Bundle\StoreFrontBundle\Struct\Shop $shop */ $shop = $this->contextService->getShopContext()->getShop(); $shopUrl = 'http://' . $shop->getHost() . $shop->getUrl(); diff --git a/engine/Shopware/Core/sBasket.php b/engine/Shopware/Core/sBasket.php index 6f69ac37117..cf265326fe1 100644 --- a/engine/Shopware/Core/sBasket.php +++ b/engine/Shopware/Core/sBasket.php @@ -150,7 +150,7 @@ class sBasket implements \Enlight_Hook private $cartOrderNumberProvider; /** - * @throws \Exception + * @throws Exception */ public function __construct( ?Enlight_Components_Db_Adapter_Pdo_Mysql $db = null, @@ -332,10 +332,10 @@ public function sGetAmountRestrictedArticles($articles, $supplier) * Update vouchers in cart * Used only internally in sBasket * - * @throws \Exception - * @throws \Enlight_Exception - * @throws \Enlight_Event_Exception - * @throws \Zend_Db_Adapter_Exception + * @throws Exception + * @throws Enlight_Exception + * @throws Enlight_Event_Exception + * @throws Zend_Db_Adapter_Exception */ public function sUpdateVoucher() { @@ -352,9 +352,9 @@ public function sUpdateVoucher() * Insert basket discount * Used only internally in sBasket::sGetBasket() * - * @throws \Enlight_Exception - * @throws \Enlight_Event_Exception - * @throws \Zend_Db_Adapter_Exception + * @throws Enlight_Exception + * @throws Enlight_Event_Exception + * @throws Zend_Db_Adapter_Exception */ public function sInsertDiscount() { @@ -514,7 +514,7 @@ public function sCheckForDiscount() * Add premium products to cart * Used internally in sBasket and in CheckoutController * - * @throws \Zend_Db_Adapter_Exception + * @throws Zend_Db_Adapter_Exception * * @return bool|int */ @@ -708,10 +708,10 @@ public function getMaxTax() * @param string $voucherCode Voucher code * @param string $basket * - * @throws \Exception - * @throws \Enlight_Exception - * @throws \Enlight_Event_Exception - * @throws \Zend_Db_Adapter_Exception + * @throws Exception + * @throws Enlight_Exception + * @throws Enlight_Event_Exception + * @throws Zend_Db_Adapter_Exception * * @return array|bool True if successful, false if stopped by an event, array with error data if one occurred */ @@ -1102,8 +1102,8 @@ public function sCheckMinimumCharge() * Add surcharge for payment means to cart * Used only internally in sBasket::sGetBasket * - * @throws \Enlight_Exception - * @throws \Zend_Db_Adapter_Exception + * @throws Enlight_Exception + * @throws Zend_Db_Adapter_Exception * * @return false|null False on failure, null on success */ @@ -1216,8 +1216,8 @@ public function sInsertSurcharge() * Add percentage surcharge * Used only internally in sBasket::sGetBasket * - * @throws \Enlight_Exception - * @throws \Zend_Db_Adapter_Exception + * @throws Enlight_Exception + * @throws Zend_Db_Adapter_Exception * * @return false|null False on failure, null on success */ @@ -1357,10 +1357,10 @@ public function sCountBasket() /** * Updates cart and returns it. * - * @throws \Exception - * @throws \Enlight_Exception - * @throws \Enlight_Event_Exception - * @throws \Zend_Db_Adapter_Exception + * @throws Exception + * @throws Enlight_Exception + * @throws Enlight_Event_Exception + * @throws Zend_Db_Adapter_Exception * * @phpstan-return BasketArray * @@ -1418,8 +1418,8 @@ public function sGetBasket() /** * Returns all basket data without refresh * - * @throws \Exception - * @throws \Enlight_Exception + * @throws Exception + * @throws Enlight_Exception * * @phpstan-return BasketArray * @@ -1512,9 +1512,9 @@ public function sGetBasketData() * @param string $articleName * @param string $articleOrderNumber * - * @throws \DomainException - * @throws \Enlight_Exception If entry could not be added to database - * @throws \Zend_Db_Adapter_Exception + * @throws DomainException + * @throws Enlight_Exception If entry could not be added to database + * @throws Zend_Db_Adapter_Exception * * @return bool If operation was successful */ @@ -1572,7 +1572,7 @@ public function sAddNote($articleID, $articleName, $articleOrderNumber) * Get all products current on wishlist * Used in the NoteController * - * @throws \Exception + * @throws Exception * * @return array Product notes */ @@ -1642,8 +1642,8 @@ public function sCountNotes() * * @param int $id Id of the wishlist line * - * @throws \Zend_Db_Adapter_Exception - * @throws \Enlight_Exception If entry could not be deleted from database + * @throws Zend_Db_Adapter_Exception + * @throws Enlight_Exception If entry could not be deleted from database * * @return bool if the operation was successful */ @@ -1687,9 +1687,9 @@ public function sDeleteNote($id) * @param int $id Basket entry id * @param int $quantity Quantity * - * @throws \Enlight_Event_Exception - * @throws \Zend_Db_Adapter_Exception - * @throws \Enlight_Exception If database could not be updated + * @throws Enlight_Event_Exception + * @throws Zend_Db_Adapter_Exception + * @throws Enlight_Exception If database could not be updated * * @return false|null */ @@ -1944,10 +1944,10 @@ public function sDeleteArticle($id) * @param string $id Order number (s_articles_details.ordernumber) * @param int $quantity Amount * - * @throws \Exception - * @throws \Enlight_Exception If no price could be determined, or a database error occurs - * @throws \Enlight_Event_Exception - * @throws \Zend_Db_Adapter_Exception + * @throws Exception + * @throws Enlight_Exception If no price could be determined, or a database error occurs + * @throws Enlight_Event_Exception + * @throws Zend_Db_Adapter_Exception * * @return int|false Id of the inserted basket entry, or false on failure */ @@ -2099,10 +2099,10 @@ public function clearBasket() * Refresh basket after login / currency change * Used in multiple locations * - * @throws \Exception - * @throws \Enlight_Exception - * @throws \Enlight_Event_Exception - * @throws \Zend_Db_Adapter_Exception + * @throws Exception + * @throws Enlight_Exception + * @throws Enlight_Event_Exception + * @throws Zend_Db_Adapter_Exception */ public function sRefreshBasket() { @@ -2241,7 +2241,7 @@ private static function roundTotal($total) } /** - * @throws \Exception + * @throws Exception * * @return array */ @@ -2295,7 +2295,7 @@ private function getNoteProducts() * @param string $orderNumber * @param string $sessionId * - * @throws \Enlight_Event_Exception + * @throws Enlight_Event_Exception * * @return array Example: ["id" => "731", "quantity" => "100"] */ @@ -2599,8 +2599,8 @@ private function getBasketImage($image) * * @param array> $getProducts * - * @throws \Exception - * @throws \Enlight_Event_Exception + * @throws Exception + * @throws Enlight_Event_Exception * * @return array{0: array>, 1: float, 2: float, 3: int, 4: float} */ @@ -2833,7 +2833,7 @@ private function getBasketProducts(array $getProducts): array } /** - * @throws \Enlight_Event_Exception + * @throws Enlight_Event_Exception * * @return array> */ @@ -3006,7 +3006,7 @@ private function getAdditionalInfoForUpdateProduct(array $cartItems): void * * @param CartItemStruct[] $cartItems * - * @throws \Enlight_Event_Exception + * @throws Enlight_Event_Exception */ private function getPricesForItemUpdates(array $cartItems) { @@ -3095,7 +3095,7 @@ private function getPricesForItemUpdates(array $cartItems) * * @param int $quantity * - * @throws \Enlight_Exception + * @throws Enlight_Exception * * @return array */ @@ -3172,7 +3172,7 @@ private function getTaxesForUpdateProduct($quantity, array $queryNewPrice, array } /** - * @throws \Enlight_Exception + * @throws Enlight_Exception * * @return array */ @@ -3242,7 +3242,7 @@ private function getPriceForAddProduct(array $product) * * @param string $id Product order number * - * @throws \Exception + * @throws Exception * * @return array|false Product data, or false if none found */ diff --git a/engine/Shopware/Core/sOrder.php b/engine/Shopware/Core/sOrder.php index 3abfe12022e..2b2b72261d6 100644 --- a/engine/Shopware/Core/sOrder.php +++ b/engine/Shopware/Core/sOrder.php @@ -22,7 +22,9 @@ */ use Shopware\Bundle\AttributeBundle\Service\DataLoader; +use Shopware\Bundle\AttributeBundle\Service\DataLoaderInterface; use Shopware\Bundle\AttributeBundle\Service\DataPersister; +use Shopware\Bundle\AttributeBundle\Service\DataPersisterInterface; use Shopware\Bundle\CartBundle\CartKey; use Shopware\Bundle\CartBundle\CartPositionsMode; use Shopware\Bundle\CartBundle\CheckoutKey; @@ -222,17 +224,17 @@ class sOrder implements Enlight_Hook private $numberRangeIncrementer; /** - * @var Shopware\Bundle\AttributeBundle\Service\DataLoaderInterface + * @var DataLoaderInterface */ private $attributeLoader; /** - * @var Shopware\Bundle\AttributeBundle\Service\DataPersisterInterface + * @var DataPersisterInterface */ private $attributePersister; /** - * @var Shopware\Components\Model\ModelManager + * @var ModelManager */ private $modelManager; diff --git a/engine/Shopware/Core/sRewriteTable.php b/engine/Shopware/Core/sRewriteTable.php index d3e3be895bd..8577587c839 100644 --- a/engine/Shopware/Core/sRewriteTable.php +++ b/engine/Shopware/Core/sRewriteTable.php @@ -230,7 +230,7 @@ public function baseSetup() * @param string $lastUpdate * * @throws SmartyException - * @throws \Enlight_Event_Exception + * @throws Enlight_Event_Exception * @throws Zend_Db_Adapter_Exception * @throws Exception * @@ -399,7 +399,7 @@ public function sCreateRewriteTableCategories($offset = null, $limit = null) * @param int $offset * * @throws Zend_Db_Adapter_Exception - * @throws \Enlight_Event_Exception + * @throws Enlight_Event_Exception * * @return string */ diff --git a/engine/Shopware/Models/Article/Configurator/Template/Template.php b/engine/Shopware/Models/Article/Configurator/Template/Template.php index d5d0a250c4b..c100e2cc2b0 100644 --- a/engine/Shopware/Models/Article/Configurator/Template/Template.php +++ b/engine/Shopware/Models/Article/Configurator/Template/Template.php @@ -493,7 +493,7 @@ public function setAttribute($attribute) } /** - * @return \Doctrine\Common\Collections\ArrayCollection + * @return ArrayCollection */ public function getPrices() { diff --git a/engine/Shopware/Models/Article/Download.php b/engine/Shopware/Models/Article/Download.php index b36f8cbaec1..31831511f61 100644 --- a/engine/Shopware/Models/Article/Download.php +++ b/engine/Shopware/Models/Article/Download.php @@ -36,7 +36,7 @@ class Download extends ModelEntity /** * OWNING SIDE * - * @var \Shopware\Models\Article\Article + * @var Article * * @ORM\ManyToOne(targetEntity="Shopware\Models\Article\Article", inversedBy="downloads") * @ORM\JoinColumn(name="articleID", referencedColumnName="id", nullable=false) diff --git a/engine/Shopware/Models/Article/Image/Rule.php b/engine/Shopware/Models/Article/Image/Rule.php index 308e82d4d2b..5e8c5187f0c 100644 --- a/engine/Shopware/Models/Article/Image/Rule.php +++ b/engine/Shopware/Models/Article/Image/Rule.php @@ -37,7 +37,7 @@ class Rule extends ModelEntity /** * OWNING SIDE - BI DIRECTIONAL * - * @var \Shopware\Models\Article\Image\Mapping + * @var Mapping * * @ORM\ManyToOne(targetEntity="Shopware\Models\Article\Image\Mapping", inversedBy="rules") * @ORM\JoinColumn(name="mapping_id", referencedColumnName="id", nullable=false) @@ -102,7 +102,7 @@ public function setOption($option) } /** - * @return \Shopware\Models\Article\Image\Mapping + * @return Mapping */ public function getMapping() { @@ -110,7 +110,7 @@ public function getMapping() } /** - * @param \Shopware\Models\Article\Image\Mapping $mapping + * @param Mapping $mapping */ public function setMapping($mapping) { diff --git a/engine/Shopware/Models/Config/Element.php b/engine/Shopware/Models/Config/Element.php index 1e9e608a009..d964540bae8 100644 --- a/engine/Shopware/Models/Config/Element.php +++ b/engine/Shopware/Models/Config/Element.php @@ -243,7 +243,7 @@ public function getLabel() } /** - * @param \Shopware\Models\Config\Form $form + * @param Form $form */ public function setForm($form) { diff --git a/engine/Shopware/Models/Country/Area.php b/engine/Shopware/Models/Country/Area.php index db89f30601f..876573e9aaf 100644 --- a/engine/Shopware/Models/Country/Area.php +++ b/engine/Shopware/Models/Country/Area.php @@ -129,12 +129,12 @@ public function getCountries() } /** - * @param \Shopware\Models\Country\Country[]|null $countries + * @param Country[]|null $countries * * @return Area */ public function setCountries($countries) { - return $this->setOneToMany($countries, \Shopware\Models\Country\Country::class, 'countries', 'area'); + return $this->setOneToMany($countries, Country::class, 'countries', 'area'); } } diff --git a/engine/Shopware/Models/Customer/PriceGroup.php b/engine/Shopware/Models/Customer/PriceGroup.php index c731798e437..d38291efad6 100644 --- a/engine/Shopware/Models/Customer/PriceGroup.php +++ b/engine/Shopware/Models/Customer/PriceGroup.php @@ -173,7 +173,7 @@ public function getNetto() /** * @param int $netto * - * @return \Shopware\Models\Customer\PriceGroup + * @return PriceGroup */ public function setNetto($netto) { @@ -193,7 +193,7 @@ public function getActive() /** * @param int $active * - * @return \Shopware\Models\Customer\PriceGroup + * @return PriceGroup */ public function setActive($active) { diff --git a/engine/Shopware/Models/CustomerStream/CustomerStreamRepository.php b/engine/Shopware/Models/CustomerStream/CustomerStreamRepository.php index 7887d178d66..970f8bf2ac8 100644 --- a/engine/Shopware/Models/CustomerStream/CustomerStreamRepository.php +++ b/engine/Shopware/Models/CustomerStream/CustomerStreamRepository.php @@ -49,10 +49,10 @@ public function __construct(Connection $connection) public function hasCustomerStreamEmotions($categoryId) { return $this->connection->fetchColumn( - 'SELECT emotion.id - FROM s_emotion emotion - INNER JOIN s_emotion_categories categories - ON categories.emotion_id = emotion.id + 'SELECT emotion.id + FROM s_emotion emotion + INNER JOIN s_emotion_categories categories + ON categories.emotion_id = emotion.id AND categories.category_id = :id WHERE emotion.customer_stream_ids IS NOT NULL AND emotion.active = 1 LIMIT 1', @@ -67,7 +67,6 @@ public function fetchBackendListing(array $ids) { $streams = $this->fetchStreamsForCustomers($ids); - /** @var \Doctrine\DBAL\Query\QueryBuilder $query */ $query = $this->connection->createQueryBuilder(); $query->select('*'); $query->from('s_customer_search_index', 'search_index'); @@ -127,7 +126,7 @@ public function getNotIndexedCount() 'SELECT COUNT(customers.id) FROM s_user customers WHERE customers.id NOT IN ( - SELECT search_index.id + SELECT search_index.id FROM s_customer_search_index search_index WHERE search_index.index_time >= :indexTime )', @@ -160,7 +159,7 @@ public function fetchSearchIndexIds($offset, $full = false) } else { $query->andWhere( 'user.id NOT IN ( - SELECT search_index.id + SELECT search_index.id FROM s_customer_search_index search_index WHERE search_index.index_time >= :indexTime)' ); @@ -351,7 +350,6 @@ private function createAmountPerMonthQuery(DateTime $date) */ private function createStreamAmountQuery(DateTime $date, $streamId = null) { - /** @var \Doctrine\DBAL\Query\QueryBuilder $query */ $query = $this->connection->createQueryBuilder(); $query->select([ "DATE_FORMAT(orders.ordertime, '%Y-%m')", diff --git a/engine/Shopware/Models/Document/Document.php b/engine/Shopware/Models/Document/Document.php index a1f9a1a4ae0..0c95ddc643b 100644 --- a/engine/Shopware/Models/Document/Document.php +++ b/engine/Shopware/Models/Document/Document.php @@ -133,7 +133,7 @@ class Document extends ModelEntity /** * INVERSED SIDE * - * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Document\Element> + * @var ArrayCollection * * @ORM\OneToMany(targetEntity="\Shopware\Models\Document\Element", mappedBy="document", orphanRemoval=true, cascade={"persist"}) * @ORM\JoinColumn(name="id", referencedColumnName="documentID") @@ -160,7 +160,7 @@ public function getId() * * @param string $name * - * @return \Shopware\Models\Document\Document + * @return Document */ public function setName($name) { @@ -184,7 +184,7 @@ public function getName() * * @param string $key * - * @return \Shopware\Models\Document\Document + * @return Document */ public function setKey($key) { @@ -208,7 +208,7 @@ public function getKey() * * @param string $template * - * @return \Shopware\Models\Document\Document + * @return Document */ public function setTemplate($template) { @@ -232,7 +232,7 @@ public function getTemplate() * * @param string $numbers * - * @return \Shopware\Models\Document\Document + * @return Document */ public function setNumbers($numbers) { @@ -256,7 +256,7 @@ public function getNumbers() * * @param int $bottom * - * @return \Shopware\Models\Document\Document + * @return Document */ public function setBottom($bottom) { @@ -280,7 +280,7 @@ public function getBottom() * * @param int $left * - * @return \Shopware\Models\Document\Document + * @return Document */ public function setLeft($left) { @@ -304,7 +304,7 @@ public function getLeft() * * @param int $pageBreak * - * @return \Shopware\Models\Document\Document + * @return Document */ public function setPageBreak($pageBreak) { @@ -328,7 +328,7 @@ public function getPageBreak() * * @param int $right * - * @return \Shopware\Models\Document\Document + * @return Document */ public function setRight($right) { @@ -352,7 +352,7 @@ public function getRight() * * @param int $top * - * @return \Shopware\Models\Document\Document + * @return Document */ public function setTop($top) { @@ -374,13 +374,13 @@ public function getTop() /** * Sets the form-elements. * - * @param \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Document\Element>|Element[] $elements + * @param ArrayCollection|Element[] $elements * * @return Document */ public function setElements($elements) { - $this->setOneToMany($elements, \Shopware\Models\Document\Element::class, 'elements', 'document'); + $this->setOneToMany($elements, Element::class, 'elements', 'document'); return $this; } @@ -388,7 +388,7 @@ public function setElements($elements) /** * Gets the form-elements. * - * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Document\Element> + * @return ArrayCollection */ public function getElements() { diff --git a/engine/Shopware/Models/Emotion/ElementViewport.php b/engine/Shopware/Models/Emotion/ElementViewport.php index f241a47eba8..a731606d351 100644 --- a/engine/Shopware/Models/Emotion/ElementViewport.php +++ b/engine/Shopware/Models/Emotion/ElementViewport.php @@ -33,7 +33,7 @@ class ElementViewport extends ModelEntity { /** - * @var \Shopware\Models\Emotion\Element + * @var Element * * @ORM\ManyToOne(targetEntity="Shopware\Models\Emotion\Element", inversedBy="viewports") * @ORM\JoinColumn(name="elementID", referencedColumnName="id", nullable=false) @@ -41,7 +41,7 @@ class ElementViewport extends ModelEntity protected $element; /** - * @var \Shopware\Models\Emotion\Emotion + * @var Emotion * * @ORM\ManyToOne(targetEntity="\Shopware\Models\Emotion\Emotion") * @ORM\JoinColumn(name="emotionID", referencedColumnName="id", nullable=false) diff --git a/engine/Shopware/Models/Emotion/Preset.php b/engine/Shopware/Models/Emotion/Preset.php index ae53c563cc6..a82885620ab 100644 --- a/engine/Shopware/Models/Emotion/Preset.php +++ b/engine/Shopware/Models/Emotion/Preset.php @@ -37,7 +37,7 @@ class Preset extends ModelEntity { /** - * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Emotion\PresetTranslation> + * @var ArrayCollection * * @ORM\OneToMany(targetEntity="Shopware\Models\Emotion\PresetTranslation", mappedBy="preset", orphanRemoval=true, cascade={"persist"}) */ @@ -305,17 +305,17 @@ public function setHidden($hidden) } /** - * @param \Shopware\Models\Emotion\PresetTranslation[] $translations + * @param PresetTranslation[] $translations * * @return Preset */ public function setTranslations(array $translations) { - return $this->setOneToMany($translations, \Shopware\Models\Emotion\PresetTranslation::class, 'translations', 'preset'); + return $this->setOneToMany($translations, PresetTranslation::class, 'translations', 'preset'); } /** - * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Emotion\PresetTranslation> + * @return ArrayCollection */ public function getTranslations() { diff --git a/engine/Shopware/Models/Emotion/PresetTranslation.php b/engine/Shopware/Models/Emotion/PresetTranslation.php index 7d827c55328..d42ee0d3a4c 100644 --- a/engine/Shopware/Models/Emotion/PresetTranslation.php +++ b/engine/Shopware/Models/Emotion/PresetTranslation.php @@ -35,7 +35,7 @@ class PresetTranslation extends ModelEntity { /** - * @var \Shopware\Models\Emotion\Preset + * @var Preset * * @ORM\ManyToOne(targetEntity="Shopware\Models\Emotion\Preset", inversedBy="translations") * @ORM\JoinColumn(name="presetID", referencedColumnName="id", nullable=false) diff --git a/engine/Shopware/Models/MultiEdit/Queue.php b/engine/Shopware/Models/MultiEdit/Queue.php index ded225efacd..bd5f7870b08 100644 --- a/engine/Shopware/Models/MultiEdit/Queue.php +++ b/engine/Shopware/Models/MultiEdit/Queue.php @@ -153,7 +153,7 @@ public function getOperations() } /** - * @param \Doctrine\Common\Collections\ArrayCollection $articleDetails + * @param ArrayCollection $articleDetails */ public function setArticleDetails($articleDetails) { @@ -161,7 +161,7 @@ public function setArticleDetails($articleDetails) } /** - * @return \Doctrine\Common\Collections\ArrayCollection + * @return ArrayCollection */ public function getArticleDetails() { diff --git a/engine/Shopware/Models/Newsletter/Newsletter.php b/engine/Shopware/Models/Newsletter/Newsletter.php index 45defc22f56..17a713d69e3 100644 --- a/engine/Shopware/Models/Newsletter/Newsletter.php +++ b/engine/Shopware/Models/Newsletter/Newsletter.php @@ -24,6 +24,7 @@ namespace Shopware\Models\Newsletter; use DateTimeInterface; +use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\Mapping as ORM; use Shopware\Components\Model\ModelEntity; @@ -41,7 +42,7 @@ class Newsletter extends ModelEntity * This is the inverse side of the association between newsletters and mail-addresses which have already * received the given newsletter. * - * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Newsletter\Address> + * @var ArrayCollection
        * * @ORM\OneToMany(targetEntity="Shopware\Models\Newsletter\Address", mappedBy="lastNewsletter") */ @@ -202,7 +203,7 @@ class Newsletter extends ModelEntity * * Inverse side of the mailing-container association * - * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Newsletter\Container> + * @var ArrayCollection * * @ORM\OneToMany(targetEntity="Shopware\Models\Newsletter\Container", mappedBy="newsletter", cascade={"persist", "remove"}) */ @@ -210,7 +211,7 @@ class Newsletter extends ModelEntity public function __construct() { - $this->containers = new \Doctrine\Common\Collections\ArrayCollection(); + $this->containers = new ArrayCollection(); } /** @@ -454,17 +455,17 @@ public function getTemplateId() } /** - * @param \Shopware\Models\Newsletter\Container[] $containers + * @param Container[] $containers * * @return Newsletter */ public function setContainers($containers) { - return $this->setOneToMany($containers, \Shopware\Models\Newsletter\Container::class, 'containers', 'newsletter'); + return $this->setOneToMany($containers, Container::class, 'containers', 'newsletter'); } /** - * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Newsletter\Container> + * @return ArrayCollection */ public function getContainers() { diff --git a/engine/Shopware/Models/Order/History.php b/engine/Shopware/Models/Order/History.php index 81a7d98156e..dddb6ff0735 100644 --- a/engine/Shopware/Models/Order/History.php +++ b/engine/Shopware/Models/Order/History.php @@ -147,7 +147,7 @@ class History extends ModelEntity * The $order property in this model is the owning side of the association of the order status history and the * order model. The $history property of the order model is the inverse side of this association. * - * @var \Shopware\Models\Order\Order + * @var Order * * @ORM\ManyToOne(targetEntity="\Shopware\Models\Order\Order", inversedBy="history") * @ORM\JoinColumn(name="orderID", referencedColumnName="id", nullable=false) @@ -173,7 +173,7 @@ class History extends ModelEntity * previous order status model. This association is an uni-directional association. That means that the order * status model don't know anything about the order status history. * - * @var \Shopware\Models\Order\Status|null + * @var Status|null * * @ORM\OneToOne(targetEntity="\Shopware\Models\Order\Status") * @ORM\JoinColumn(name="previous_order_status_id", referencedColumnName="id") @@ -186,7 +186,7 @@ class History extends ModelEntity * current order status model. This association is an uni-directional association. That means that the order * status model don't know anything about the order status history. * - * @var \Shopware\Models\Order\Status|null + * @var Status|null * * @ORM\OneToOne(targetEntity="\Shopware\Models\Order\Status") * @ORM\JoinColumn(name="order_status_id", referencedColumnName="id") @@ -199,7 +199,7 @@ class History extends ModelEntity * previous payment status model. This association is an uni-directional association. That means that the payment * status model don't know anything about the order status history. * - * @var \Shopware\Models\Order\Status|null + * @var Status|null * * @ORM\OneToOne(targetEntity="\Shopware\Models\Order\Status") * @ORM\JoinColumn(name="previous_payment_status_id", referencedColumnName="id") @@ -212,7 +212,7 @@ class History extends ModelEntity * current payment status model. This association is an uni-directional association. That means that the payment * status model don't know anything about the order status history. * - * @var \Shopware\Models\Order\Status|null + * @var Status|null * * @ORM\OneToOne(targetEntity="\Shopware\Models\Order\Status") * @ORM\JoinColumn(name="payment_status_id", referencedColumnName="id") @@ -249,7 +249,7 @@ public function getId() * * @param \Shopware\Models\User\User $user * - * @return \Shopware\Models\Order\History + * @return History */ public function setUser($user) { @@ -279,7 +279,7 @@ public function getUser() * * @param string $comment * - * @return \Shopware\Models\Order\History + * @return History */ public function setComment($comment) { @@ -306,9 +306,9 @@ public function getComment() * The $order property in this model is the owning side of the association of the order status history and the * order model. The $history property of the order model is the inverse side of this association. * - * @param \Shopware\Models\Order\Order $order + * @param Order $order * - * @return \Shopware\Models\Order\History + * @return History */ public function setOrder($order) { @@ -323,7 +323,7 @@ public function setOrder($order) * The $order property in this model is the owning side of the association of the order status history and the * order model. The $history property of the order model is the inverse side of this association. * - * @return \Shopware\Models\Order\Order + * @return Order */ public function getOrder() { @@ -337,9 +337,9 @@ public function getOrder() * current order status model. This association is an uni-directional association. That means that the order * status model don't know anything about the order status history. * - * @param \Shopware\Models\Order\Status $orderStatus + * @param Status $orderStatus * - * @return \Shopware\Models\Order\History + * @return History */ public function setOrderStatus($orderStatus) { @@ -355,7 +355,7 @@ public function setOrderStatus($orderStatus) * current order status model. This association is an uni-directional association. That means that the order * status model don't know anything about the order status history. * - * @return \Shopware\Models\Order\Status|null + * @return Status|null */ public function getOrderStatus() { @@ -369,9 +369,9 @@ public function getOrderStatus() * current payment status model. This association is an uni-directional association. That means that the payment * status model don't know anything about the order status history. * - * @param \Shopware\Models\Order\Status $paymentStatus + * @param Status $paymentStatus * - * @return \Shopware\Models\Order\History + * @return History */ public function setPaymentStatus($paymentStatus) { @@ -387,7 +387,7 @@ public function setPaymentStatus($paymentStatus) * current payment status model. This association is an uni-directional association. That means that the payment * status model don't know anything about the order status history. * - * @return \Shopware\Models\Order\Status|null + * @return Status|null */ public function getPaymentStatus() { @@ -401,9 +401,9 @@ public function getPaymentStatus() * previous order status model. This association is an uni-directional association. That means that the order * status model don't know anything about the order status history. * - * @param \Shopware\Models\Order\Status $previousOrderStatus + * @param Status $previousOrderStatus * - * @return \Shopware\Models\Order\History + * @return History */ public function setPreviousOrderStatus($previousOrderStatus) { @@ -419,7 +419,7 @@ public function setPreviousOrderStatus($previousOrderStatus) * previous order status model. This association is an uni-directional association. That means that the order * status model don't know anything about the order status history. * - * @return \Shopware\Models\Order\Status|null + * @return Status|null */ public function getPreviousOrderStatus() { @@ -433,9 +433,9 @@ public function getPreviousOrderStatus() * previous payment status model. This association is an uni-directional association. That means that the payment * status model don't know anything about the order status history. * - * @param \Shopware\Models\Order\Status $previousPaymentStatus + * @param Status $previousPaymentStatus * - * @return \Shopware\Models\Order\History + * @return History */ public function setPreviousPaymentStatus($previousPaymentStatus) { @@ -451,7 +451,7 @@ public function setPreviousPaymentStatus($previousPaymentStatus) * previous payment status model. This association is an uni-directional association. That means that the payment * status model don't know anything about the order status history. * - * @return \Shopware\Models\Order\Status|null + * @return Status|null */ public function getPreviousPaymentStatus() { diff --git a/engine/Shopware/Models/Partner/Partner.php b/engine/Shopware/Models/Partner/Partner.php index fa008982124..11a45a65753 100644 --- a/engine/Shopware/Models/Partner/Partner.php +++ b/engine/Shopware/Models/Partner/Partner.php @@ -29,6 +29,7 @@ use Doctrine\ORM\Mapping as ORM; use Shopware\Components\Model\ModelEntity; use Shopware\Components\Security\AttributeCleanerTrait; +use Shopware\Models\Attribute\Partner as PartnerAttribute; /** * Standard Export Model Entity @@ -47,7 +48,7 @@ class Partner extends ModelEntity /** * INVERSE SIDE * - * @var \Shopware\Models\Attribute\Partner|null + * @var PartnerAttribute|null * * @ORM\OneToOne(targetEntity="Shopware\Models\Attribute\Partner", mappedBy="partner", orphanRemoval=true, cascade={"persist"}) */ @@ -587,7 +588,7 @@ public function setCustomerId($customerId) } /** - * @return \Shopware\Models\Attribute\Partner|null + * @return PartnerAttribute|null */ public function getAttribute() { @@ -595,12 +596,12 @@ public function getAttribute() } /** - * @param \Shopware\Models\Attribute\Partner|array|null $attribute + * @param PartnerAttribute|array|null $attribute * - * @return \Shopware\Models\Partner\Partner + * @return Partner */ public function setAttribute($attribute) { - return $this->setOneToOne($attribute, \Shopware\Models\Attribute\Partner::class, 'attribute', 'partner'); + return $this->setOneToOne($attribute, PartnerAttribute::class, 'attribute', 'partner'); } } diff --git a/engine/Shopware/Models/Plugin/License.php b/engine/Shopware/Models/Plugin/License.php index a9646b5dc34..dfd671377bc 100644 --- a/engine/Shopware/Models/Plugin/License.php +++ b/engine/Shopware/Models/Plugin/License.php @@ -134,7 +134,7 @@ class License extends ModelEntity private $pluginId; /** - * @var \Shopware\Models\Plugin\Plugin|null + * @var Plugin|null * * @ORM\ManyToOne(targetEntity="Shopware\Models\Plugin\Plugin", inversedBy="licenses") * @ORM\JoinColumn(name="plugin_id", referencedColumnName="id") diff --git a/engine/Shopware/Models/Plugin/Plugin.php b/engine/Shopware/Models/Plugin/Plugin.php index 82158df2fc1..de4af6f3f0b 100644 --- a/engine/Shopware/Models/Plugin/Plugin.php +++ b/engine/Shopware/Models/Plugin/Plugin.php @@ -683,7 +683,7 @@ public function setUpdateSource($updateSource) } /** - * @return \Doctrine\Common\Collections\ArrayCollection + * @return ArrayCollection */ public function getEmotionComponents() { @@ -691,7 +691,7 @@ public function getEmotionComponents() } /** - * @param \Doctrine\Common\Collections\ArrayCollection $emotionComponents + * @param ArrayCollection $emotionComponents */ public function setEmotionComponents($emotionComponents) { @@ -699,7 +699,7 @@ public function setEmotionComponents($emotionComponents) } /** - * @return \Doctrine\Common\Collections\ArrayCollection + * @return ArrayCollection */ public function getWidgets() { @@ -707,7 +707,7 @@ public function getWidgets() } /** - * @param \Doctrine\Common\Collections\ArrayCollection $widgets + * @param ArrayCollection $widgets */ public function setWidgets($widgets) { diff --git a/engine/Shopware/Models/Price/Discount.php b/engine/Shopware/Models/Price/Discount.php index b8310ca97d1..8a77bb1bec3 100644 --- a/engine/Shopware/Models/Price/Discount.php +++ b/engine/Shopware/Models/Price/Discount.php @@ -44,7 +44,7 @@ class Discount extends ModelEntity private $id; /** - * @var \Shopware\Models\Price\Group|null + * @var Group|null * * @ORM\ManyToOne(targetEntity="Shopware\Models\Price\Group", inversedBy="discounts") * @ORM\JoinColumn(name="groupID", referencedColumnName="id") diff --git a/engine/Shopware/Models/Price/Group.php b/engine/Shopware/Models/Price/Group.php index 6ee5d14b73f..2f0b858d854 100644 --- a/engine/Shopware/Models/Price/Group.php +++ b/engine/Shopware/Models/Price/Group.php @@ -36,7 +36,7 @@ class Group extends ModelEntity { /** - * @var \Doctrine\Common\Collections\ArrayCollection + * @var ArrayCollection * * @ORM\OneToMany(targetEntity="Discount", mappedBy="group", orphanRemoval=true, cascade={"all"}) */ @@ -92,7 +92,7 @@ public function getName() } /** - * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Price\Discount> + * @return ArrayCollection */ public function getDiscounts() { @@ -106,6 +106,6 @@ public function getDiscounts() */ public function setDiscounts($discounts) { - return $this->setOneToMany($discounts, \Shopware\Models\Price\Discount::class, 'discounts', 'group'); + return $this->setOneToMany($discounts, Discount::class, 'discounts', 'group'); } } diff --git a/engine/Shopware/Models/Property/Relation.php b/engine/Shopware/Models/Property/Relation.php index 06cea760fb7..ea5788ae418 100644 --- a/engine/Shopware/Models/Property/Relation.php +++ b/engine/Shopware/Models/Property/Relation.php @@ -46,7 +46,7 @@ class Relation extends ModelEntity /** * The resource property is the owning side of the association between relation and group. * - * @var \Shopware\Models\Property\Group|null + * @var Group|null * * @ORM\ManyToOne(targetEntity="\Shopware\Models\Property\Group", inversedBy="relations") * @ORM\JoinColumn(name="groupID", referencedColumnName="id", nullable=true) @@ -63,7 +63,7 @@ class Relation extends ModelEntity /** * The resource property is the owning side of the association between relation and option. * - * @var \Shopware\Models\Property\Option|null + * @var Option|null * * @ORM\ManyToOne(targetEntity="\Shopware\Models\Property\Option", inversedBy="relations") * @ORM\JoinColumn(name="optionID", referencedColumnName="id", nullable=true) @@ -93,7 +93,7 @@ public function getId() } /** - * @param \Shopware\Models\Property\Option $option + * @param Option $option */ public function setOption($option) { @@ -101,7 +101,7 @@ public function setOption($option) } /** - * @return \Shopware\Models\Property\Option|null + * @return Option|null */ public function getOption() { @@ -109,7 +109,7 @@ public function getOption() } /** - * @param \Shopware\Models\Property\Group $group + * @param Group $group */ public function setGroup($group) { @@ -117,7 +117,7 @@ public function setGroup($group) } /** - * @return \Shopware\Models\Property\Group|null + * @return Group|null */ public function getGroup() { diff --git a/engine/Shopware/Models/Site/Group.php b/engine/Shopware/Models/Site/Group.php index ad6c64fd4f0..d1b7dcd80b2 100644 --- a/engine/Shopware/Models/Site/Group.php +++ b/engine/Shopware/Models/Site/Group.php @@ -67,7 +67,7 @@ class Group extends ModelEntity private $active = true; /** - * @var \Shopware\Models\Site\Group|null + * @var Group|null * * @ORM\ManyToOne(targetEntity="Shopware\Models\Site\Group") * @ORM\JoinColumn(name="mapping_id", nullable=true, referencedColumnName="id") @@ -115,7 +115,7 @@ public function setName($name) } /** - * @return \Shopware\Models\Site\Group|null + * @return Group|null */ public function getMapping() { @@ -123,7 +123,7 @@ public function getMapping() } /** - * @param \Shopware\Models\Site\Group|null $mapping + * @param Group|null $mapping */ public function setMapping($mapping) { diff --git a/engine/Shopware/Models/Snippet/Snippet.php b/engine/Shopware/Models/Snippet/Snippet.php index 98893e0f5fe..3bf08c7cf2f 100644 --- a/engine/Shopware/Models/Snippet/Snippet.php +++ b/engine/Shopware/Models/Snippet/Snippet.php @@ -119,7 +119,7 @@ public function getId() /** * @param string $namespace * - * @return \Shopware\Models\Snippet\Snippet + * @return Snippet */ public function setNamespace($namespace) { @@ -139,7 +139,7 @@ public function getNamespace() /** * @param int $shopid * - * @return \Shopware\Models\Snippet\Snippet + * @return Snippet */ public function setShopId($shopid) { @@ -159,7 +159,7 @@ public function getShopId() /** * @param int $localeid * - * @return \Shopware\Models\Snippet\Snippet + * @return Snippet */ public function setLocaleId($localeid) { @@ -179,7 +179,7 @@ public function getLocaleId() /** * @param string $name * - * @return \Shopware\Models\Snippet\Snippet + * @return Snippet */ public function setName($name) { @@ -199,7 +199,7 @@ public function getName() /** * @param string $value * - * @return \Shopware\Models\Snippet\Snippet + * @return Snippet */ public function setValue($value) { @@ -219,7 +219,7 @@ public function getValue() /** * @param DateTimeInterface|string $created * - * @return \Shopware\Models\Snippet\Snippet + * @return Snippet */ public function setCreated($created = 'now') { @@ -243,7 +243,7 @@ public function getCreated() /** * @param DateTimeInterface|string $updated * - * @return \Shopware\Models\Snippet\Snippet + * @return Snippet */ public function setUpdated($updated = 'now') { diff --git a/engine/Shopware/Models/Translation/Translation.php b/engine/Shopware/Models/Translation/Translation.php index 0bced9575e6..130e1781c5c 100644 --- a/engine/Shopware/Models/Translation/Translation.php +++ b/engine/Shopware/Models/Translation/Translation.php @@ -155,7 +155,7 @@ public function setShop(Shop $shop) } /** - * @return \Shopware\Models\Shop\Shop + * @return Shop */ public function getShop() { diff --git a/engine/Shopware/Models/User/Resource.php b/engine/Shopware/Models/User/Resource.php index ef77ce79710..dd41f0245e8 100644 --- a/engine/Shopware/Models/User/Resource.php +++ b/engine/Shopware/Models/User/Resource.php @@ -74,7 +74,7 @@ class Resource extends ModelEntity implements Zend_Acl_Resource_Interface * The privileges property is the inverse side of the association between resource and privileges. * The association is joined over the s_core_acl_privileges.resourceID field and the s_core_acl_resources.id * - * @var ArrayCollection<\Shopware\Models\User\Privilege> + * @var ArrayCollection * * @ORM\OneToMany(targetEntity="Shopware\Models\User\Privilege", mappedBy="resource") */ @@ -85,7 +85,7 @@ class Resource extends ModelEntity implements Zend_Acl_Resource_Interface */ public function __construct() { - $this->privileges = new \Doctrine\Common\Collections\ArrayCollection(); + $this->privileges = new ArrayCollection(); } /** @@ -99,7 +99,7 @@ public function getId() /** * @param string $name * - * @return \Shopware\Models\User\Resource + * @return $this */ public function setName($name) { diff --git a/engine/Shopware/Models/User/Role.php b/engine/Shopware/Models/User/Role.php index 07ddbbeb251..168c2ae7065 100644 --- a/engine/Shopware/Models/User/Role.php +++ b/engine/Shopware/Models/User/Role.php @@ -133,7 +133,7 @@ class Role extends ModelEntity implements Zend_Acl_Role_Interface * The parent property contains the instance of the inherited Shopware\Models\User\Role * model. The Role inherits all privileges from his parent. * - * @var \Shopware\Models\User\Role|null + * @var Role|null * * @ORM\ManyToOne(targetEntity="\Shopware\Models\User\Role", inversedBy="children") * @ORM\JoinColumn(name="parentID", referencedColumnName="id") @@ -298,7 +298,7 @@ public function getUsers() * * @param \Doctrine\Common\Collections\ArrayCollection $users * - * @return \Shopware\Models\User\Role + * @return Role */ public function setUsers($users) { @@ -356,7 +356,7 @@ public function setChildren($children) * contains the inherited parent role. The association is defined over * the Role.id property and the Role.parentId property. * - * @return \Shopware\Models\User\Role|null + * @return Role|null */ public function getParent() { @@ -369,7 +369,7 @@ public function getParent() * contains the inherited parent role. The association is defined over * the Role.id property and the Role.parentId property. * - * @param \Shopware\Models\User\Role|null $parent + * @param Role|null $parent */ public function setParent($parent) { diff --git a/engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php b/engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php index 739761a168d..80ba0f9816c 100644 --- a/engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php @@ -410,10 +410,10 @@ public function onInitResourceBackendSession(Enlight_Event_EventArgs $args) * database adapter by default * * @throws SmartyException - * @throws \Enlight_Exception + * @throws Enlight_Exception * @throws Exception * - * @return \Zend_Auth + * @return Zend_Auth */ public function onInitResourceAuth(Enlight_Event_EventArgs $args) { diff --git a/engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php index 332a262990c..44e896af16d 100644 --- a/engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php @@ -146,7 +146,7 @@ public function &filterSource($source) /** * Rewrite source link * - * @see \Shopware_Controllers_Backend_Newsletter::outputFilter + * @see Shopware_Controllers_Backend_Newsletter::outputFilter * * @param array $src * diff --git a/engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php b/engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php index f8d42b47fd6..ad92bc47248 100644 --- a/engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php +++ b/engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php @@ -21,6 +21,9 @@ * our trademarks remain entirely with the shopware AG. */ +use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface; +use Shopware\Models\Shop\Shop; + class Shopware_Controllers_Backend_Seo extends Shopware_Controllers_Backend_ExtJs { /** @@ -165,7 +168,7 @@ public function seoBlogAction() $shop = $this->SeoIndex()->registerShop($shopId); $this->RewriteTable()->baseSetup(); - $context = $this->get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class)->createShopContext($shopId); + $context = $this->get(ContextServiceInterface::class)->createShopContext($shopId); $this->RewriteTable()->sCreateRewriteTableBlog($offset, $limit, $context); $this->View()->assign([ @@ -266,7 +269,7 @@ public function seoSupplierAction() // Create shop $this->SeoIndex()->registerShop($shopId); - $context = $this->get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class)->createShopContext($shopId); + $context = $this->get(ContextServiceInterface::class)->createShopContext($shopId); // Make sure a template is available $this->RewriteTable()->baseSetup(); @@ -284,7 +287,7 @@ public function seoContentTypeAction(): void // Create shop $this->SeoIndex()->registerShop($shopId); - $context = $this->get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class)->createShopContext($shopId); + $context = $this->get(ContextServiceInterface::class)->createShopContext($shopId); // Make sure a template is available $this->RewriteTable()->baseSetup(); @@ -300,9 +303,9 @@ public function seoContentTypeAction(): void * passed shop id. The offset and limit parameter are used * to update only an offset of article urls. * - * @param int $offset - * @param int $limit - * @param \Shopware\Models\Shop\Shop $shop + * @param int $offset + * @param int $limit + * @param Shop $shop */ protected function seoArticle($offset, $limit, $shop) { @@ -317,7 +320,7 @@ protected function seoArticle($offset, $limit, $shop) $sql = $this->RewriteTable()->getSeoArticleQuery(); $sql = Shopware()->Db()->limit($sql, $limit, $offset); - $shopFallbackId = ($shop->getFallback() instanceof \Shopware\Models\Shop\Shop) ? $shop->getFallback()->getId() : null; + $shopFallbackId = ($shop->getFallback() instanceof Shop) ? $shop->getFallback()->getId() : null; $articles = Shopware()->Db()->fetchAll($sql, [ $shop->get('parentID'), diff --git a/engine/Shopware/Plugins/Default/Core/System/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/System/Bootstrap.php index 74a67cda119..e6c8d631270 100644 --- a/engine/Shopware/Plugins/Default/Core/System/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Core/System/Bootstrap.php @@ -76,7 +76,7 @@ public function onDispatchLoopShutdown(Enlight_Controller_EventArgs $args) /** * Event listener method * - * @return \sSystem + * @return sSystem */ public function onInitResourceSystem(Enlight_Event_EventArgs $args) { @@ -147,7 +147,7 @@ public function onInitResourceSystem(Enlight_Event_EventArgs $args) /** * Event listener method * - * @return \Shopware_Components_Modules + * @return Shopware_Components_Modules */ public static function onInitResourceModules(Enlight_Event_EventArgs $args) { diff --git a/engine/Shopware/Plugins/Default/Frontend/CronRefresh/Bootstrap.php b/engine/Shopware/Plugins/Default/Frontend/CronRefresh/Bootstrap.php index dc016a0acc4..0882406a3d0 100644 --- a/engine/Shopware/Plugins/Default/Frontend/CronRefresh/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Frontend/CronRefresh/Bootstrap.php @@ -21,6 +21,9 @@ * our trademarks remain entirely with the shopware AG. */ +use Doctrine\DBAL\Connection; +use Shopware\Bundle\SearchBundleDBAL\SearchTerm\SearchIndexer; + /** * Shopware Plugin Frontend CronRefresh * @@ -50,11 +53,10 @@ public function install() */ public function onCronJobClearing(Shopware_Components_Cron_CronJob $job) { - /** @var \Doctrine\DBAL\Connection $connection */ - $connection = $this->get(\Doctrine\DBAL\Connection::class); + $connection = $this->get(Connection::class); // Delete all entries from lastarticles older than 30 days - $lastArticleTime = $this->get(\Shopware_Components_Config::class)->get('lastarticles_time', 30); + $lastArticleTime = $this->get(Shopware_Components_Config::class)->get('lastarticles_time', 30); $sql = "DELETE FROM s_emarketing_lastarticles WHERE `time` < date_add(current_date, INTERVAL -{$lastArticleTime} DAY)"; @@ -75,8 +77,8 @@ public function onCronJobClearing(Shopware_Components_Cron_CronJob $job) $result = $connection->executeQuery($sql); $data['log']['rows'] = $result->rowCount(); - $data['referrer']['rows'] = $this->deleteOldReferrerData($this->get(\Shopware_Components_Config::class)->get('maximumReferrerAge')); - $data['article_impression']['rows'] = $this->deleteOldArticleImpressionData($this->get(\Shopware_Components_Config::class)->get('maximumImpressionAge')); + $data['referrer']['rows'] = $this->deleteOldReferrerData($this->get(Shopware_Components_Config::class)->get('maximumReferrerAge')); + $data['article_impression']['rows'] = $this->deleteOldArticleImpressionData($this->get(Shopware_Components_Config::class)->get('maximumImpressionAge')); // Delete all entries from s_statistics_pool not from the current day $sql = 'DELETE FROM s_statistics_pool WHERE datum != CURDATE()'; @@ -96,7 +98,7 @@ public function onCronJobClearing(Shopware_Components_Cron_CronJob $job) */ public function onCronJobSearch(Shopware_Components_Cron_CronJob $job) { - $indexer = $this->get(\Shopware\Bundle\SearchBundleDBAL\SearchTerm\SearchIndexer::class); + $indexer = $this->get(SearchIndexer::class); $indexer->build(); } @@ -119,7 +121,7 @@ private function deleteOldReferrerData($maximumReferrerAge) $sql = ' DELETE FROM s_statistics_referer WHERE `datum` < date_add(current_date, INTERVAL ' . $maximumReferrerAge . ' DAY) '; - $result = $this->get(\Doctrine\DBAL\Connection::class)->executeQuery($sql); + $result = $this->get(Connection::class)->executeQuery($sql); return $result->rowCount(); } @@ -143,7 +145,7 @@ private function deleteOldArticleImpressionData($maximumAge) $sql = ' DELETE FROM s_statistics_article_impression WHERE `date` < date_add(current_date, INTERVAL ' . $maximumAge . ' DAY) '; - $result = $this->get(\Doctrine\DBAL\Connection::class)->executeQuery($sql); + $result = $this->get(Connection::class)->executeQuery($sql); return $result->rowCount(); } diff --git a/engine/Shopware/Plugins/Default/Frontend/InputFilter/Bootstrap.php b/engine/Shopware/Plugins/Default/Frontend/InputFilter/Bootstrap.php index b16772fd8fe..c03eb45a04a 100644 --- a/engine/Shopware/Plugins/Default/Frontend/InputFilter/Bootstrap.php +++ b/engine/Shopware/Plugins/Default/Frontend/InputFilter/Bootstrap.php @@ -21,6 +21,7 @@ * our trademarks remain entirely with the shopware AG. */ +use Shopware\Models\Config\Form; use voku\helper\AntiXSS; /** @@ -99,7 +100,7 @@ public function install() ); $form = $this->Form(); - /** @var \Shopware\Models\Config\Form $parent */ + /** @var Form $parent */ $parent = $this->Forms()->findOneBy(['name' => 'Core']); $form->setParent($parent); @@ -235,7 +236,7 @@ public static function filterValue($value, $regex, $stripTags = true, array $all $antiXss->removeEvilHtmlTags($allowedHtmlTags); $value = $antiXss->xss_clean($value); - return \str_replace(['<', '>'], ['<', '>'], $value); + return str_replace(['<', '>'], ['<', '>'], $value); } /** diff --git a/recovery/common/autoload.php b/recovery/common/autoload.php index b9c5eef8a51..6cfd0df60cf 100644 --- a/recovery/common/autoload.php +++ b/recovery/common/autoload.php @@ -21,6 +21,8 @@ * our trademarks remain entirely with the shopware AG. */ +use Composer\Autoload\ClassLoader; + if (!file_exists(__DIR__ . '/vendor/autoload.php')) { $template = '%s: '; if (PHP_SAPI !== 'cli') { @@ -42,7 +44,7 @@ \define('SW_PATH', realpath(__DIR__ . '/../../')); -/** @var \Composer\Autoload\ClassLoader $autoloader */ +/** @var ClassLoader $autoloader */ $autoloader = require_once __DIR__ . '/vendor/autoload.php'; $autoloader->addPsr4( diff --git a/recovery/install/src/app.php b/recovery/install/src/app.php index c35b13e49c0..4b57c99906b 100644 --- a/recovery/install/src/app.php +++ b/recovery/install/src/app.php @@ -23,6 +23,7 @@ use Pimple\Container; use Shopware\Recovery\Common\Middelware\XssMiddleware; +use Shopware\Recovery\Common\SystemLocker; use Shopware\Recovery\Common\Utils; use Shopware\Recovery\Install\ContainerProvider; use Shopware\Recovery\Install\DatabaseFactory; @@ -39,8 +40,10 @@ use Shopware\Recovery\Install\Service\ShopService; use Shopware\Recovery\Install\Service\ThemeService; use Shopware\Recovery\Install\Service\TranslationService; +use Shopware\Recovery\Install\Struct\AdminUser; use Shopware\Recovery\Install\Struct\DatabaseConnectionInformation; use Shopware\Recovery\Install\Struct\LicenseUnpackRequest; +use Shopware\Recovery\Install\Struct\Shop; use Slim\Slim; use voku\helper\AntiXSS; @@ -74,7 +77,7 @@ // Init db in container $container->offsetSet('db', $connection); - } catch (\Exception $e) { + } catch (Exception $e) { // Jump to form throw $e; } @@ -314,7 +317,7 @@ function prefixSessionVars(Slim $app, Container $container) try { $databaseFactory = new DatabaseFactory(); $databaseFactory->createPDOConnection($connectionInfo); // check connection - } catch (\Exception $e) { + } catch (Exception $e) { $app->render('database-configuration.php', ['error' => $e->getMessage()]); return; @@ -326,7 +329,7 @@ function prefixSessionVars(Slim $app, Container $container) /** @var ConfigWriter $configWriter */ $configWriter = $container->offsetGet('config.writer'); $configWriter->writeConfig($connectionInfo); - } catch (\Exception $e) { + } catch (Exception $e) { $app->render('database-configuration.php', ['error' => $e->getMessage()]); return; @@ -344,9 +347,9 @@ function prefixSessionVars(Slim $app, Container $container) } try { - /** @var \PDO $connection */ + /** @var PDO $connection */ $connection = $container->offsetGet('db'); - } catch (\Exception $e) { + } catch (Exception $e) { $menuHelper->setCurrent('database-configuration'); $app->render( 'database-configuration.php', @@ -359,7 +362,7 @@ function prefixSessionVars(Slim $app, Container $container) try { $connection->query('SELECT * FROM s_schema_version')->fetchAll(); $hasSchema = true; - } catch (\Exception $e) { + } catch (Exception $e) { $hasSchema = false; } @@ -372,7 +375,7 @@ function prefixSessionVars(Slim $app, Container $container) try { $container->offsetGet('db'); - } catch (\Exception $e) { + } catch (Exception $e) { $menuHelper->setCurrent('database-configuration'); $app->render('database-configuration.php', ['error' => 'Please fill in all fields']); @@ -399,7 +402,7 @@ function prefixSessionVars(Slim $app, Container $container) try { $licenseInformation = $licenseUnpackService->evaluateLicense($unpackRequest, $translationService); - } catch (\Exception $e) { + } catch (Exception $e) { $app->view()->setData('error', $e->getMessage()); $app->render('/edition.php'); @@ -430,7 +433,7 @@ function prefixSessionVars(Slim $app, Container $container) try { $db = $container->offsetGet('db'); - } catch (\Exception $e) { + } catch (Exception $e) { $menuHelper->setCurrent('database-configuration'); $app->render('database-configuration.php', ['error' => 'Please fill in all fields']); @@ -438,7 +441,7 @@ function prefixSessionVars(Slim $app, Container $container) } if ($app->request()->isPost()) { - $adminUser = new \Shopware\Recovery\Install\Struct\AdminUser([ + $adminUser = new AdminUser([ 'email' => $_SESSION['parameters']['c_config_admin_email'], 'username' => $_SESSION['parameters']['c_config_admin_username'], 'name' => $_SESSION['parameters']['c_config_admin_name'], @@ -446,7 +449,7 @@ function prefixSessionVars(Slim $app, Container $container) 'locale' => localeForLanguage($_SESSION['language']), ]); - $shop = new \Shopware\Recovery\Install\Struct\Shop([ + $shop = new Shop([ 'name' => $_SESSION['parameters']['c_config_shopName'], 'locale' => $_SESSION['parameters']['c_config_shop_language'], 'currency' => $_SESSION['parameters']['c_config_shop_currency'], @@ -469,7 +472,7 @@ function prefixSessionVars(Slim $app, Container $container) $currencyService->updateCurrency($shop); $shopService->updateConfig($shop); $localeSettingsService->updateLocaleSettings($locale); - } catch (\Exception $e) { + } catch (Exception $e) { $hasErrors = true; $app->view()->setData('error', $e->getMessage()); } @@ -511,7 +514,7 @@ function prefixSessionVars(Slim $app, Container $container) $basepath = str_replace('/recovery/install/index.php', '', $_SERVER['SCRIPT_NAME']); - /** @var \Shopware\Recovery\Common\SystemLocker $systemLocker */ + /** @var SystemLocker $systemLocker */ $systemLocker = $container->offsetGet('system.locker'); $systemLocker(); @@ -542,10 +545,10 @@ function prefixSessionVars(Slim $app, Container $container) $response->header('Content-Type', 'application/json'); $response->status(200); - /** @var \PDO $db */ + /** @var PDO $db */ $db = $container->offsetGet('db'); - /** @var \Shopware\Recovery\Common\DumpIterator $dump */ + /** @var Shopware\Recovery\Common\DumpIterator $dump */ $dump = $container->offsetGet('database.dump_iterator'); $offset = (int) $request->get('offset', 0); @@ -558,13 +561,13 @@ function prefixSessionVars(Slim $app, Container $container) // How many queries should be executed per http request? $batchSize = 100; - /** @var Shopware\Recovery\Install\Service\DatabaseService $databaseService */ + /** @var DatabaseService $databaseService */ $databaseService = $container->offsetGet('database.service'); // For end users, we hide the error if we can not create the database or alter it. try { $databaseService->createDatabase($_SESSION['parameters']['c_database_schema']); - } catch (\Exception $e) { + } catch (Exception $e) { } $preSql = <<<'EOD' @@ -627,7 +630,7 @@ function prefixSessionVars(Slim $app, Container $container) $response->header('Content-Type', 'application/json'); $response->status(200); - /** @var \Shopware\Recovery\Common\DumpIterator $dump */ + /** @var Shopware\Recovery\Common\DumpIterator $dump */ $dump = $container->offsetGet('database.snippet_dump_iterator'); $offset = (int) $app->request()->get('offset', 0); $totalCount = (int) $app->request()->get('totalCount', 0); @@ -636,7 +639,7 @@ function prefixSessionVars(Slim $app, Container $container) $totalCount = $dump->count(); } - /** @var \PDO $conn */ + /** @var PDO $conn */ $conn = $container->offsetGet('db'); $preSql = ' @@ -661,7 +664,7 @@ function prefixSessionVars(Slim $app, Container $container) try { $conn->exec($current); $dump->next(); - } catch (\PDOException $e) { + } catch (PDOException $e) { $data = [ 'query' => $sql, 'success' => false, @@ -700,7 +703,7 @@ function prefixSessionVars(Slim $app, Container $container) try { $databaseFactory = new DatabaseFactory(); $connection = $databaseFactory->createPDOConnection($connectionInfo); - } catch (\Exception $e) { + } catch (Exception $e) { $response->header('Content-Type', 'application/json'); $response->status(200); $response->body(json_encode([])); diff --git a/recovery/update/src/Steps/MigrationStep.php b/recovery/update/src/Steps/MigrationStep.php index 9ce5f31e0ae..743723276b9 100644 --- a/recovery/update/src/Steps/MigrationStep.php +++ b/recovery/update/src/Steps/MigrationStep.php @@ -31,7 +31,7 @@ class MigrationStep { /** - * @var \Shopware\Components\Migrations\Manager + * @var Manager */ private $migrationManager; diff --git a/recovery/update/src/Steps/UnpackStep.php b/recovery/update/src/Steps/UnpackStep.php index 22fec676a94..acba95d7ff6 100644 --- a/recovery/update/src/Steps/UnpackStep.php +++ b/recovery/update/src/Steps/UnpackStep.php @@ -33,12 +33,12 @@ class UnpackStep { /** - * @var \Gaufrette\Filesystem + * @var Filesystem */ private $localFilesyste; /** - * @var \Gaufrette\Filesystem + * @var Filesystem */ private $remoteFilesyste; diff --git a/tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php b/tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php index 3c19d370fec..3921c58fb4f 100644 --- a/tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php +++ b/tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php @@ -25,10 +25,13 @@ use Doctrine\DBAL\Connection; use Exception; +use PHPUnit\Framework\TestCase; +use Shopware\Bundle\AttributeBundle\Service\DataLoader; use Shopware\Bundle\AttributeBundle\Service\DataLoaderInterface; +use Shopware\Bundle\AttributeBundle\Service\DataPersister; use Shopware\Bundle\AttributeBundle\Service\DataPersisterInterface; -class DataLoaderTest extends \PHPUnit\Framework\TestCase +class DataLoaderTest extends TestCase { /** * @var DataLoaderInterface @@ -47,11 +50,11 @@ class DataLoaderTest extends \PHPUnit\Framework\TestCase protected function setUp(): void { - $this->connection = Shopware()->Container()->get(\Doctrine\DBAL\Connection::class); + $this->connection = Shopware()->Container()->get(Connection::class); $this->connection->beginTransaction(); - $this->attributePersister = Shopware()->Container()->get(\Shopware\Bundle\AttributeBundle\Service\DataPersister::class); - $this->attributeLoader = Shopware()->Container()->get(\Shopware\Bundle\AttributeBundle\Service\DataLoader::class); + $this->attributePersister = Shopware()->Container()->get(DataPersister::class); + $this->attributeLoader = Shopware()->Container()->get(DataLoader::class); parent::setUp(); } diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/CustomerAttributeConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/CustomerAttributeConditionHandlerTest.php index bfe8e04930f..dd3eb32a57b 100644 --- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/CustomerAttributeConditionHandlerTest.php +++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/CustomerAttributeConditionHandlerTest.php @@ -23,6 +23,7 @@ namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler; +use Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface; use Shopware\Bundle\CustomerSearchBundle\Condition\CustomerAttributeCondition; use Shopware\Bundle\SearchBundle\ConditionInterface; use Shopware\Bundle\SearchBundle\Criteria; @@ -33,7 +34,7 @@ class CustomerAttributeConditionHandlerTest extends TestCase { protected function setUp(): void { - $service = Shopware()->Container()->get(\Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface::class); + $service = Shopware()->Container()->get(CrudServiceInterface::class); $service->update('s_user_attributes', 'test', 'integer'); parent::setUp(); } @@ -41,18 +42,16 @@ protected function setUp(): void protected function tearDown(): void { parent::tearDown(); - /** @var CrudService $service */ - $service = Shopware()->Container()->get(\Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface::class); + $service = Shopware()->Container()->get(CrudServiceInterface::class); $service->delete('s_user_attributes', 'test'); - /** @var CacheManager $cache */ - $cache = Shopware()->Container()->get(\Shopware\Components\CacheManager::class); + $cache = Shopware()->Container()->get(CacheManager::class); $cache->clearProxyCache(); $cache->clearOpCache(); } - public function testAttribute() + public function testAttribute(): void { $criteria = new Criteria(); $criteria->addCondition( diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/HandlerRegistryTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/HandlerRegistryTest.php index d5dc88def2c..a3e9207e4ca 100644 --- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/HandlerRegistryTest.php +++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/HandlerRegistryTest.php @@ -61,8 +61,7 @@ class HandlerRegistryTest extends TestCase { public function testCoreHandlersAreRegistered() { - /** @var HandlerRegistry $registry */ - $registry = Shopware()->Container()->get(\Shopware\Bundle\CustomerSearchBundleDBAL\HandlerRegistry::class); + $registry = Shopware()->Container()->get(HandlerRegistry::class); $handlers = $registry->getConditionHandlers(); $classes = []; @@ -106,8 +105,7 @@ public function testCoreHandlersAreRegistered() public function testNoneSupportConditionThrowsException() { $this->expectException('RuntimeException'); - /** @var HandlerRegistry $registry */ - $registry = Shopware()->Container()->get(\Shopware\Bundle\CustomerSearchBundleDBAL\HandlerRegistry::class); + $registry = Shopware()->Container()->get(HandlerRegistry::class); $registry->getConditionHandler(new SimpleCondition('test')); } } diff --git a/tests/Functional/Components/Cart/BasketQueryHelperTest.php b/tests/Functional/Components/Cart/BasketQueryHelperTest.php index 964c5e5eab1..932c1846fd1 100644 --- a/tests/Functional/Components/Cart/BasketQueryHelperTest.php +++ b/tests/Functional/Components/Cart/BasketQueryHelperTest.php @@ -41,7 +41,7 @@ class BasketQueryHelperTest extends TestCase public function setUp(): void { $this->queryHelper = new BasketQueryHelper( - Shopware()->Container()->get(\Doctrine\DBAL\Connection::class) + Shopware()->Container()->get(Connection::class) ); } diff --git a/tests/Functional/Components/Model/GeneratorTest.php b/tests/Functional/Components/Model/GeneratorTest.php index 2f0c4c9dc55..497f55fbeb1 100644 --- a/tests/Functional/Components/Model/GeneratorTest.php +++ b/tests/Functional/Components/Model/GeneratorTest.php @@ -23,9 +23,13 @@ namespace Shopware\Tests\Functional\Components\Model; +use PHPUnit\Framework\TestCase; +use Shopware\Bundle\AttributeBundle\Service\CrudService; +use Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface; use Shopware\Components\Model\Generator; +use Shopware\Components\Model\ModelManager; -class GeneratorTest extends \PHPUnit\Framework\TestCase +class GeneratorTest extends TestCase { public const TEST_TABLE_NAME = 's_articles_attributes'; public const TEST_ATTRIBUTE_FIELD_PREFIX = 'test_'; @@ -33,24 +37,24 @@ class GeneratorTest extends \PHPUnit\Framework\TestCase public const TEST_ATTRIBUTE_PROPERTY_NAME = 'testNotNullDefaultValueField'; /** - * @var \Shopware\Components\Model\ModelManager + * @var ModelManager */ public $em; /** - * @var \Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface + * @var CrudServiceInterface */ public $cs; /** - * @var \Shopware\Components\Model\Generator + * @var Generator */ public $generator; public function setUp(): void { parent::setUp(); - $this->cs = Shopware()->Container()->get(\Shopware\Bundle\AttributeBundle\Service\CrudService::class); + $this->cs = Shopware()->Container()->get(CrudService::class); $this->em = Shopware()->Models(); $this->generator = new Generator( $this->em->getConnection()->getSchemaManager(), diff --git a/tests/Functional/Components/OptinServiceTest.php b/tests/Functional/Components/OptinServiceTest.php index 0eb42ed5965..35398b189f3 100644 --- a/tests/Functional/Components/OptinServiceTest.php +++ b/tests/Functional/Components/OptinServiceTest.php @@ -38,7 +38,7 @@ class OptinServiceTest extends TestCase protected function setUp(): void { Shopware()->Models()->getConnection()->beginTransaction(); - $this->service = Shopware()->Container()->get(\Shopware\Components\OptinServiceInterface::class); + $this->service = Shopware()->Container()->get(OptinServiceInterface::class); } protected function tearDown(): void diff --git a/tests/Functional/Components/Plugin/TestCase.php b/tests/Functional/Components/Plugin/TestCase.php index 4fcee3eb003..489b4151e58 100644 --- a/tests/Functional/Components/Plugin/TestCase.php +++ b/tests/Functional/Components/Plugin/TestCase.php @@ -58,7 +58,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase public static function setUpBeforeClass(): void { - self::$pluginManager = Shopware()->Container()->get(\Shopware\Bundle\PluginInstallerBundle\Service\InstallerService::class); + self::$pluginManager = Shopware()->Container()->get(InstallerService::class); $loadedPlugins = static::$ensureLoadedPlugins; foreach ($loadedPlugins as $key => $value) { diff --git a/tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php b/tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php index 790a7d56500..af5ba16a734 100644 --- a/tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php +++ b/tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php @@ -59,14 +59,14 @@ class BootstrapTest extends Enlight_Components_Test_Controller_TestCase public function setUp(): void { - Shopware()->Container()->reset(\Shopware\Bundle\PluginInstallerBundle\Service\InstallerService::class); + Shopware()->Container()->reset(InstallerService::class); Shopware()->Container()->reset('shopware_plugininstaller.plugin_manager'); Shopware()->Container()->reset(LegacyPluginInstaller::class); Shopware()->Container()->reset('shopware_plugininstaller.legacy_plugin_installer'); - $this->connection = Shopware()->Container()->get(\Doctrine\DBAL\Connection::class); - $this->pluginManager = Shopware()->Container()->get(\Shopware\Bundle\PluginInstallerBundle\Service\InstallerService::class); - $this->cacheManager = Shopware()->Container()->get(\Shopware\Components\CacheManager::class); + $this->connection = Shopware()->Container()->get(Connection::class); + $this->pluginManager = Shopware()->Container()->get(InstallerService::class); + $this->cacheManager = Shopware()->Container()->get(CacheManager::class); $plugin = $this->pluginManager->getPluginByName('HttpCache'); diff --git a/tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php b/tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php index e3054d86816..b64aa212006 100644 --- a/tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php +++ b/tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php @@ -114,7 +114,7 @@ protected function saveConfig($name, $value) $shop = $shopRepository->find($shopRepository->getActiveDefault()->getId()); - if (strpos($name, ':') !== false) { + if (str_contains($name, ':')) { list($formName, $name) = explode(':', $name, 2); } @@ -124,7 +124,7 @@ protected function saveConfig($name, $value) $findBy['form'] = $form; } - /** @var \Shopware\Models\Config\Element $element */ + /** @var Element $element */ $element = $elementRepository->findOneBy($findBy); $defaultValue = $element->getValue(); diff --git a/tests/Unit/Bundle/SitemapBundle/SitemapLockTest.php b/tests/Unit/Bundle/SitemapBundle/SitemapLockTest.php index b5b162ef8fb..70895834694 100644 --- a/tests/Unit/Bundle/SitemapBundle/SitemapLockTest.php +++ b/tests/Unit/Bundle/SitemapBundle/SitemapLockTest.php @@ -50,7 +50,7 @@ public function setUp(): void $data = sprintf('Locked: %s', (new DateTime('NOW', new DateTimeZone('UTC')))->format(DateTime::ATOM)); - $this->cacheMock = $this->getMockBuilder(\Shopware\Bundle\StoreFrontBundle\Service\Core\CoreCache::class) + $this->cacheMock = $this->getMockBuilder(CoreCache::class) ->disableOriginalConstructor() ->setMethods(['save', 'fetch']) ->getMock(); diff --git a/vendor-bin/cs-fixer/composer.json b/vendor-bin/cs-fixer/composer.json index f196dc2bf83..50d811fad21 100644 --- a/vendor-bin/cs-fixer/composer.json +++ b/vendor-bin/cs-fixer/composer.json @@ -1,7 +1,7 @@ { "require-dev": { - "friendsofphp/php-cs-fixer": "3.37.1", - "kubawerlos/php-cs-fixer-custom-fixers": "3.16.2" + "friendsofphp/php-cs-fixer": "3.42.0", + "kubawerlos/php-cs-fixer-custom-fixers": "3.17.1" }, "sort-packages": true } diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock index e4cedb82552..a33d98f3a13 100644 --- a/vendor-bin/cs-fixer/composer.lock +++ b/vendor-bin/cs-fixer/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": "e7642c7db2f04de1a82f1b385fe41167", + "content-hash": "ba9494407c75cb5cd5a6a0470f35218c", "packages": [], "packages-dev": [ { @@ -227,50 +227,47 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.37.1", + "version": "v3.42.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "c3fe76976081ab871aa654e872da588077e19679" + "reference": "632ef1be3447a9b890bef06147475facee535d0f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/c3fe76976081ab871aa654e872da588077e19679", - "reference": "c3fe76976081ab871aa654e872da588077e19679", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/632ef1be3447a9b890bef06147475facee535d0f", + "reference": "632ef1be3447a9b890bef06147475facee535d0f", "shasum": "" }, "require": { - "composer/semver": "^3.3", + "composer/semver": "^3.4", "composer/xdebug-handler": "^3.0.3", "ext-json": "*", "ext-tokenizer": "*", "php": "^7.4 || ^8.0", "sebastian/diff": "^4.0 || ^5.0", - "symfony/console": "^5.4 || ^6.0", - "symfony/event-dispatcher": "^5.4 || ^6.0", - "symfony/filesystem": "^5.4 || ^6.0", - "symfony/finder": "^5.4 || ^6.0", - "symfony/options-resolver": "^5.4 || ^6.0", - "symfony/polyfill-mbstring": "^1.27", - "symfony/polyfill-php80": "^1.27", - "symfony/polyfill-php81": "^1.27", - "symfony/process": "^5.4 || ^6.0", - "symfony/stopwatch": "^5.4 || ^6.0" + "symfony/console": "^5.4 || ^6.0 || ^7.0", + "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0", + "symfony/filesystem": "^5.4 || ^6.0 || ^7.0", + "symfony/finder": "^5.4 || ^6.0 || ^7.0", + "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0", + "symfony/polyfill-mbstring": "^1.28", + "symfony/polyfill-php80": "^1.28", + "symfony/polyfill-php81": "^1.28", + "symfony/process": "^5.4 || ^6.0 || ^7.0", + "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { "facile-it/paraunit": "^1.3 || ^2.0", "justinrainbow/json-schema": "^5.2", - "keradus/cli-executor": "^2.0", + "keradus/cli-executor": "^2.1", "mikey179/vfsstream": "^1.6.11", - "php-coveralls/php-coveralls": "^2.5.3", + "php-coveralls/php-coveralls": "^2.7", "php-cs-fixer/accessible-object": "^1.1", - "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", - "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", - "phpspec/prophecy": "^1.16", - "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.5", - "symfony/phpunit-bridge": "^6.2.3", - "symfony/yaml": "^5.4 || ^6.0" + "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.4", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.4", + "phpunit/phpunit": "^9.6", + "symfony/yaml": "^5.4 || ^6.0 || ^7.0" }, "suggest": { "ext-dom": "For handling output formats in XML", @@ -308,7 +305,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.37.1" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.42.0" }, "funding": [ { @@ -316,20 +313,20 @@ "type": "github" } ], - "time": "2023-10-29T20:51:23+00:00" + "time": "2023-12-24T14:38:51+00:00" }, { "name": "kubawerlos/php-cs-fixer-custom-fixers", - "version": "v3.16.2", + "version": "v3.17.1", "source": { "type": "git", "url": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers.git", - "reference": "d3f2590069d06ba49ad24cac03f802e8ad0aaeba" + "reference": "1adfc79e5bd11ff713b1c2a512c382cc8fcff34e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kubawerlos/php-cs-fixer-custom-fixers/zipball/d3f2590069d06ba49ad24cac03f802e8ad0aaeba", - "reference": "d3f2590069d06ba49ad24cac03f802e8ad0aaeba", + "url": "https://api.github.com/repos/kubawerlos/php-cs-fixer-custom-fixers/zipball/1adfc79e5bd11ff713b1c2a512c382cc8fcff34e", + "reference": "1adfc79e5bd11ff713b1c2a512c382cc8fcff34e", "shasum": "" }, "require": { @@ -360,9 +357,9 @@ "description": "A set of custom fixers for PHP CS Fixer", "support": { "issues": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/issues", - "source": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.16.2" + "source": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.17.1" }, - "time": "2023-08-06T13:50:15+00:00" + "time": "2023-12-23T14:34:27+00:00" }, { "name": "psr/container", @@ -580,16 +577,16 @@ }, { "name": "symfony/console", - "version": "v5.4.28", + "version": "v5.4.32", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "f4f71842f24c2023b91237c72a365306f3c58827" + "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/f4f71842f24c2023b91237c72a365306f3c58827", - "reference": "f4f71842f24c2023b91237c72a365306f3c58827", + "url": "https://api.github.com/repos/symfony/console/zipball/c70df1ffaf23a8d340bded3cfab1b86752ad6ed7", + "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7", "shasum": "" }, "require": { @@ -659,7 +656,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.28" + "source": "https://github.com/symfony/console/tree/v5.4.32" }, "funding": [ { @@ -675,7 +672,7 @@ "type": "tidelift" } ], - "time": "2023-08-07T06:12:30+00:00" + "time": "2023-11-18T18:23:04+00:00" }, { "name": "symfony/deprecation-contracts", @@ -1884,16 +1881,16 @@ }, { "name": "symfony/string", - "version": "v5.4.29", + "version": "v5.4.32", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "e41bdc93def20eaf3bfc1537c4e0a2b0680a152d" + "reference": "91bf4453d65d8231688a04376c3a40efe0770f04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/e41bdc93def20eaf3bfc1537c4e0a2b0680a152d", - "reference": "e41bdc93def20eaf3bfc1537c4e0a2b0680a152d", + "url": "https://api.github.com/repos/symfony/string/zipball/91bf4453d65d8231688a04376c3a40efe0770f04", + "reference": "91bf4453d65d8231688a04376c3a40efe0770f04", "shasum": "" }, "require": { @@ -1950,7 +1947,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.29" + "source": "https://github.com/symfony/string/tree/v5.4.32" }, "funding": [ { @@ -1966,7 +1963,7 @@ "type": "tidelift" } ], - "time": "2023-09-13T11:47:41+00:00" + "time": "2023-11-26T13:43:46+00:00" } ], "aliases": [], From 539884247a3c9da42b792656358aa7c999d97246 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 27 Dec 2023 16:18:42 +0100 Subject: [PATCH 517/730] chore: Update google/cloud-storage to 1.36.0 --- UPGRADE-5.7.md | 2 +- composer.json | 2 +- composer.lock | 50 +++++++++++++++++++++++++------------------------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index 5999dac1551..f12f7bbcf44 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -18,7 +18,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `cocur/slugify` to version 4.5.1 for PHP 8.0 and newer * Updated `doctrine/orm` to version 2.15.5 -* Updated `google/cloud-storage` to version 1.34.0 +* Updated `google/cloud-storage` to version 1.36.0 * Updated `guzzlehttp/guzzle` to version 7.8.1 * Updated `guzzlehttp/psr7` to version 2.6.2 * Updated `monolog/monolog` to version 2.9.2 diff --git a/composer.json b/composer.json index 11d3290eaa6..cf69d1f0385 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,7 @@ "elasticsearch/elasticsearch": "^7", "fig/link-util": "1.1.2", "friendsofphp/proxy-manager-lts": "1.0.16", - "google/cloud-storage": "1.34.0", + "google/cloud-storage": "1.36.0", "guzzlehttp/guzzle": "~7.8.0", "guzzlehttp/psr7": "~2.6.1", "laminas/laminas-code": "4.7.1 || 4.13.0", diff --git a/composer.lock b/composer.lock index ca5f551aee2..46376b75fd4 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": "dae04513d343b37bdaa2f7f21623325b", + "content-hash": "98f06a1a16692db12d05076f9d8a1c5c", "packages": [ { "name": "aws/aws-crt-php", @@ -1718,16 +1718,16 @@ }, { "name": "firebase/php-jwt", - "version": "v6.9.0", + "version": "v6.10.0", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "f03270e63eaccf3019ef0f32849c497385774e11" + "reference": "a49db6f0a5033aef5143295342f1c95521b075ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/f03270e63eaccf3019ef0f32849c497385774e11", - "reference": "f03270e63eaccf3019ef0f32849c497385774e11", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/a49db6f0a5033aef5143295342f1c95521b075ff", + "reference": "a49db6f0a5033aef5143295342f1c95521b075ff", "shasum": "" }, "require": { @@ -1775,9 +1775,9 @@ ], "support": { "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v6.9.0" + "source": "https://github.com/firebase/php-jwt/tree/v6.10.0" }, - "time": "2023-10-05T00:24:42+00:00" + "time": "2023-12-01T16:26:39+00:00" }, { "name": "friendsofphp/proxy-manager-lts", @@ -1863,16 +1863,16 @@ }, { "name": "google/auth", - "version": "v1.32.1", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-auth-library-php.git", - "reference": "999e9ce8b9d17914f04e1718271a0a46da4de2f3" + "reference": "682dc6c30bb509953c9e43bb0960d901582da00b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/999e9ce8b9d17914f04e1718271a0a46da4de2f3", - "reference": "999e9ce8b9d17914f04e1718271a0a46da4de2f3", + "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/682dc6c30bb509953c9e43bb0960d901582da00b", + "reference": "682dc6c30bb509953c9e43bb0960d901582da00b", "shasum": "" }, "require": { @@ -1915,22 +1915,22 @@ "support": { "docs": "https://googleapis.github.io/google-auth-library-php/main/", "issues": "https://github.com/googleapis/google-auth-library-php/issues", - "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.32.1" + "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.33.0" }, - "time": "2023-10-17T21:13:22+00:00" + "time": "2023-11-30T15:49:27+00:00" }, { "name": "google/cloud-core", - "version": "v1.52.8", + "version": "v1.52.10", "source": { "type": "git", "url": "https://github.com/googleapis/google-cloud-php-core.git", - "reference": "2ebcaa410f7e92dca5677dd9cc4ec1f9f315e83c" + "reference": "5e34556498ecadee2161402fd1024bec7ce33186" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/2ebcaa410f7e92dca5677dd9cc4ec1f9f315e83c", - "reference": "2ebcaa410f7e92dca5677dd9cc4ec1f9f315e83c", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/5e34556498ecadee2161402fd1024bec7ce33186", + "reference": "5e34556498ecadee2161402fd1024bec7ce33186", "shasum": "" }, "require": { @@ -1980,22 +1980,22 @@ ], "description": "Google Cloud PHP shared dependency, providing functionality useful to all components.", "support": { - "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.8" + "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.10" }, - "time": "2023-11-02T19:15:44+00:00" + "time": "2023-12-08T22:36:35+00:00" }, { "name": "google/cloud-storage", - "version": "v1.34.0", + "version": "v1.36.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-cloud-php-storage.git", - "reference": "4589dd3c8f4171db4ce3eb335fc7d894661ca0e9" + "reference": "94215228fd03e548590134d1e521a34ec727460c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/4589dd3c8f4171db4ce3eb335fc7d894661ca0e9", - "reference": "4589dd3c8f4171db4ce3eb335fc7d894661ca0e9", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/94215228fd03e548590134d1e521a34ec727460c", + "reference": "94215228fd03e548590134d1e521a34ec727460c", "shasum": "" }, "require": { @@ -2036,9 +2036,9 @@ ], "description": "Cloud Storage Client for PHP", "support": { - "source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.34.0" + "source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.36.0" }, - "time": "2023-11-02T19:15:44+00:00" + "time": "2023-12-08T22:36:35+00:00" }, { "name": "guzzlehttp/guzzle", From 9c490b2008e4219ec57c4b72f3a9156adc85dac9 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 27 Dec 2023 16:20:09 +0100 Subject: [PATCH 518/730] chore: Update setasign/fpdi to 2.6.0 --- UPGRADE-5.7.md | 2 +- composer.json | 2 +- composer.lock | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index f12f7bbcf44..606c5d4e828 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -27,7 +27,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `laminas/laminas-escaper` to version 2.13.0 for PHP 8.1 and newer * Updated `phpunit/phpuit` to version 9.6.11 * Updated `setasign/fpdf` to version 1.8.6 -* Updated `setasign/fpdi` to version 2.5.0 +* Updated `setasign/fpdi` to version 2.6.0 * Updated `symfony/polyfill-php80` to version 1.28.0 * Updated `symfony/polyfill-php81` to version 1.28.0 * Updated `symfony/polyfill-php82` to version 1.28.0 diff --git a/composer.json b/composer.json index cf69d1f0385..1bf5ab34fc1 100644 --- a/composer.json +++ b/composer.json @@ -68,7 +68,7 @@ "psr/log": "1.1.4", "ramsey/uuid": "4.2.3", "setasign/fpdf": "1.8.6", - "setasign/fpdi": "2.5.0", + "setasign/fpdi": "2.6.0", "stecman/symfony-console-completion": "0.11.0", "superbalist/flysystem-google-storage": "7.2.2", "symfony/config": "~4.4.34", diff --git a/composer.lock b/composer.lock index 46376b75fd4..1c6e967e568 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": "98f06a1a16692db12d05076f9d8a1c5c", + "content-hash": "0c61eca55c6f7763b1b1471ae24e38c8", "packages": [ { "name": "aws/aws-crt-php", @@ -3933,16 +3933,16 @@ }, { "name": "setasign/fpdi", - "version": "v2.5.0", + "version": "v2.6.0", "source": { "type": "git", "url": "https://github.com/Setasign/FPDI.git", - "reference": "ecf0459643ec963febfb9a5d529dcd93656006a4" + "reference": "a6db878129ec6c7e141316ee71872923e7f1b7ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Setasign/FPDI/zipball/ecf0459643ec963febfb9a5d529dcd93656006a4", - "reference": "ecf0459643ec963febfb9a5d529dcd93656006a4", + "url": "https://api.github.com/repos/Setasign/FPDI/zipball/a6db878129ec6c7e141316ee71872923e7f1b7ad", + "reference": "a6db878129ec6c7e141316ee71872923e7f1b7ad", "shasum": "" }, "require": { @@ -3954,8 +3954,8 @@ }, "require-dev": { "phpunit/phpunit": "~5.7", - "setasign/fpdf": "~1.8", - "setasign/tfpdf": "~1.31", + "setasign/fpdf": "~1.8.6", + "setasign/tfpdf": "~1.33", "squizlabs/php_codesniffer": "^3.5", "tecnickcom/tcpdf": "~6.2" }, @@ -3993,7 +3993,7 @@ ], "support": { "issues": "https://github.com/Setasign/FPDI/issues", - "source": "https://github.com/Setasign/FPDI/tree/v2.5.0" + "source": "https://github.com/Setasign/FPDI/tree/v2.6.0" }, "funding": [ { @@ -4001,7 +4001,7 @@ "type": "tidelift" } ], - "time": "2023-09-28T10:46:27+00:00" + "time": "2023-12-11T16:03:32+00:00" }, { "name": "stecman/symfony-console-completion", From 9fcb16d2d525e7c969771a575bae3b289602ebd6 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 27 Dec 2023 16:23:53 +0100 Subject: [PATCH 519/730] chore: Update mink components --- composer.json | 4 +- composer.lock | 42 ++++++++++--------- tests/Mink/Page/Frontend/Detail/Detail.php | 2 +- .../Checkout/bootstrap/CheckoutContext.php | 2 +- .../Detail/bootstrap/DetailContext.php | 2 +- tests/Mink/Tests/General/Helpers/Helper.php | 10 ++--- 6 files changed, 33 insertions(+), 29 deletions(-) diff --git a/composer.json b/composer.json index 1bf5ab34fc1..44e56bb599e 100644 --- a/composer.json +++ b/composer.json @@ -108,8 +108,8 @@ "bamarni/composer-bin-plugin": "1.8.2", "behat/behat": "3.13.0", "behat/gherkin": "4.9.0", - "behat/mink": "1.10.0", - "behat/mink-selenium2-driver": "1.6.0", + "behat/mink": "1.11.0", + "behat/mink-selenium2-driver": "1.7.0", "friends-of-behat/mink-extension": "2.7.4", "php-parallel-lint/php-var-dump-check": "^0.5", "phpstan/extension-installer": "1.3.1", diff --git a/composer.lock b/composer.lock index 1c6e967e568..819ef217cde 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": "0c61eca55c6f7763b1b1471ae24e38c8", + "content-hash": "2761961e80ea5d03b2328b37fd7687ca", "packages": [ { "name": "aws/aws-crt-php", @@ -7736,26 +7736,28 @@ }, { "name": "behat/mink", - "version": "v1.10.0", + "version": "v1.11.0", "source": { "type": "git", "url": "https://github.com/minkphp/Mink.git", - "reference": "19e58905632e7cfdc5b2bafb9b950a3521af32c5" + "reference": "d8527fdf8785aad38455fb426af457ab9937aece" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/Mink/zipball/19e58905632e7cfdc5b2bafb9b950a3521af32c5", - "reference": "19e58905632e7cfdc5b2bafb9b950a3521af32c5", + "url": "https://api.github.com/repos/minkphp/Mink/zipball/d8527fdf8785aad38455fb426af457ab9937aece", + "reference": "d8527fdf8785aad38455fb426af457ab9937aece", "shasum": "" }, "require": { "php": ">=7.2", - "symfony/css-selector": "^4.4 || ^5.0 || ^6.0" + "symfony/css-selector": "^4.4 || ^5.0 || ^6.0 || ^7.0" }, "require-dev": { + "phpstan/phpstan": "^1.10", + "phpstan/phpstan-phpunit": "^1.3", "phpunit/phpunit": "^8.5.22 || ^9.5.11", - "symfony/error-handler": "^4.4 || ^5.0 || ^6.0", - "symfony/phpunit-bridge": "^5.4 || ^6.0" + "symfony/error-handler": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0" }, "suggest": { "behat/mink-browserkit-driver": "fast headless driver for any app without JS emulation", @@ -7794,34 +7796,36 @@ ], "support": { "issues": "https://github.com/minkphp/Mink/issues", - "source": "https://github.com/minkphp/Mink/tree/v1.10.0" + "source": "https://github.com/minkphp/Mink/tree/v1.11.0" }, - "time": "2022-03-28T14:22:43+00:00" + "time": "2023-12-09T11:23:23+00:00" }, { "name": "behat/mink-selenium2-driver", - "version": "v1.6.0", + "version": "v1.7.0", "source": { "type": "git", "url": "https://github.com/minkphp/MinkSelenium2Driver.git", - "reference": "e5f8421654930da725499fb92983e6948c6f973e" + "reference": "4ca4083f305de7dff4434ac402dc4e3f39c0866a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/e5f8421654930da725499fb92983e6948c6f973e", - "reference": "e5f8421654930da725499fb92983e6948c6f973e", + "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/4ca4083f305de7dff4434ac402dc4e3f39c0866a", + "reference": "4ca4083f305de7dff4434ac402dc4e3f39c0866a", "shasum": "" }, "require": { - "behat/mink": "^1.9@dev", + "behat/mink": "^1.11@dev", "ext-json": "*", - "instaclick/php-webdriver": "^1.4", + "instaclick/php-webdriver": "^1.4.14", "php": ">=7.2" }, "require-dev": { "mink/driver-testsuite": "dev-master", + "phpstan/phpstan": "^1.10", + "phpstan/phpstan-phpunit": "^1.3", "phpunit/phpunit": "^8.5.22 || ^9.5.11", - "symfony/error-handler": "^4.4 || ^5.0" + "symfony/error-handler": "^4.4 || ^5.0 || ^6.0 || ^7.0" }, "type": "mink-driver", "extra": { @@ -7862,9 +7866,9 @@ ], "support": { "issues": "https://github.com/minkphp/MinkSelenium2Driver/issues", - "source": "https://github.com/minkphp/MinkSelenium2Driver/tree/v1.6.0" + "source": "https://github.com/minkphp/MinkSelenium2Driver/tree/v1.7.0" }, - "time": "2022-03-28T14:55:17+00:00" + "time": "2023-12-09T11:58:45+00:00" }, { "name": "behat/transliterator", diff --git a/tests/Mink/Page/Frontend/Detail/Detail.php b/tests/Mink/Page/Frontend/Detail/Detail.php index 711b7370f2b..e6ad5617566 100644 --- a/tests/Mink/Page/Frontend/Detail/Detail.php +++ b/tests/Mink/Page/Frontend/Detail/Detail.php @@ -113,7 +113,7 @@ public function verifyPage(): void /** * Puts the current article times to basket */ - public function addToBasket(int $quantity = 1): void + public function addToBasket(string $quantity = '1'): void { $this->fillField('sQuantity', $quantity); $this->find('css', "button[name='In den Warenkorb']")->click(); diff --git a/tests/Mink/Tests/Frontend/Checkout/bootstrap/CheckoutContext.php b/tests/Mink/Tests/Frontend/Checkout/bootstrap/CheckoutContext.php index 0dcf8b11eb1..24ec8274d76 100644 --- a/tests/Mink/Tests/Frontend/Checkout/bootstrap/CheckoutContext.php +++ b/tests/Mink/Tests/Frontend/Checkout/bootstrap/CheckoutContext.php @@ -182,7 +182,7 @@ public function theCartContainsTheFollowingProducts(TableNode $items): void foreach ($items->getIterator() as $row) { $detailPage->open(['articleId' => $row['articleId'], 'number' => $row['number']]); - $detailPage->addToBasket((int) $row['quantity']); + $detailPage->addToBasket($row['quantity']); } } diff --git a/tests/Mink/Tests/Frontend/Detail/bootstrap/DetailContext.php b/tests/Mink/Tests/Frontend/Detail/bootstrap/DetailContext.php index 55afd6536d2..7f7744cf64b 100644 --- a/tests/Mink/Tests/Frontend/Detail/bootstrap/DetailContext.php +++ b/tests/Mink/Tests/Frontend/Detail/bootstrap/DetailContext.php @@ -61,7 +61,7 @@ public function iAmOnTheDetailPageForVariantOfArticle(string $number, int $produ * @When /^I put the article into the basket$/ * @When /^I put the article "(?P[^"]*)" times into the basket$/ */ - public function iPutTheArticleTimesIntoTheBasket(int $quantity = 1): void + public function iPutTheArticleTimesIntoTheBasket(string $quantity = '1'): void { $page = $this->getPage(Detail::class); $page->addToBasket($quantity); diff --git a/tests/Mink/Tests/General/Helpers/Helper.php b/tests/Mink/Tests/General/Helpers/Helper.php index 4b432e0e384..c896e44ccdf 100644 --- a/tests/Mink/Tests/General/Helpers/Helper.php +++ b/tests/Mink/Tests/General/Helpers/Helper.php @@ -554,12 +554,12 @@ public static function getContentBlock(Page $parent): NodeElement * Fills inputs of a form * * @param (Page|Element)&HelperSelectorInterface $parent - * @param array> $values + * @param array> $values */ public static function fillForm(HelperSelectorInterface $parent, string $formKey, array $values, bool $waitForOverlays = false): void { foreach ($values as $value) { - $tempFieldName = $fieldName = $value['field']; + $tempFieldName = $fieldName = (string) $value['field']; unset($value['field']); foreach ($value as $key => $fieldValue) { @@ -596,7 +596,7 @@ public static function fillForm(HelperSelectorInterface $parent, string $formKey $fieldTag = $field->getTagName(); if ($fieldTag === 'textarea') { - $field->setValue($fieldValue); + $field->setValue((string) $fieldValue); continue; } @@ -610,7 +610,7 @@ public static function fillForm(HelperSelectorInterface $parent, string $formKey // Select if (empty($fieldType)) { - $field->selectOption($fieldValue); + $field->selectOption((string) $fieldValue); return true; } @@ -623,7 +623,7 @@ public static function fillForm(HelperSelectorInterface $parent, string $formKey } // Text - $field->setValue($fieldValue); + $field->setValue((string) $fieldValue); return true; } catch (StaleElementReference $e) { From 327788ff189c8ed7d8c45fca64989fdc7fb8b3ba Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 27 Dec 2023 16:32:34 +0100 Subject: [PATCH 520/730] chore: Update PHPUnit and third party dependencies --- composer.lock | 128 +++++++++++++++++++++++++------------------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/composer.lock b/composer.lock index 819ef217cde..1def7d1914b 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "aws/aws-crt-php", - "version": "v1.2.3", + "version": "v1.2.4", "source": { "type": "git", "url": "https://github.com/awslabs/aws-crt-php.git", - "reference": "5545a4fa310aec39f54279fdacebcce33b3ff382" + "reference": "eb0c6e4e142224a10b08f49ebf87f32611d162b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/5545a4fa310aec39f54279fdacebcce33b3ff382", - "reference": "5545a4fa310aec39f54279fdacebcce33b3ff382", + "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/eb0c6e4e142224a10b08f49ebf87f32611d162b2", + "reference": "eb0c6e4e142224a10b08f49ebf87f32611d162b2", "shasum": "" }, "require": { @@ -56,22 +56,22 @@ ], "support": { "issues": "https://github.com/awslabs/aws-crt-php/issues", - "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.3" + "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.4" }, - "time": "2023-10-16T20:10:06+00:00" + "time": "2023-11-08T00:42:13+00:00" }, { "name": "aws/aws-sdk-php", - "version": "3.284.1", + "version": "3.295.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "eb03db9795bfdaed3501ebc7f33b4e6cee0c15b4" + "reference": "31c69734d929510502b6401c01b593521efdcbc5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/eb03db9795bfdaed3501ebc7f33b4e6cee0c15b4", - "reference": "eb03db9795bfdaed3501ebc7f33b4e6cee0c15b4", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/31c69734d929510502b6401c01b593521efdcbc5", + "reference": "31c69734d929510502b6401c01b593521efdcbc5", "shasum": "" }, "require": { @@ -151,9 +151,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.284.1" + "source": "https://github.com/aws/aws-sdk-php/tree/3.295.1" }, - "time": "2023-11-06T19:08:09+00:00" + "time": "2023-12-26T19:06:59+00:00" }, { "name": "bcremer/line-reader", @@ -3753,23 +3753,23 @@ }, { "name": "react/promise", - "version": "v2.10.0", + "version": "v2.11.0", "source": { "type": "git", "url": "https://github.com/reactphp/promise.git", - "reference": "f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38" + "reference": "1a8460931ea36dc5c76838fec5734d55c88c6831" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/promise/zipball/f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38", - "reference": "f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38", + "url": "https://api.github.com/repos/reactphp/promise/zipball/1a8460931ea36dc5c76838fec5734d55c88c6831", + "reference": "1a8460931ea36dc5c76838fec5734d55c88c6831", "shasum": "" }, "require": { "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.36" + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36" }, "type": "library", "autoload": { @@ -3813,7 +3813,7 @@ ], "support": { "issues": "https://github.com/reactphp/promise/issues", - "source": "https://github.com/reactphp/promise/tree/v2.10.0" + "source": "https://github.com/reactphp/promise/tree/v2.11.0" }, "funding": [ { @@ -3821,7 +3821,7 @@ "type": "open_collective" } ], - "time": "2023-05-02T15:15:43+00:00" + "time": "2023-11-16T16:16:50+00:00" }, { "name": "rize/uri-template", @@ -8067,16 +8067,16 @@ }, { "name": "instaclick/php-webdriver", - "version": "1.4.16", + "version": "1.4.18", "source": { "type": "git", "url": "https://github.com/instaclick/php-webdriver.git", - "reference": "a39a1f6dc0f4ddd8b2438fa5eb1f67755730d606" + "reference": "a61a8459f86c79dd1f19934ea3929804f2e41f8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/a39a1f6dc0f4ddd8b2438fa5eb1f67755730d606", - "reference": "a39a1f6dc0f4ddd8b2438fa5eb1f67755730d606", + "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/a61a8459f86c79dd1f19934ea3929804f2e41f8c", + "reference": "a61a8459f86c79dd1f19934ea3929804f2e41f8c", "shasum": "" }, "require": { @@ -8124,22 +8124,22 @@ ], "support": { "issues": "https://github.com/instaclick/php-webdriver/issues", - "source": "https://github.com/instaclick/php-webdriver/tree/1.4.16" + "source": "https://github.com/instaclick/php-webdriver/tree/1.4.18" }, - "time": "2022-10-28T13:30:35+00:00" + "time": "2023-12-08T07:11:19+00:00" }, { "name": "nikic/php-parser", - "version": "v4.17.1", + "version": "v4.18.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", "shasum": "" }, "require": { @@ -8180,9 +8180,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" }, - "time": "2023-08-13T19:53:39+00:00" + "time": "2023-12-10T21:03:43+00:00" }, { "name": "phar-io/manifest", @@ -8650,23 +8650,23 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.29", + "version": "9.2.30", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76" + "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76", - "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca2bd87d2f9215904682a9cb9bb37dda98e76089", + "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -8716,7 +8716,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.30" }, "funding": [ { @@ -8724,7 +8724,7 @@ "type": "github" } ], - "time": "2023-09-19T04:57:46+00:00" + "time": "2023-12-22T06:47:57+00:00" }, { "name": "phpunit/php-file-iterator", @@ -8969,16 +8969,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.13", + "version": "9.6.15", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be" + "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f3d767f7f9e191eab4189abe41ab37797e30b1be", - "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/05017b80304e0eb3f31d90194a563fd53a6021f1", + "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1", "shasum": "" }, "require": { @@ -9052,7 +9052,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.13" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.15" }, "funding": [ { @@ -9068,7 +9068,7 @@ "type": "tidelift" } ], - "time": "2023-09-19T05:39:22+00:00" + "time": "2023-12-01T16:55:19+00:00" }, { "name": "sebastian/cli-parser", @@ -9313,20 +9313,20 @@ }, { "name": "sebastian/complexity", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88" + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a", "shasum": "" }, "require": { - "nikic/php-parser": "^4.7", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3" }, "require-dev": { @@ -9358,7 +9358,7 @@ "homepage": "https://github.com/sebastianbergmann/complexity", "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", - "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2" + "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3" }, "funding": [ { @@ -9366,7 +9366,7 @@ "type": "github" } ], - "time": "2020-10-26T15:52:27+00:00" + "time": "2023-12-22T06:19:30+00:00" }, { "name": "sebastian/diff", @@ -9640,20 +9640,20 @@ }, { "name": "sebastian/lines-of-code", - "version": "1.0.3", + "version": "1.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc" + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5", "shasum": "" }, "require": { - "nikic/php-parser": "^4.6", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3" }, "require-dev": { @@ -9685,7 +9685,7 @@ "homepage": "https://github.com/sebastianbergmann/lines-of-code", "support": { "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3" + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4" }, "funding": [ { @@ -9693,7 +9693,7 @@ "type": "github" } ], - "time": "2020-11-28T06:42:11+00:00" + "time": "2023-12-22T06:20:34+00:00" }, { "name": "sebastian/object-enumerator", @@ -10557,16 +10557,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", "shasum": "" }, "require": { @@ -10595,7 +10595,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/theseer/tokenizer/tree/1.2.2" }, "funding": [ { @@ -10603,7 +10603,7 @@ "type": "github" } ], - "time": "2021-07-28T10:34:58+00:00" + "time": "2023-11-20T00:12:19+00:00" } ], "aliases": [], From ce5d3e8a648d84ec108d6aff2f9cd0f483dc64a6 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 28 Dec 2023 08:30:31 +0100 Subject: [PATCH 521/730] chore: Update phpstan/phpstan-symfony to 1.3.6 --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 44e56bb599e..50e115030f1 100644 --- a/composer.json +++ b/composer.json @@ -116,7 +116,7 @@ "phpstan/phpstan": "1.10.50", "phpstan/phpstan-doctrine": "1.3.53", "phpstan/phpstan-phpunit": "1.3.15", - "phpstan/phpstan-symfony": "1.3.5", + "phpstan/phpstan-symfony": "1.3.6", "phpunit/phpunit": "^9.6", "sensiolabs/behat-page-object-extension": "2.3.7", "staabm/phpstan-dba": "0.2.79", diff --git a/composer.lock b/composer.lock index 1def7d1914b..2130a464104 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": "2761961e80ea5d03b2328b37fd7687ca", + "content-hash": "d18b47e38edb6a1c16f276e68d525dd7", "packages": [ { "name": "aws/aws-crt-php", @@ -8578,16 +8578,16 @@ }, { "name": "phpstan/phpstan-symfony", - "version": "1.3.5", + "version": "1.3.6", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-symfony.git", - "reference": "27ff6339f83796a7e0dd963cf445cd3c456fc620" + "reference": "34b3c43684834f6a20aa51af8d455480d9de8b88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/27ff6339f83796a7e0dd963cf445cd3c456fc620", - "reference": "27ff6339f83796a7e0dd963cf445cd3c456fc620", + "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/34b3c43684834f6a20aa51af8d455480d9de8b88", + "reference": "34b3c43684834f6a20aa51af8d455480d9de8b88", "shasum": "" }, "require": { @@ -8644,9 +8644,9 @@ "description": "Symfony Framework extensions and rules for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-symfony/issues", - "source": "https://github.com/phpstan/phpstan-symfony/tree/1.3.5" + "source": "https://github.com/phpstan/phpstan-symfony/tree/1.3.6" }, - "time": "2023-10-30T14:52:15+00:00" + "time": "2023-12-22T11:22:34+00:00" }, { "name": "phpunit/php-code-coverage", From bf41786db88ca54e640beae71dbd1dea31afdcfe Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Fri, 29 Dec 2023 10:45:28 +0100 Subject: [PATCH 522/730] chore: Update friendsofphp/php-cs-fixer to 3.43.1 --- .../FacetResult/FacetResultGroup.php | 2 +- .../SearchBundleES/ProductNumberSearch.php | 2 +- .../Struct/Configurator/Option.php | 2 +- .../Shopware/Components/Routing/Context.php | 4 +- engine/Shopware/Components/Routing/Router.php | 2 +- engine/Shopware/Models/Article/Unit.php | 6 +-- engine/Shopware/Models/Country/Area.php | 4 +- engine/Shopware/Models/Plugin/Plugin.php | 40 +++++++++++-------- engine/Shopware/Models/Voucher/Voucher.php | 6 +-- ...sPseudoPriceConditionCustomerGroupTest.php | 2 +- vendor-bin/cs-fixer/composer.json | 2 +- vendor-bin/cs-fixer/composer.lock | 16 ++++---- 12 files changed, 47 insertions(+), 41 deletions(-) diff --git a/engine/Shopware/Bundle/SearchBundle/FacetResult/FacetResultGroup.php b/engine/Shopware/Bundle/SearchBundle/FacetResult/FacetResultGroup.php index 6d886d77347..944293fba23 100644 --- a/engine/Shopware/Bundle/SearchBundle/FacetResult/FacetResultGroup.php +++ b/engine/Shopware/Bundle/SearchBundle/FacetResult/FacetResultGroup.php @@ -114,7 +114,7 @@ public function getTemplate() } /** - * @param \Shopware\Bundle\SearchBundle\FacetResultInterface[] $facetResults + * @param FacetResultInterface[] $facetResults */ public function setFacetResults(array $facetResults) { diff --git a/engine/Shopware/Bundle/SearchBundleES/ProductNumberSearch.php b/engine/Shopware/Bundle/SearchBundleES/ProductNumberSearch.php index 3fd48da7fa5..737e79d03bc 100644 --- a/engine/Shopware/Bundle/SearchBundleES/ProductNumberSearch.php +++ b/engine/Shopware/Bundle/SearchBundleES/ProductNumberSearch.php @@ -150,7 +150,7 @@ private function addCriteriaParts( /** * @param array[] $data * - * @return \Shopware\Bundle\StoreFrontBundle\Struct\BaseProduct[] + * @return BaseProduct[] */ private function createProducts(array $data): array { diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Option.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Option.php index 2033075017f..d53e0988385 100644 --- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Option.php +++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Option.php @@ -102,7 +102,7 @@ public function setSelected($selected) } /** - * @return \Shopware\Bundle\StoreFrontBundle\Struct\Media|null + * @return Media|null */ public function getMedia() { diff --git a/engine/Shopware/Components/Routing/Context.php b/engine/Shopware/Components/Routing/Context.php index 6e4e0b7b969..308640f89a5 100644 --- a/engine/Shopware/Components/Routing/Context.php +++ b/engine/Shopware/Components/Routing/Context.php @@ -51,7 +51,7 @@ class Context implements JsonSerializable protected $baseFile = 'shopware.php'; /** - * @see \Enlight_Controller_Request_Request::getHttpHost + * @see EnlightRequest::getHttpHost * * @var string */ @@ -90,7 +90,7 @@ class Context implements JsonSerializable /** * Module keys for retrieving module from params * - * @see \Enlight_Controller_Request_Request::$_moduleKey + * @see EnlightRequest::$_moduleKey * * @var string */ diff --git a/engine/Shopware/Components/Routing/Router.php b/engine/Shopware/Components/Routing/Router.php index f12e63051f6..83b89fe9ffc 100644 --- a/engine/Shopware/Components/Routing/Router.php +++ b/engine/Shopware/Components/Routing/Router.php @@ -295,7 +295,7 @@ public function route(EnlightRequest $request) * Sets a global parameter. * * @see \Shopware_Controllers_Backend_Newsletter::initMailing - * @see \Enlight_Controller_Router::setGlobalParam + * @see EnlightRouter::setGlobalParam * * @param string $name * @param string $value diff --git a/engine/Shopware/Models/Article/Unit.php b/engine/Shopware/Models/Article/Unit.php index 675f7365298..4e653254e99 100644 --- a/engine/Shopware/Models/Article/Unit.php +++ b/engine/Shopware/Models/Article/Unit.php @@ -36,7 +36,7 @@ class Unit extends ModelEntity /** * INVERSE SIDE * - * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Article\Detail> + * @var ArrayCollection * * @ORM\OneToMany(targetEntity="Shopware\Models\Article\Detail", mappedBy="unit") */ @@ -119,7 +119,7 @@ public function getName() } /** - * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Article\Detail> + * @return ArrayCollection */ public function getArticles() { @@ -127,7 +127,7 @@ public function getArticles() } /** - * @param \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Article\Detail>|null $articles + * @param ArrayCollection|null $articles */ public function setArticles($articles) { diff --git a/engine/Shopware/Models/Country/Area.php b/engine/Shopware/Models/Country/Area.php index 876573e9aaf..6624890e9f8 100644 --- a/engine/Shopware/Models/Country/Area.php +++ b/engine/Shopware/Models/Country/Area.php @@ -38,7 +38,7 @@ class Area extends ModelEntity * The countries property is the inverse side of the association between area and countries. * The association is joined over the area id field and the areaID field of the country. * - * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Country\Country> + * @var ArrayCollection * * @ORM\OneToMany(targetEntity="Shopware\Models\Country\Country", mappedBy="area", orphanRemoval=true, cascade={"persist"}) */ @@ -121,7 +121,7 @@ public function getActive() } /** - * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Country\Country> + * @return ArrayCollection */ public function getCountries() { diff --git a/engine/Shopware/Models/Plugin/Plugin.php b/engine/Shopware/Models/Plugin/Plugin.php index de4af6f3f0b..b32a72a9438 100644 --- a/engine/Shopware/Models/Plugin/Plugin.php +++ b/engine/Shopware/Models/Plugin/Plugin.php @@ -28,6 +28,12 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\Mapping as ORM; use Shopware\Components\Model\ModelEntity; +use Shopware\Models\Config\Form; +use Shopware\Models\Emotion\Library\Component; +use Shopware\Models\Menu\Menu; +use Shopware\Models\Payment\Payment; +use Shopware\Models\Shop\Template; +use Shopware\Models\Widget\Widget; /** * @ORM\Table(name="s_core_plugins") @@ -36,7 +42,7 @@ class Plugin extends ModelEntity { /** - * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Emotion\Library\Component> + * @var ArrayCollection * * @ORM\OneToMany(targetEntity="Shopware\Models\Emotion\Library\Component", mappedBy="plugin", orphanRemoval=true, cascade={"all"}) */ @@ -222,7 +228,7 @@ class Plugin extends ModelEntity /** * INVERSE SIDE * - * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Config\Form> + * @var ArrayCollection * * @ORM\OneToMany(targetEntity="\Shopware\Models\Config\Form", mappedBy="plugin", cascade={"all"}) * @ORM\JoinColumn(name="id", referencedColumnName="plugin_id") @@ -233,7 +239,7 @@ class Plugin extends ModelEntity /** * INVERSE SIDE * - * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Menu\Menu> + * @var ArrayCollection * * @ORM\OneToMany(targetEntity="\Shopware\Models\Menu\Menu", mappedBy="plugin", cascade={"all"}) * @ORM\JoinColumn(name="id", referencedColumnName="pluginID") @@ -244,7 +250,7 @@ class Plugin extends ModelEntity /** * INVERSE SIDE * - * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Payment\Payment> + * @var ArrayCollection * * @ORM\OneToMany(targetEntity="\Shopware\Models\Payment\Payment", mappedBy="plugin", cascade={"all"}) * @ORM\JoinColumn(name="id", referencedColumnName="pluginID") @@ -255,7 +261,7 @@ class Plugin extends ModelEntity /** * INVERSE SIDE * - * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Shop\Template> + * @var ArrayCollection